From 0eee83b6eccf1b89b209003a3d221cc8ee4e0966 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 21 Nov 2014 18:11:54 +0300
Subject: [PATCH] Lazy logs removed

---
 .../functions/inference/kt6176.lazy.log       |   192 -
 .../onObjects/invokeOnClassObject1.lazy.log   |    73 -
 .../onObjects/invokeOnClassObject2.lazy.log   |    82 -
 ...invokeOnClassObjectOfNestedClass1.lazy.log |    82 -
 ...invokeOnClassObjectOfNestedClass2.lazy.log |    75 -
 .../invoke/onObjects/invokeOnEnum1.lazy.log   |    82 -
 .../invoke/onObjects/invokeOnEnum2.lazy.log   |    90 -
 .../onObjects/invokeOnImportedEnum1.lazy.log  |    75 -
 .../onObjects/invokeOnImportedEnum2.lazy.log  |    83 -
 .../invoke/onObjects/invokeOnObject1.lazy.log |    81 -
 .../invoke/onObjects/invokeOnObject2.lazy.log |    73 -
 .../tailRecursion/defaultArgs.lazy.log        |   231 -
 .../tailRecursion/extensionTailCall.lazy.log  |    94 -
 .../functionWithNoTails.lazy.log              |    59 -
 .../functionWithNonTailRecursions.lazy.log    |   205 -
 .../functionWithoutAnnotation.lazy.log        |   102 -
 .../tailRecursion/infixCall.lazy.log          |    99 -
 .../tailRecursion/infixRecursiveCall.lazy.log |   103 -
 .../tailRecursion/insideElvis.lazy.log        |   158 -
 .../labeledThisReferences.lazy.log            |   153 -
 .../functions/tailRecursion/loops.lazy.log    |   156 -
 .../tailRecursion/multilevelBlocks.lazy.log   |   188 -
 .../tailRecursion/realIteratorFoldl.lazy.log  |   208 -
 .../tailRecursion/realStringEscape.lazy.log   |  1023 -
 .../tailRecursion/realStringRepeat.lazy.log   |   982 -
 .../recursiveCallInLambda.lazy.log            |    85 -
 .../recursiveCallInLocalFunction.lazy.log     |    68 -
 .../recursiveInnerFunction.lazy.log           |    97 -
 .../functions/tailRecursion/returnIf.lazy.log |   165 -
 .../tailRecursion/returnInCatch.lazy.log      |   221 -
 .../tailRecursion/returnInFinally.lazy.log    |   102 -
 .../returnInIfInFinally.lazy.log              |   117 -
 .../returnInParentheses.lazy.log              |    92 -
 .../tailRecursion/returnInTry.lazy.log        |   111 -
 .../tailRecursion/simpleBlock.lazy.log        |   165 -
 .../tailRecursion/simpleReturn.lazy.log       |   136 -
 .../simpleReturnWithElse.lazy.log             |   155 -
 .../functions/tailRecursion/sum.lazy.log      |   158 -
 .../tailCallInBlockInParentheses.lazy.log     |   105 -
 .../tailCallInParentheses.lazy.log            |    92 -
 .../tailRecursionInFinally.lazy.log           |   125 -
 .../tailRecursion/thisReferences.lazy.log     |   178 -
 .../tailRecursion/unitBlocks.lazy.log         |   227 -
 .../tailRecursion/whenWithCondition.lazy.log  |   126 -
 .../tailRecursion/whenWithInRange.lazy.log    |   207 -
 .../tailRecursion/whenWithIs.lazy.log         |   288 -
 .../whenWithoutCondition.lazy.log             |   155 -
 .../test_with_diagnostic.lazy.log             |   298 -
 .../diagnostics/tests/Abstract.lazy.log       |   204 -
 .../tests/AbstractInAbstractClass.lazy.log    |   131 -
 .../tests/AbstractInClass.lazy.log            |   131 -
 .../tests/AbstractInTrait.lazy.log            |   124 -
 ...ymousInitializerVarAndConstructor.lazy.log |    49 -
 .../tests/AnonymousInitializers.lazy.log      |   274 -
 .../diagnostics/tests/AutoCreatedIt.lazy.log  |   358 -
 .../testData/diagnostics/tests/Basic.lazy.log |   298 -
 .../BinaryCallsOnNullableValues.lazy.log      |   425 -
 .../diagnostics/tests/Bounds.lazy.log         |   245 -
 .../diagnostics/tests/BreakContinue.lazy.log  |   426 -
 .../diagnostics/tests/Builders.lazy.log       |  3647 ---
 .../testData/diagnostics/tests/Casts.lazy.log |    91 -
 .../tests/CharacterLiterals.lazy.log          |   183 -
 .../tests/CompareToWithErrorType.lazy.log     |    76 -
 .../diagnostics/tests/Constants.lazy.log      |   336 -
 .../diagnostics/tests/Constructors.lazy.log   |    83 -
 .../tests/ConstructorsOfPrimitives.lazy.log   |   274 -
 .../tests/CovariantOverrideType.lazy.log      |    67 -
 .../tests/DefaultValuesTypechecking.lazy.log  |   112 -
 .../diagnostics/tests/DeferredTypes.lazy.log  |   141 -
 .../tests/DiamondFunction.lazy.log            |    42 -
 .../tests/DiamondFunctionGeneric.lazy.log     |    45 -
 .../tests/DiamondProperty.lazy.log            |    45 -
 .../diagnostics/tests/Dollar.lazy.log         |    57 -
 .../tests/FinalClassObjectBound.lazy.log      |    25 -
 .../tests/ForRangeConventions.lazy.log        |   746 -
 .../tests/FunctionCalleeExpressions.lazy.log  |   804 -
 .../tests/FunctionReturnTypes.lazy.log        |   516 -
 .../tests/GenericArgumentConsistency.lazy.log |   111 -
 .../GenericFunctionIsLessSpecific.lazy.log    |    61 -
 .../tests/IllegalModifiers.lazy.log           |   170 -
 .../diagnostics/tests/IncDec.lazy.log         |   320 -
 .../tests/IncorrectCharacterLiterals.lazy.log |    15 -
 .../InferNullabilityInThenBlock.lazy.log      |    73 -
 .../diagnostics/tests/IsExpressions.lazy.log  |    26 -
 .../tests/LValueAssignment.lazy.log           |  1721 --
 .../tests/MergePackagesWithJava.lazy.log      |   180 -
 .../tests/MultilineStringTemplates.lazy.log   |   280 -
 .../diagnostics/tests/MultipleBounds.lazy.log |   454 -
 .../diagnostics/tests/Nullability.lazy.log    |  2725 ---
 ...rideFunctionWithParamDefaultValue.lazy.log |    64 -
 ...FunctionAndSpecifiedTypeParameter.lazy.log |    66 -
 .../tests/OverridingVarByVal.lazy.log         |    47 -
 .../tests/PackageAsExpression.lazy.log        |    45 -
 .../PackageInExpressionPosition.lazy.log      |   460 -
 .../tests/PackageQualified.lazy.log           |   389 -
 .../tests/PrimaryConstructors.lazy.log        |   228 -
 .../tests/ProcessingEmptyImport.lazy.log      |    15 -
 ...rojectionOnFunctionArgumentErrror.lazy.log |    41 -
 .../tests/ProjectionsInSupertypes.lazy.log    |    35 -
 .../diagnostics/tests/Properties.lazy.log     |   205 -
 .../tests/PropertyInitializers.lazy.log       |   167 -
 .../tests/QualifiedExpressions.lazy.log       |   151 -
 .../tests/RecursiveTypeInference.lazy.log     |   181 -
 .../tests/ReflectionTypesNotLoaded.lazy.log   |   129 -
 .../tests/ResolveOfJavaGenerics.lazy.log      |   300 -
 .../diagnostics/tests/ResolveToJava.lazy.log  |  1360 --
 .../diagnostics/tests/Return.lazy.log         |    44 -
 .../tests/SafeCallNonNullReceiver.lazy.log    |    39 -
 ...SafeCallNonNullReceiverReturnNull.lazy.log |    55 -
 .../tests/SafeCallOnFakePackage.lazy.log      |   366 -
 .../tests/ShiftFunctionTypes.lazy.log         |    41 -
 .../tests/StarsInFunctionCalls.lazy.log       |   133 -
 .../tests/StringTemplates.lazy.log            |   190 -
 .../tests/SupertypeListChecks.lazy.log        |    52 -
 .../SyntaxErrorInTestHighlighting.lazy.log    |    23 -
 .../SyntaxErrorInTestHighlightingEof.lazy.log |    15 -
 .../tests/TraitOverrideObjectMethods.lazy.log |   130 -
 .../diagnostics/tests/TypeInference.lazy.log  |   126 -
 ...ismatchOnOverrideWithSyntaxErrors.lazy.log |    38 -
 .../UnitByDefaultForFunctionTypes.lazy.log    |    48 -
 .../diagnostics/tests/UnitValue.lazy.log      |    37 -
 .../diagnostics/tests/Unresolved.lazy.log     |   584 -
 .../tests/UnusedVariables.lazy.log            |   509 -
 ...lAndFunOverrideCompatibilityClash.lazy.log |  1933 --
 .../diagnostics/tests/VarargTypes.lazy.log    |   452 -
 .../diagnostics/tests/Varargs.lazy.log        |   198 -
 .../diagnostics/tests/Variance.lazy.log       |   225 -
 .../AmbigiousAnnotationConstructor.lazy.log   |   246 -
 .../AnnotatedConstructorParams.lazy.log       |   383 -
 .../AnnotationForClassTypeParameter.lazy.log  |    25 -
 ...nnotationForFunctionTypeParameter.lazy.log |    31 -
 .../annotations/AnnotationForObject.lazy.log  |    32 -
 .../AnnotationsForClasses.lazy.log            |    64 -
 ...notationsForPropertyTypeParameter.lazy.log |    33 -
 .../annotations/BasicAnnotations.lazy.log     |   101 -
 .../annotations/ConstructorCall.lazy.log      |   598 -
 .../tests/annotations/Deprecated.lazy.log     |    72 -
 .../JavaAnnotationConstructors.lazy.log       |   328 -
 .../annotations/NonAnnotationClass.lazy.log   |    32 -
 .../annotationInheritance.lazy.log            |    65 -
 .../annotations/annotationModifier.lazy.log   |    28 -
 .../booleanLocalVal.lazy.log                  |    53 -
 .../compareAndEquals.lazy.log                 |   130 -
 .../enumConst.lazy.log                        |   104 -
 .../javaProperties.lazy.log                   |   235 -
 .../kotlinProperties.lazy.log                 |   145 -
 .../strings.lazy.log                          |   168 -
 ...validTypesInAnnotationConstructor.lazy.log |   230 -
 .../annotations/kt1860-negative.lazy.log      |    65 -
 .../annotations/kt1860-positive.lazy.log      |    80 -
 .../annotations/kt1886annotationBody.lazy.log |    36 -
 .../missingValOnParameter.lazy.log            |    27 -
 .../tests/annotations/onExpression.lazy.log   |    35 -
 .../tests/annotations/onInitializer.lazy.log  |    94 -
 .../tests/annotations/onLoops.lazy.log        |    81 -
 .../annotations/onLoopsUnreachable.lazy.log   |    81 -
 .../annotations/onMultiDeclaration.lazy.log   |   132 -
 .../annotations/typeAnnotations.lazy.log      |    48 -
 .../tests/backingField/CustomGetSet.lazy.log  |    62 -
 .../tests/backingField/CustomGetVal.lazy.log  |    46 -
 .../backingField/CustomGetValGlobal.lazy.log  |    42 -
 .../tests/backingField/CustomGetVar.lazy.log  |    45 -
 .../tests/backingField/CustomSet.lazy.log     |    50 -
 .../CyclicReferenceInitializer.lazy.log       |    40 -
 .../ReadForwardInAnonymous.lazy.log           |    41 -
 .../ReadForwardInPropertyInitializer.lazy.log |    43 -
 .../backingField/ReadInAnonymous.lazy.log     |    41 -
 .../ReadInAnotherPropertyIntializer.lazy.log  |    43 -
 .../backingField/ReadInFunction.lazy.log      |    42 -
 ...istentAbstractPropertyInAnonymous.lazy.log |    40 -
 ...xistentAbstractPropertyInFunction.lazy.log |    44 -
 ...adNonexistentCustomGetInAnonymous.lazy.log |    40 -
 ...tentCustomGetInAnotherInitializer.lazy.log |    45 -
 .../ReadNonexistentDeclaredInHigher.lazy.log  |    45 -
 ...eadNonexistentPropertyInAnonymous.lazy.log |   134 -
 .../WriteNonexistentDeclaredInHigher.lazy.log |    48 -
 .../kt462BackingFieldsResolve.lazy.log        |   500 -
 .../backingField/kt782packageLevel.lazy.log   |    66 -
 .../backingField/qualifiedWithThis.lazy.log   |    40 -
 .../tests/cast/AsErasedError.lazy.log         |    46 -
 .../tests/cast/AsErasedFine.lazy.log          |    42 -
 .../tests/cast/AsErasedStar.lazy.log          |    38 -
 .../tests/cast/AsErasedWarning.lazy.log       |    42 -
 .../tests/cast/DowncastMap.lazy.log           |    56 -
 .../diagnostics/tests/cast/IsArray.lazy.log   |    42 -
 ...thOneSubstitutedAndOneSameGeneric.lazy.log |    54 -
 ...ErasedAllowForExactSupertypeCheck.lazy.log |    45 -
 ...orOverridenVarianceWithProjection.lazy.log |    52 -
 ...orSupertypeCheckWithContrvariance.lazy.log |    49 -
 ...owForSupertypeCheckWithCovariance.lazy.log |    49 -
 ...edAllowForTypeWithIrrelevantMixin.lazy.log |    48 -
 ...rTypeWithTwoSameTypeSubstitutions.lazy.log |    52 -
 ...dAllowForTypeWithoutTypeArguments.lazy.log |    48 -
 .../tests/cast/IsErasedAllowFromOut.lazy.log  |    42 -
 .../tests/cast/IsErasedAllowFromOut2.lazy.log |    42 -
 .../cast/IsErasedAllowFromOutAtClass.lazy.log |    42 -
 .../IsErasedAllowParameterSubtype.lazy.log    |    49 -
 .../IsErasedAllowSameClassParameter.lazy.log  |    42 -
 ...ErasedAllowSameParameterParameter.lazy.log |    41 -
 ...llowDifferentArgInvariantPosition.lazy.log |    42 -
 ...rasedDisallowForOverridenVariance.lazy.log |    52 -
 ...sedDisallowForTypeWithConstraints.lazy.log |    39 -
 .../cast/IsErasedDisallowFromAny.lazy.log     |    42 -
 .../cast/IsErasedDisallowFromIn.lazy.log      |    42 -
 .../cast/IsErasedDisallowFromOut.lazy.log     |    42 -
 .../IsErasedDisallowFromOutAtClass.lazy.log   |    42 -
 ...MappedToTwoParamsWithFirstInvalid.lazy.log |    55 -
 ...appedToTwoParamsWithSecondInvalid.lazy.log |    55 -
 .../tests/cast/IsErasedNonGeneric.lazy.log    |    33 -
 .../tests/cast/IsErasedNullableTasT.lazy.log  |    37 -
 .../tests/cast/IsErasedStar.lazy.log          |    38 -
 .../tests/cast/IsErasedTasT.lazy.log          |    30 -
 .../tests/cast/IsErasedToErrorType.lazy.log   |    46 -
 .../cast/IsRecursionSustainable.lazy.log      |    67 -
 .../diagnostics/tests/cast/IsReified.lazy.log |    42 -
 .../diagnostics/tests/cast/IsTraits.lazy.log  |    33 -
 .../cast/WhenErasedDisallowFromAny.lazy.log   |    42 -
 .../tests/cast/WhenWithExpression.lazy.log    |   115 -
 .../tests/cast/bare/AsNestedBare.lazy.log     |    41 -
 .../tests/cast/bare/AsNullable.lazy.log       |    49 -
 .../cast/bare/AsNullableNotEnough.lazy.log    |    39 -
 .../tests/cast/bare/EitherAs.lazy.log         |    74 -
 .../tests/cast/bare/EitherIs.lazy.log         |   104 -
 .../tests/cast/bare/EitherNotIs.lazy.log      |   104 -
 .../tests/cast/bare/EitherSafeAs.lazy.log     |    74 -
 .../tests/cast/bare/EitherWhen.lazy.log       |    94 -
 .../cast/bare/ErrorsInSubstitution.lazy.log   |    52 -
 .../tests/cast/bare/FromErrorType.lazy.log    |    47 -
 .../tests/cast/bare/NullableAs.lazy.log       |    44 -
 .../cast/bare/NullableAsNotEnough.lazy.log    |    34 -
 .../cast/bare/NullableAsNullable.lazy.log     |    49 -
 .../bare/NullableAsNullableNotEnough.lazy.log |    39 -
 .../cast/bare/RedundantNullable.lazy.log      |    43 -
 .../tests/cast/bare/ToErrorType.lazy.log      |    46 -
 .../tests/cast/bare/UnrelatedAs.lazy.log      |    34 -
 .../tests/cast/bare/UnrelatedColon.lazy.log   |    33 -
 .../tests/cast/bare/UnrelatedIs.lazy.log      |    33 -
 .../diagnostics/tests/cast/constants.lazy.log |    46 -
 .../tests/cast/isErasedAnyAndStarred.lazy.log |    37 -
 .../tests/cast/isErasedTAndStarred.lazy.log   |    33 -
 .../cast/isErasedUnrelatedAndStarred.lazy.log |    33 -
 .../diagnostics/tests/cast/kt614.lazy.log     |    38 -
 .../neverSucceeds/CastToNotNullSuper.lazy.log |    39 -
 .../cast/neverSucceeds/MappedDirect.lazy.log  |   230 -
 .../neverSucceeds/MappedSubtypes.lazy.log     |   120 -
 .../neverSucceeds/NoGenericsRelated.lazy.log  |   176 -
 .../NoGenericsUnrelated.lazy.log              |   122 -
 .../checkArguments/SpreadVarargs.lazy.log     |  1992 --
 .../booleanExpressions.lazy.log               |    69 -
 .../kt1897_diagnostic_part.lazy.log           |   357 -
 .../tests/checkArguments/kt1940.lazy.log      |    76 -
 .../diagnostics/tests/checkType.lazy.log      |   127 -
 ...lassObjectCannotAccessClassFields.lazy.log |    99 -
 .../ClassObjectVisibility.lazy.log            |   173 -
 .../tests/classObjects/ClassObjects.lazy.log  |   511 -
 .../InnerClassClassObject.lazy.log            |    18 -
 .../classObjectInLocalClass.lazy.log          |    19 -
 .../importClassInClassObject.lazy.log         |    40 -
 .../invisibleClassObjects.lazy.log            |   471 -
 .../tests/classObjects/kt3866.lazy.log        |   159 -
 .../nestedClassInPrivateClassObject.lazy.log  |   201 -
 ...ninitializedOrReassignedVariables.lazy.log |  1730 --
 .../backingFieldInsideGetter.lazy.log         |   308 -
 .../breakOrContinueInLoopCondition.lazy.log   |   155 -
 .../checkInnerLocalDeclarations.lazy.log      |    24 -
 .../checkPropertyAccessor.lazy.log            |    45 -
 .../deadCode/commasAndWhitespaces.lazy.log    |   182 -
 .../deadCode/commentsInDeadCode.lazy.log      |   212 -
 .../deadCode/deadCallInInvokeCall.lazy.log    |   203 -
 .../deadCode/deadCallInReceiver.lazy.log      |   200 -
 .../deadCodeDifferentExamples.lazy.log        |   370 -
 .../deadCodeFromDifferentSources.lazy.log     |   212 -
 .../deadCode/deadCodeInArrayAccess.lazy.log   |   397 -
 .../deadCode/deadCodeInAssignment.lazy.log    |   220 -
 .../deadCodeInBinaryExpressions.lazy.log      |   283 -
 .../deadCode/deadCodeInCalls.lazy.log         |   211 -
 .../deadCode/deadCodeInDeadCode.lazy.log      |   219 -
 .../deadCode/deadCodeInIf.lazy.log            |   202 -
 .../deadCodeInInnerExpressions.lazy.log       |   243 -
 .../deadCodeInLocalDeclarations.lazy.log      |   279 -
 .../deadCode/deadCodeInLoops.lazy.log         |   230 -
 .../deadCode/deadCodeInReturn.lazy.log        |   161 -
 .../deadCode/deadCodeInUnaryExpr.lazy.log     |   214 -
 .../deadCodeInWhileFromBreak.lazy.log         |   135 -
 .../deadCode/expressionInUnitLiteral.lazy.log |    72 -
 .../deadCode/kt2585_1.lazy.log                |   174 -
 .../deadCode/kt2585_2.lazy.log                |   191 -
 .../deadCode/kt2585_3.lazy.log                |   210 -
 .../deadCode/kt3162tryAsInitializer.lazy.log  |    59 -
 .../deadCode/kt5200DeadCodeInLambdas.lazy.log |   186 -
 .../ReturnFromFunctionInObject.lazy.log       |    39 -
 .../kt3444_ReturnFromLocalFunctions.lazy.log  |    54 -
 .../definiteReturn/kt4034.lazy.log            |    32 -
 .../definiteReturnInWhen.lazy.log             |    53 -
 .../tests/controlFlowAnalysis/kt1001.lazy.log |   104 -
 .../tests/controlFlowAnalysis/kt1027.lazy.log |   135 -
 .../tests/controlFlowAnalysis/kt1066.lazy.log |   196 -
 .../tests/controlFlowAnalysis/kt1156.lazy.log |   413 -
 .../controlFlowAnalysis/kt1185enums.lazy.log  |   325 -
 .../tests/controlFlowAnalysis/kt1189.lazy.log |   523 -
 .../tests/controlFlowAnalysis/kt1191.lazy.log |    63 -
 .../controlFlowAnalysis/kt1219.1301.lazy.log  |   377 -
 .../tests/controlFlowAnalysis/kt1571.lazy.log |   259 -
 .../tests/controlFlowAnalysis/kt1977.lazy.log |   282 -
 .../kt2166_kt2103.lazy.log                    |    43 -
 .../tests/controlFlowAnalysis/kt2226.lazy.log |    54 -
 .../tests/controlFlowAnalysis/kt2330.lazy.log |   281 -
 .../tests/controlFlowAnalysis/kt2334.lazy.log |    15 -
 .../tests/controlFlowAnalysis/kt2369.lazy.log |   192 -
 .../tests/controlFlowAnalysis/kt2845.lazy.log |   285 -
 .../tests/controlFlowAnalysis/kt2960.lazy.log |   171 -
 .../tests/controlFlowAnalysis/kt2972.lazy.log |   197 -
 .../tests/controlFlowAnalysis/kt3444.lazy.log |    39 -
 .../tests/controlFlowAnalysis/kt3501.lazy.log |    30 -
 .../tests/controlFlowAnalysis/kt4405.lazy.log |    26 -
 .../tests/controlFlowAnalysis/kt510.lazy.log  |    42 -
 .../tests/controlFlowAnalysis/kt607.lazy.log  |    51 -
 .../tests/controlFlowAnalysis/kt609.lazy.log  |    48 -
 .../tests/controlFlowAnalysis/kt610.lazy.log  |    24 -
 .../tests/controlFlowAnalysis/kt776.lazy.log  |    84 -
 .../tests/controlFlowAnalysis/kt843.lazy.log  |    24 -
 .../tests/controlFlowAnalysis/kt897.lazy.log  |    56 -
 .../controlFlowAnalysis/localClasses.lazy.log |    24 -
 .../propertiesOrderInPackage.lazy.log         |    50 -
 .../referenceToPropertyInitializer.lazy.log   |   210 -
 ...tUnitializedErrorOnlyForLocalVars.lazy.log |   111 -
 .../scopeOfAnonymousInitializer.lazy.log      |    40 -
 .../uninitializedInLocalDeclarations.lazy.log |   172 -
 .../controlFlowAnalysis/unmappedArgs.lazy.log |    83 -
 .../varInitializationInIfInCycle.lazy.log     |   111 -
 .../ForWithoutBraces.lazy.log                 |   105 -
 ...rbidStatementAsDirectFunctionBody.lazy.log |    97 -
 .../tests/controlStructures/emptyIf.lazy.log  |    92 -
 .../forLoopWithNullableRange.lazy.log         |   144 -
 .../forWithNullableIterator.lazy.log          |   129 -
 .../jumpAcrossFunctionBoundary.lazy.log       |    65 -
 .../tests/controlStructures/kt1075.lazy.log   |   116 -
 .../tests/controlStructures/kt4310.lazy.log   |    42 -
 .../tests/controlStructures/kt657.lazy.log    |    81 -
 .../kt770.kt351.kt735_StatementType.lazy.log  |   546 -
 .../tests/controlStructures/kt786.lazy.log    |    74 -
 .../tests/controlStructures/kt799.lazy.log    |   113 -
 .../controlStructures/tryReturnType.lazy.log  |    69 -
 .../valVarCatchParameter.lazy.log             |    42 -
 .../valVarLoopParameter.lazy.log              |    58 -
 .../when.kt234.kt973.lazy.log                 |   102 -
 .../classIndirectlyInheritsNested.lazy.log    |    34 -
 .../classInheritsNested.lazy.log              |    26 -
 .../cyclicHierarchy/cyclicHierarchy.lazy.log  |   463 -
 .../javaKotlinJavaCycle.lazy.log              |    55 -
 .../cyclicHierarchy/kotlinJavaCycle.lazy.log  |    48 -
 .../kotlinJavaKotlinCycle.lazy.log            |    56 -
 .../kotlinJavaNestedCycle.lazy.log            |    59 -
 .../tests/cyclicHierarchy/kt303.lazy.log      |    67 -
 .../twoClassesWithNestedCycle.lazy.log        |    34 -
 .../bothParamsAreNotProperties.lazy.log       |   173 -
 .../componentFunctionInSubClass.lazy.log      |   124 -
 .../componentFunctionVisibility.lazy.log      |   255 -
 .../componentFunctionsAreFinal.lazy.log       |    74 -
 .../componentNamedComponent1.lazy.log         |   101 -
 .../conflictingCopyOverloads.lazy.log         |    96 -
 .../dataClasses/conflictingOverloads.lazy.log |    49 -
 .../dataClassOverrideConflict.lazy.log        |    62 -
 .../dataClasses/emptyConstructor.lazy.log     |   165 -
 .../dataClasses/firstParamIsVal.lazy.log      |   138 -
 .../dataClasses/firstParamIsVar.lazy.log      |   138 -
 .../implementTraitWhichHasComponent1.lazy.log |    43 -
 ...ementTraitWhichHasFinalComponent1.lazy.log |    43 -
 .../dataClasses/multiDeclaration.lazy.log     |   108 -
 .../dataClasses/multiDeclarationFor.lazy.log  |   127 -
 .../tests/dataClasses/noConstructor.lazy.log  |   165 -
 .../tests/dataClasses/notADataClass.lazy.log  |   159 -
 .../tests/dataClasses/oneValParam.lazy.log    |   134 -
 .../overrideInvisibleMember.lazy.log          |    58 -
 .../dataClasses/paramNameSameToField.lazy.log |   219 -
 .../dataClasses/secondParamIsVal.lazy.log     |   138 -
 .../dataClasses/secondParamIsVar.lazy.log     |   138 -
 .../tests/dataClasses/twoValParams.lazy.log   |   103 -
 .../tests/dataClasses/twoVarParams.lazy.log   |   103 -
 .../tests/dataFlow/CalleeExpression.lazy.log  |    52 -
 .../tests/dataFlow/EmptyIf.lazy.log           |   156 -
 .../tests/dataFlow/IsExpression.lazy.log      |   119 -
 .../tests/dataFlow/WhenSubject.lazy.log       |    46 -
 .../dataFlow/local/LocalClassBase.lazy.log    |    81 -
 .../LocalClassDefaultParameters.lazy.log      |    49 -
 .../LocalClassDelegatedProperties.lazy.log    |   301 -
 .../local/LocalClassDelegation.lazy.log       |    38 -
 .../local/LocalClassFunctions.lazy.log        |    71 -
 .../LocalClassInMemberOfLocalClass.lazy.log   |    59 -
 .../local/LocalClassInitializer.lazy.log      |    56 -
 .../local/LocalClassProperty.lazy.log         |    69 -
 .../tests/dataFlow/local/LocalObject.lazy.log |    65 -
 .../local/LocalObjectDelegation.lazy.log      |    79 -
 .../dataFlow/local/NestedLocalClass.lazy.log  |    44 -
 .../tests/dataFlow/local/kt2835.lazy.log      |    67 -
 .../dataFlowInfoTraversal/AndOr.lazy.log      |   335 -
 .../ArrayAccess.lazy.log                      |   323 -
 .../ArrayExpression.lazy.log                  |    53 -
 .../ArrayGetSetConvention.lazy.log            |   178 -
 .../ArrayIndices.lazy.log                     |   109 -
 .../dataFlowInfoTraversal/Assignment.lazy.log |   106 -
 .../AssignmentInInitializer.lazy.log          |   106 -
 .../AssignmentOperation.lazy.log              |   228 -
 .../AssignmentToArrayElement.lazy.log         |    84 -
 .../BinaryExpression.lazy.log                 |   212 -
 ...BinaryExpressionBooleanOperations.lazy.log |   133 -
 ...naryExpressionCompareToConvention.lazy.log |   119 -
 ...inaryExpressionContainsConvention.lazy.log |    58 -
 .../BinaryExpressionElvis.lazy.log            |   118 -
 .../BinaryExpressionEqualsConvention.lazy.log |    81 -
 .../BinaryExpressionIdentifier.lazy.log       |    74 -
 .../BinaryExpressionPlusConvention.lazy.log   |   120 -
 .../dataFlowInfoTraversal/Condition.lazy.log  |    64 -
 .../ContinueOuterLoop.lazy.log                |   211 -
 .../dataFlowInfoTraversal/DeepIf.lazy.log     |   466 -
 .../dataFlowInfoTraversal/DoWhile.lazy.log    |   181 -
 .../DoWhileCondition.lazy.log                 |   125 -
 .../dataFlowInfoTraversal/Elvis.lazy.log      |   139 -
 .../dataFlowInfoTraversal/ExclExcl.lazy.log   |   328 -
 .../tests/dataFlowInfoTraversal/For.lazy.log  |   277 -
 .../ForLoopRange.lazy.log                     |    64 -
 .../FunctionLiteral.lazy.log                  |   161 -
 .../IfStatement.lazy.log                      |   139 -
 .../dataFlowInfoTraversal/IfThenElse.lazy.log |   333 -
 .../IfThenElseBothInvalid.lazy.log            |   149 -
 .../IsExpression.lazy.log                     |    44 -
 .../dataFlowInfoTraversal/ManyIfs.lazy.log    |  1078 -
 .../MultiDeclaration.lazy.log                 |    72 -
 .../ObjectExpression.lazy.log                 |   140 -
 .../QualifiedExpression.lazy.log              |   170 -
 .../dataFlowInfoTraversal/Return.lazy.log     |   190 -
 .../StringTemplate.lazy.log                   |    78 -
 .../dataFlowInfoTraversal/ThisSuper.lazy.log  |   299 -
 .../dataFlowInfoTraversal/Throw.lazy.log      |   259 -
 .../dataFlowInfoTraversal/TryCatch.lazy.log   |   159 -
 .../dataFlowInfoTraversal/TryFinally.lazy.log |   104 -
 .../UnaryExpression.lazy.log                  |   288 -
 .../tests/dataFlowInfoTraversal/When.lazy.log |   130 -
 .../WhenEntryAs.lazy.log                      |    94 -
 .../WhenEntryIs.lazy.log                      |    79 -
 .../dataFlowInfoTraversal/WhenIn.lazy.log     |    79 -
 .../WhenSubject.lazy.log                      |    44 -
 .../dataFlowInfoTraversal/While.lazy.log      |   238 -
 .../WhileCondition.lazy.log                   |   120 -
 .../kt4332WhenBranches.lazy.log               |    98 -
 .../kt5155WhenBranches.lazy.log               |    72 -
 .../kt5182WhenBranches.lazy.log               |    59 -
 .../smartcasts/SmartcastAmbiguitites.lazy.log |    51 -
 .../SmartcastsForStableIdentifiers.lazy.log   |   895 -
 ...mponentFunctionReturnTypeMismatch.lazy.log |    47 -
 ...onflictingAndRedundantProjections.lazy.log |    27 -
 .../DataFlowInMultiDeclInFor.lazy.log         |    83 -
 .../DataFlowInfoInMultiDecl.lazy.log          |    92 -
 ...ocalVariableWithNoTypeInformation.lazy.log |    15 -
 .../MultiDeclarationErrors.lazy.log           |   166 -
 .../RedeclarationsInMultiDecl.lazy.log        |   121 -
 ...FunctionAndPropertyTypeParameters.lazy.log |    27 -
 .../ambiguousObjectExpressionType.lazy.log    |   590 -
 .../illegalModifiersOnClass.lazy.log          |    23 -
 .../tests/declarationChecks/kt1141.lazy.log   |    83 -
 .../tests/declarationChecks/kt1193.lazy.log   |    32 -
 .../tests/declarationChecks/kt2096.lazy.log   |    17 -
 .../tests/declarationChecks/kt2142.lazy.log   |    35 -
 .../tests/declarationChecks/kt2397.lazy.log   |    26 -
 .../kt2631_MultipleDeclaration.lazy.log       |   115 -
 .../kt2643MultiDeclInControlFlow.lazy.log     |   118 -
 .../tests/declarationChecks/kt559.lazy.log    |    72 -
 .../localDeclarationModifiers.lazy.log        |    26 -
 .../localFunctionNoInheritVisibility.lazy.log |    54 -
 .../DoubleDeclForLoop.lazy.log                |    84 -
 .../FolLoopTypeComponentTypeMismatch.lazy.log |    92 -
 ...ForLoopComponentFunctionAmbiguity.lazy.log |    85 -
 .../ForLoopComponentFunctionMissing.lazy.log  |   115 -
 .../ForLoopWithExtensions.lazy.log            |   100 -
 .../ForWithExplicitTypes.lazy.log             |    92 -
 .../RedeclarationInForLoop.lazy.log           |    84 -
 .../SingleDeclForLoop.lazy.log                |    78 -
 .../multiDeclarations/kt2829.lazy.log         |   170 -
 .../packageDeclarationModifiers.lazy.log      |    34 -
 ...tyInPackageHasNoInheritVisibility.lazy.log |    47 -
 .../unambiguousObjectExpressionType.lazy.log  |  2786 ---
 .../valVarFunctionParameter.lazy.log          |    95 -
 .../absentErrorAboutInitializer.lazy.log      |   144 -
 .../absentErrorAboutType.lazy.log             |   148 -
 .../abstractDelegatedProperty.lazy.log        |   190 -
 .../delegatedProperty/backingField.lazy.log   |   203 -
 ...delegatedPropertyOverridedInTrait.lazy.log |   215 -
 ...pertyOverridedInTraitTypeMismatch.lazy.log |   219 -
 .../delegatedProperty/genericGetter.lazy.log  |   289 -
 .../getterWithSubtype.lazy.log                |   176 -
 .../tests/delegatedProperty/inTrait.lazy.log  |   190 -
 .../incompleteTypeInference.lazy.log          |   259 -
 .../differentDelegatedExpressions.lazy.log    |  2193 --
 .../inference/extensionGet.lazy.log           |   696 -
 .../inference/extensionProperty.lazy.log      |   945 -
 .../labeledDelegatedExpression.lazy.log       |   362 -
 .../noErrorsForImplicitConstraints.lazy.log   |  1354 --
 ...xpectedTypeForSupertypeConstraint.lazy.log |   393 -
 .../useCompleterWithoutExpectedType.lazy.log  |   383 -
 .../inference/useExpectedType.lazy.log        |  2939 ---
 .../inference/useExpectedTypeForVal.lazy.log  |  1938 --
 .../tests/delegatedProperty/kt4640.lazy.log   |   169 -
 .../delegatedProperty/localVariable.lazy.log  |    92 -
 .../delegatedProperty/missedGetter.lazy.log   |   143 -
 .../delegatedProperty/missedSetter.lazy.log   |   190 -
 .../propertyDefferedType.lazy.log             |   412 -
 .../propertyDelegatedAmbiguity.lazy.log       |   146 -
 .../propertyDelegatedIncomplete.lazy.log      |   127 -
 .../propertyDelegatedMissing.lazy.log         |   144 -
 .../propertyDelegatedPrivate.lazy.log         |   159 -
 .../propertyDelegatedWrongArguments.lazy.log  |   193 -
 .../publicDelegatedProperty.lazy.log          |   148 -
 .../delegatedProperty/recursiveType.lazy.log  |   274 -
 .../redundantGetter.lazy.log                  |   144 -
 .../redundantSetter.lazy.log                  |   189 -
 .../setterThisTypeMismatch.lazy.log           |   394 -
 .../setterWithSupertype.lazy.log              |   221 -
 .../delegatedProperty/thisInDelegate.lazy.log |   387 -
 .../delegatedProperty/thisOfAnyType.lazy.log  |   327 -
 .../thisOfNothingNullableType.lazy.log        |   380 -
 .../thisOfNothingType.lazy.log                |   436 -
 .../delegatedProperty/twoGetMethods.lazy.log  |   237 -
 .../typeMismatchForGetReturnType.lazy.log     |   148 -
 .../typeMismatchForGetWithGeneric.lazy.log    |   502 -
 .../typeMismatchForSetParameter.lazy.log      |   401 -
 .../typeMismatchForThisGetParameter.lazy.log  |   315 -
 .../wrongCountOfParametersInGet.lazy.log      |   331 -
 .../wrongCountOfParametersInSet.lazy.log      |   402 -
 .../wrongSetterReturnType.lazy.log            |   184 -
 .../DelegationAndOverriding.lazy.log          |    87 -
 .../DelegationExpectedType.lazy.log           |   150 -
 .../delegation/DelegationNotTotrait.lazy.log  |    63 -
 .../delegation/DelegationToJavaIface.lazy.log |   176 -
 .../Delegation_ClashingFunctions.lazy.log     |   134 -
 .../delegation/Delegation_Hierarchy.lazy.log  |    52 -
 .../Delegation_MultipleDelegates.lazy.log     |    61 -
 ...legation_ScopeInitializationOrder.lazy.log |    30 -
 .../ArrayAccessAssignment.lazy.log            |    37 -
 .../checkDeparenthesizedType.lazy.log         |   234 -
 ...classFunctionOverriddenByProperty.lazy.log |    38 -
 ...OverriddenByPropertyInConstructor.lazy.log |    38 -
 ...ctionOverriddenByPropertyNoGetter.lazy.log |    39 -
 ...classPropertyOverriddenByFunction.lazy.log |    38 -
 .../defaultFunction.lazy.log                  |    36 -
 ...gatedFunctionOverriddenByProperty.lazy.log |    41 -
 .../genericClassFunction.lazy.log             |    42 -
 .../overridesNothing.lazy.log                 |    25 -
 .../phantomClashWithSamAdapter.lazy.log       |   119 -
 ...ClassFunctionOverriddenByProperty.lazy.log |    38 -
 .../accidentalOverrides/require.lazy.log      |    25 -
 ...traitFunctionOverriddenByProperty.lazy.log |    30 -
 ...nctionOverriddenByPropertyInTrait.lazy.log |    30 -
 ...unctionOverriddenByPropertyNoImpl.lazy.log |    26 -
 ...traitPropertyOverriddenByFunction.lazy.log |    30 -
 ...opertyOverriddenByFunctionInTrait.lazy.log |    30 -
 ...ropertyOverriddenByFunctionNoImpl.lazy.log |    30 -
 .../bridges/class.lazy.log                    |    41 -
 .../bridges/fakeOverrideTrait.lazy.log        |    33 -
 .../bridges/trait.lazy.log                    |    33 -
 .../caseInProperties.lazy.log                 |    24 -
 .../erasure/collections.lazy.log              |    30 -
 .../erasure/delegateToTwoTraits.lazy.log      |    53 -
 .../erasure/delegationAndOwnMethod.lazy.log   |    45 -
 .../erasure/extensionProperties.lazy.log      |    33 -
 .../erasure/genericType.lazy.log              |    42 -
 .../erasure/inheritFromTwoTraits.lazy.log     |    40 -
 .../erasure/kotlinAndJavaCollections.lazy.log |    56 -
 .../erasure/nullableType.lazy.log             |    22 -
 .../erasure/twoTraitsAndOwnFunction.lazy.log  |    44 -
 .../erasure/typeMappedToJava.lazy.log         |    37 -
 .../erasure/typeParameter.lazy.log            |    38 -
 .../erasure/typeParameterWithBound.lazy.log   |    34 -
 .../typeParameterWithTwoBounds.lazy.log       |    42 -
 ...typeParameterWithTwoBoundsInWhere.lazy.log |    42 -
 .../functionAndProperty/class.lazy.log        |    22 -
 .../functionAndProperty/classObject.lazy.log  |    22 -
 .../classPropertyInConstructor.lazy.log       |    27 -
 ...xtensionFunctionAndNormalFunction.lazy.log |    23 -
 .../extensionPropertyAndFunction.lazy.log     |    31 -
 .../functionAndSetter.lazy.log                |    23 -
 .../functionAndVar.lazy.log                   |    23 -
 .../functionAndProperty/localClass.lazy.log   |    21 -
 .../localClassInClass.lazy.log                |    22 -
 .../functionAndProperty/nestedClass.lazy.log  |    22 -
 .../functionAndProperty/object.lazy.log       |    22 -
 .../objectExpression.lazy.log                 |    29 -
 .../objectExpressionInConstructor.lazy.log    |    31 -
 .../privateClassPropertyNoClash.lazy.log      |    95 -
 .../functionAndProperty/topLevel.lazy.log     |    22 -
 .../topLevelDifferentFiles.lazy.log           |    22 -
 .../topLevelGetter.lazy.log                   |    27 -
 .../functionAndProperty/trait.lazy.log        |    27 -
 .../withErrorTypes.lazy.log                   |    32 -
 .../missingNames.lazy.log                     |    28 -
 .../specialNames/classObject.lazy.log         |    54 -
 .../classObjectCopiedField.lazy.log           |    25 -
 .../classObjectCopiedFieldObject.lazy.log     |    55 -
 .../specialNames/dataClassCopy.lazy.log       |    83 -
 .../specialNames/defaults.lazy.log            |    25 -
 .../specialNames/delegationBy.lazy.log        |    31 -
 .../specialNames/enum.lazy.log                |    42 -
 .../specialNames/innerClassField.lazy.log     |    22 -
 .../specialNames/instance.lazy.log            |    26 -
 .../propertyMetadataCache.lazy.log            |   231 -
 .../synthesized/enumValuesValueOf.lazy.log    |    72 -
 .../traitImpl/oneTrait.lazy.log               |    25 -
 .../traitImpl/twoTraits.lazy.log              |    33 -
 .../duplicateJvmSignature/vararg.lazy.log     |    30 -
 .../tests/enum/AbstractEnum.lazy.log          |    17 -
 .../tests/enum/AbstractInEnum.lazy.log        |   131 -
 .../enum/AbstractOverrideInEnum.lazy.log      |    19 -
 .../tests/enum/classObjectInEnum.lazy.log     |    77 -
 .../enum/classObjectInEnumPrivate.lazy.log    |   157 -
 .../tests/enum/commonSupertype.lazy.log       |    82 -
 ...dontCreatePackageTypeForEnumEntry.lazy.log |   355 -
 .../enum/entryShouldBeOfEnumType.lazy.log     |    74 -
 .../enumEntryCannotHaveClassObject.lazy.log   |   141 -
 .../enum/enumEntryInAbstractEnum.lazy.log     |    32 -
 .../tests/enum/enumImplementingTrait.lazy.log |    35 -
 .../tests/enum/enumInheritance.lazy.log       |    43 -
 .../enumIsAssignableToBuiltInEnum.lazy.log    |   167 -
 .../tests/enum/enumModifier.lazy.log          |    28 -
 .../tests/enum/enumStarImport.lazy.log        |   186 -
 .../tests/enum/enumWithEmptyName.lazy.log     |    15 -
 .../enum/extensionNamedAsEnumEntry.lazy.log   |    63 -
 .../tests/enum/importEnumFromJava.lazy.log    |   102 -
 .../tests/enum/inheritFromEnumEntry.lazy.log  |    19 -
 .../tests/enum/inheritanceFromEnum.lazy.log   |   106 -
 .../enum/inner/existingClassObject.lazy.log   |    17 -
 .../tests/enum/inner/insideClass.lazy.log     |    16 -
 .../enum/inner/insideClassObject.lazy.log     |    16 -
 .../tests/enum/inner/insideEnum.lazy.log      |    16 -
 .../tests/enum/inner/insideEnumEntry.lazy.log |    16 -
 .../inner/insideInnerClassNotAllowed.lazy.log |    16 -
 .../tests/enum/inner/insideObject.lazy.log    |    16 -
 .../tests/enum/inner/insideTrait.lazy.log     |    16 -
 .../inner/redeclarationInClassObject.lazy.log |    16 -
 .../tests/enum/inner/twoEnums.lazy.log        |    16 -
 ...woEnumsInClassObjectAndInnerClass.lazy.log |    16 -
 .../tests/enum/javaEnumValueOfMethod.lazy.log |    98 -
 .../tests/enum/javaEnumValuesMethod.lazy.log  |   102 -
 .../enum/javaEnumWithAbstractFun.lazy.log     |   137 -
 .../tests/enum/javaEnumWithFuns.lazy.log      |   124 -
 .../enum/javaEnumWithNameClashing.lazy.log    |   169 -
 .../tests/enum/javaEnumWithProperty.lazy.log  |   167 -
 .../diagnostics/tests/enum/kt2834.lazy.log    |    78 -
 .../tests/enum/localEnums.lazy.log            |    53 -
 .../tests/enum/modifiersOnEnumEntry.lazy.log  |    16 -
 .../tests/enum/openMemberInEnum.lazy.log      |    36 -
 .../enum/overrideFinalEnumMethods.lazy.log    |    52 -
 .../starImportNestedClassAndEntries.lazy.log  |   100 -
 .../tests/enum/typeParametersInEnum.lazy.log  |    32 -
 ...uesValueOfAndEntriesAccessibility.lazy.log |   526 -
 .../evaluate/binaryMinusDepOnExpType.lazy.log |   615 -
 .../binaryMinusIndepWoExpType.lazy.log        |   687 -
 .../binaryMinusIndependentExpType.lazy.log    |   260 -
 .../diagnostics/tests/evaluate/float.lazy.log |    41 -
 .../tests/evaluate/intOverflow.lazy.log       |  1154 -
 .../intOverflowWithJavaProperties.lazy.log    |   173 -
 .../tests/evaluate/integer.lazy.log           |    49 -
 .../tests/evaluate/longOverflow.lazy.log      |  1035 -
 .../evaluate/numberBinaryOperations.lazy.log  |   311 -
 .../numberBinaryOperationsCall.lazy.log       |   311 -
 .../numberBinaryOperationsInfixCall.lazy.log  |   311 -
 .../tests/evaluate/otherOverflow.lazy.log     |   102 -
 .../tests/evaluate/parentesized.lazy.log      |   190 -
 .../evaluate/qualifiedExpressions.lazy.log    |    85 -
 .../evaluate/unaryMinusDepOnExpType.lazy.log  |   751 -
 .../unaryMinusIndepWoExpType.lazy.log         |   803 -
 .../unaryMinusIndependentExpType.lazy.log     |   288 -
 .../tests/evaluate/wrongLongSuffix.lazy.log   |    49 -
 .../extensions/ExtensionFunctions.lazy.log    |   621 -
 .../ExtensionsCalledOnSuper.lazy.log          |   140 -
 .../tests/extensions/GenericIterator.lazy.log |   673 -
 .../extensions/GenericIterator2.lazy.log      |   220 -
 .../tests/extensions/classObject.lazy.log     |   277 -
 .../extensionMemberInClassObject.lazy.log     |   226 -
 .../tests/extensions/kt1875.lazy.log          |   291 -
 .../tests/extensions/kt2317.lazy.log          |    91 -
 .../tests/extensions/kt3470.lazy.log          |    71 -
 .../tests/extensions/kt3563.lazy.log          |   179 -
 .../kt819ExtensionProperties.lazy.log         |   417 -
 .../extensions/noClassObjectsInJava.lazy.log  |   199 -
 .../tests/extensions/object.lazy.log          |    98 -
 .../throwOutCandidatesByReceiver.lazy.log     |   477 -
 .../throwOutCandidatesByReceiver2.lazy.log    |   224 -
 .../DanglingFunctionLiteral.lazy.log          |   209 -
 ...ctedParameterTypeMismatchVariance.lazy.log |   103 -
 .../ExpectedParametersTypesMismatch.lazy.log  |   293 -
 .../LabeledFunctionLiterals.lazy.log          |    92 -
 ...lingFunctionLiteralForNestedCalls.lazy.log |    89 -
 .../functionLIteralInBlockInIf.lazy.log       |    92 -
 .../functionLiteralInIf.lazy.log              |   388 -
 ...unctionLiteralWithoutArgumentList.lazy.log |   101 -
 .../tests/functionLiterals/kt2906.lazy.log    |   149 -
 .../tests/functionLiterals/kt4529.lazy.log    |   167 -
 .../return/AutoLabels.lazy.log                |    85 -
 .../return/AutoLabelsNonLocal.lazy.log        |    62 -
 .../ForbiddenNonLocalReturnNoType.lazy.log    |   105 -
 .../LocalAndNonLocalReturnInLambda.lazy.log   |    79 -
 .../LocalReturnExplicitLabelNoParens.lazy.log |    69 -
 .../LocalReturnExplicitLabelParens.lazy.log   |    83 -
 .../return/LocalReturnHasTypeNothing.lazy.log |    68 -
 .../LocalReturnInNestedFunction.lazy.log      |    83 -
 .../return/LocalReturnInNestedLambda.lazy.log |    78 -
 .../LocalReturnNoCoercionToUnit.lazy.log      |    79 -
 .../return/LocalReturnUnit.lazy.log           |    95 -
 ...ocalReturnsWithExplicitReturnType.lazy.log |    92 -
 .../return/MixedReturnsFromLambda.lazy.log    |    99 -
 .../functionLiterals/returnNull.lazy.log      |   200 -
 .../functionLiterals/unusedLiteral.lazy.log   |    15 -
 .../unusedLiteralInsideUnitLiteral.lazy.log   |    72 -
 .../ClassObjectBoundsAreNotSupported.lazy.log |    23 -
 .../tests/generics/Projections.lazy.log       |   676 -
 .../tests/generics/PseudoRawTypes.lazy.log    |    73 -
 .../generics/RawTypeInIsExpression.lazy.log   |    80 -
 .../generics/RawTypeInIsPattern.lazy.log      |    42 -
 .../RecursiveUpperBoundCheck.lazy.log         |    40 -
 ...cursiveUpperBoundWithTwoArguments.lazy.log |    31 -
 .../tests/generics/argumentsForT.lazy.log     |    35 -
 .../tests/generics/kt1575-Class.lazy.log      |    21 -
 .../generics/kt1575-ClassObject.lazy.log      |    21 -
 .../tests/generics/kt1575-Function.lazy.log   |    21 -
 .../tests/generics/recursive.lazy.log         |    74 -
 ...olveGenericBoundsBeforeSupertypes.lazy.log |    22 -
 .../generics/tpAsReified/Conventions.lazy.log |   146 -
 .../tpAsReified/InConstructor.lazy.log        |    95 -
 .../generics/tpAsReified/InFunction.lazy.log  |   249 -
 .../generics/tpAsReified/InProperty.lazy.log  |   187 -
 .../generics/tpAsReified/InType.lazy.log      |    28 -
 .../tpAsReified/InlineableReified.lazy.log    |    99 -
 .../generics/tpAsReified/LocalFun.lazy.log    |    55 -
 .../tpAsReified/NotInlineableReified.lazy.log |    15 -
 .../tpAsReified/ReifiedClass.lazy.log         |   164 -
 .../setterNotProjectedOutAssign.lazy.log      |   101 -
 .../setterProjectedOutAssign.lazy.log         |   106 -
 .../setterProjectedOutNoPlusAssign.lazy.log   |   100 -
 ...tterProjectedOutPlusAssignDefined.lazy.log |    99 -
 .../imports/ImportResolutionOrder.lazy.log    |    56 -
 ...tsHiddenByDefinitionInTheSameFile.lazy.log |    26 -
 .../tests/imports/RenameOnImport.lazy.log     |    41 -
 ...NoSenselessComparisonForErrorType.lazy.log |    76 -
 .../SupertypeOfErrorType.lazy.log             |   388 -
 .../arrayBracketsRange.lazy.log               |   122 -
 .../checkNothingIsSubtype.lazy.log            |    60 -
 .../controlStructuresErrors.lazy.log          |   460 -
 .../arrayExpression.lazy.log                  |    54 -
 .../checkBackingFieldException.lazy.log       |   290 -
 ...eteFunctionArgumentsOfNestedCalls.lazy.log |   116 -
 .../funEquals.lazy.log                        |    15 -
 .../funKeyword.lazy.log                       |    15 -
 .../funcitonTypes.lazy.log                    |    16 -
 .../incompleteEnumReference.lazy.log          |    42 -
 .../incompleteVal.lazy.log                    |    17 -
 .../incompleteValWithAccessor.lazy.log        |    21 -
 .../incompleteWhen.lazy.log                   |    30 -
 .../namedFun.lazy.log                         |    15 -
 .../noTypeParamsInReturnType.lazy.log         |   203 -
 .../typeReferenceError.lazy.log               |    25 -
 .../tests/incompleteCode/inExpr.lazy.log      |    28 -
 .../incompleteAssignment.lazy.log             |   643 -
 .../incompleteCode/incompleteEquals.lazy.log  |    32 -
 .../tests/incompleteCode/kt1955.lazy.log      |    16 -
 .../tests/incompleteCode/kt2014.lazy.log      |   272 -
 .../kt4866UnresolvedArrayAccess.lazy.log      |    90 -
 .../incompleteCode/plusOnTheRight.lazy.log    |    68 -
 ...seudocodeTraverseNextInstructions.lazy.log |    66 -
 .../senselessComparisonWithNull.lazy.log      |    84 -
 .../typeParameterOnLhsOfDot.lazy.log          |   130 -
 .../unresolvedArguments.lazy.log              |   144 -
 .../unresolvedOperation.lazy.log              |   126 -
 .../variableDeclarationInSelector.lazy.log    |    30 -
 .../NoInferenceFromDeclaredBounds.lazy.log    |    71 -
 .../tests/inference/arrayConstructor.lazy.log |    95 -
 .../cannotCompleteResolveAmbiguity.lazy.log   |   178 -
 ...pleteResolveFunctionLiteralsNoUse.lazy.log |    57 -
 ...CompleteResolveNoInfoForParameter.lazy.log |   198 -
 ...nnotCompleteResolveNoneApplicable.lazy.log |    78 -
 ...mpleteResolveWithFunctionLiterals.lazy.log |    65 -
 .../completeInferenceIfManyFailed.lazy.log    |    70 -
 .../conflictingSubstitutions.lazy.log         |   563 -
 .../constraintOnFunctionLiteral.lazy.log      |   559 -
 .../equalityConstraintOnNullableType.lazy.log |   327 -
 .../notNullConstraintOnNullableType.lazy.log  |   330 -
 .../subtypeConstraintOnNullableType.lazy.log  |   331 -
 ...supertypeConstraintOnNullableType.lazy.log |   331 -
 .../inference/dependOnExpectedType.lazy.log   |   856 -
 .../inference/dependantOnVariance.lazy.log    |   956 -
 .../dependantOnVarianceNullable.lazy.log      |   433 -
 .../functionPlaceholderError.lazy.log         |   218 -
 .../hasErrorInConstrainingTypes.lazy.log      |   123 -
 .../inference/immutableArrayList.lazy.log     |   195 -
 .../inferInFunctionLiterals.lazy.log          |   336 -
 .../tests/inference/kt1293.lazy.log           |    92 -
 .../tests/inference/kt3184.lazy.log           |   804 -
 .../tests/inference/kt6175.lazy.log           |   290 -
 .../tests/inference/kt619.lazy.log            |    62 -
 .../tests/inference/listConstructor.lazy.log  |   504 -
 .../tests/inference/mapFunction.lazy.log      |   168 -
 .../mostSpecificAfterInference.lazy.log       |   142 -
 .../nestedCalls/arrayAccess.lazy.log          |   201 -
 .../nestedCalls/binaryExpressions.lazy.log    |   857 -
 .../checkTypesForQualifiedProperties.lazy.log |    80 -
 ...eNestedCallsForArraySetExpression.lazy.log |   110 -
 .../completeNestedCallsInference.lazy.log     |   539 -
 ...teNestedForVariableAsFunctionCall.lazy.log |   221 -
 .../inferenceForNestedBinaryCall.lazy.log     |    74 -
 .../inference/nestedCalls/kt3395.lazy.log     |   545 -
 .../nestedCalls/kt3461checkTypes.lazy.log     |   108 -
 .../makeNullableIfSafeCall.lazy.log           |   432 -
 .../nontrivialCallExpression.lazy.log         |   334 -
 .../noInformationForParameter.lazy.log        |   288 -
 .../inference/nullableUpperBound.lazy.log     |    66 -
 .../tests/inference/opposite.lazy.log         |    84 -
 .../possibleCycleOnConstraints.lazy.log       |   230 -
 .../inference/regressions/compareBy.lazy.log  |   214 -
 .../inference/regressions/kt1029.lazy.log     |    92 -
 .../inference/regressions/kt1031.lazy.log     |   160 -
 .../inference/regressions/kt1127.lazy.log     |    51 -
 .../inference/regressions/kt1145.lazy.log     |   101 -
 .../inference/regressions/kt1358.lazy.log     |    85 -
 .../inference/regressions/kt1410.lazy.log     |   182 -
 .../inference/regressions/kt1558.lazy.log     |   269 -
 .../inference/regressions/kt1718.lazy.log     |   336 -
 .../inference/regressions/kt1944.lazy.log     |    87 -
 .../inference/regressions/kt2179.lazy.log     |   700 -
 .../inference/regressions/kt2200.lazy.log     |   129 -
 .../inference/regressions/kt2283.lazy.log     |    64 -
 .../inference/regressions/kt2286.lazy.log     |   164 -
 .../inference/regressions/kt2294.lazy.log     |    77 -
 .../inference/regressions/kt2320.lazy.log     |   219 -
 .../inference/regressions/kt2324.lazy.log     |   712 -
 .../inference/regressions/kt2407.lazy.log     |   436 -
 .../inference/regressions/kt2445.lazy.log     |    70 -
 .../inference/regressions/kt2459.lazy.log     |   236 -
 .../inference/regressions/kt2484.lazy.log     |   309 -
 .../inference/regressions/kt2505.lazy.log     |   194 -
 .../inference/regressions/kt2514.lazy.log     |   483 -
 .../inference/regressions/kt2741.lazy.log     |   259 -
 .../inference/regressions/kt2838.lazy.log     |   258 -
 .../inference/regressions/kt2841.lazy.log     |   138 -
 .../inference/regressions/kt2841_it.lazy.log  |   140 -
 .../regressions/kt2841_it_this.lazy.log       |   234 -
 .../regressions/kt2841_this.lazy.log          |   216 -
 .../inference/regressions/kt2842.lazy.log     |   151 -
 .../inference/regressions/kt2883.lazy.log     |   156 -
 .../inference/regressions/kt3007.lazy.log     |   443 -
 .../inference/regressions/kt3038.lazy.log     |   181 -
 .../inference/regressions/kt3150.lazy.log     |   249 -
 .../inference/regressions/kt3174.lazy.log     |    92 -
 .../inference/regressions/kt3301.lazy.log     |    92 -
 .../inference/regressions/kt3344.lazy.log     |   740 -
 .../inference/regressions/kt702.lazy.log      |   466 -
 .../inference/regressions/kt731.lazy.log      |   109 -
 .../inference/regressions/kt742.lazy.log      |   214 -
 .../inference/regressions/kt832.lazy.log      |    49 -
 .../inference/regressions/kt943.lazy.log      |   517 -
 .../inference/regressions/kt948.lazy.log      |   334 -
 .../ErrorTypeAsGenericParameter.lazy.log      |   125 -
 .../FunctionPlaceholder.lazy.log              |   237 -
 ...mbiguityForDifferentFunctionTypes.lazy.log |   124 -
 ...otInferParameterTypeWithInference.lazy.log |    72 -
 ...typeForInvariantWithErrorGenerics.lazy.log |   129 -
 ...umberLowerBoundsBeforeUpperBounds.lazy.log |   203 -
 .../typeConstructorMismatch.lazy.log          |   141 -
 ...typeInferenceExpectedTypeMismatch.lazy.log |   598 -
 ...ictingSubstitutionsFromUpperBound.lazy.log |   428 -
 .../doNotInferFromBoundsOnly.lazy.log         |   365 -
 .../upperBounds/intersectUpperBounds.lazy.log |   324 -
 .../inference/upperBounds/kt2856.lazy.log     |   436 -
 .../upperBounds/nonNullUpperBound.lazy.log    |   212 -
 .../useBoundsIfUnknownParameters.lazy.log     |    78 -
 .../useBoundsToInferTypeParamsSimple.lazy.log |   196 -
 .../useFunctionLiteralsToInferType.lazy.log   |   485 -
 .../inference/varargs/varargsAndPair.lazy.log |    74 -
 .../PropertiesWithBackingFields.lazy.log      |   217 -
 .../tests/infos/SmartCasts.lazy.log           |  1733 --
 .../tests/inline/anonymousObjects.lazy.log    |    82 -
 .../tests/inline/assignment.lazy.log          |    94 -
 .../inline/binaryExpressions/andOr.lazy.log   |   144 -
 .../binaryExpressions/arrayAccess.lazy.log    |   168 -
 .../binaryExpressions/assignment.lazy.log     |   731 -
 .../binaryExpressions/comparison.lazy.log     |   419 -
 .../componentAccess.lazy.log                  |   237 -
 .../binaryExpressions/contains.lazy.log       |   328 -
 .../binaryExpressions/mathOperations.lazy.log |   253 -
 .../inline/binaryExpressions/rangeTo.lazy.log |   352 -
 .../diagnostics/tests/inline/capture.lazy.log |   341 -
 .../tests/inline/constructor.lazy.log         |    66 -
 .../diagnostics/tests/inline/default.lazy.log |    78 -
 .../tests/inline/extensionOnFunction.lazy.log |   241 -
 .../inline/fromInlineToNoInline.lazy.log      |   105 -
 .../tests/inline/functions.lazy.log           |   155 -
 .../diagnostics/tests/inline/invoke.lazy.log  |   307 -
 .../diagnostics/tests/inline/labeled.lazy.log |   165 -
 .../tests/inline/localFun.lazy.log            |    44 -
 .../nonLocalReturns/anonymousObjects.lazy.log |   151 -
 .../anonymousObjectsNested.lazy.log           |   310 -
 .../explicitReturnType.lazy.log               |   114 -
 .../nonLocalReturns/fromOnlyLocal.lazy.log    |   117 -
 .../nonLocalReturns/inlineLambda.lazy.log     |   156 -
 .../nonLocalReturns/labeledReturn.lazy.log    |   105 -
 ...thGlobalReturnsInsideOnlyLocalOne.lazy.log |   136 -
 .../inline/nonLocalReturns/localFun.lazy.log  |   125 -
 .../nonLocalReturns/nestedNonLocals.lazy.log  |   286 -
 .../noInlineAnnotation.lazy.log               |    98 -
 .../nonLocalReturns/noInlineLambda.lazy.log   |   121 -
 .../nonLocalReturns/nonInlinedClass.lazy.log  |   143 -
 .../onlyLocalReturnLambda.lazy.log            |   194 -
 .../onlyLocalReturnLambdaBinaryExpr.lazy.log  |   165 -
 .../propertyAccessorsAndConstructor.lazy.log  |   192 -
 .../nonLocalReturns/toOnlyLocal.lazy.log      |   117 -
 .../nonPublicMember/inNonPublicClass.lazy.log |   437 -
 .../inNonPublicInnerClass.lazy.log            |   609 -
 .../inline/nonPublicMember/inPackage.lazy.log |   161 -
 .../nonPublicMember/inPublicClass.lazy.log    |   183 -
 .../nonPublicMember/localClass.lazy.log       |    64 -
 .../nonPublicMember/localClass2.lazy.log      |    61 -
 .../inline/nonPublicMember/localFun.lazy.log  |    52 -
 .../nonVirtualMembersWithInline.lazy.log      |   291 -
 .../tests/inline/nothingToInline.lazy.log     |   134 -
 .../inline/nullabilityOperations.lazy.log     |   147 -
 .../tests/inline/nullableFunction.lazy.log    |   130 -
 .../tests/inline/parenthesized.lazy.log       |   205 -
 .../tests/inline/propagation.lazy.log         |   707 -
 .../tests/inline/recursion.lazy.log           |   196 -
 .../tests/inline/regressions/kt4341.lazy.log  |    57 -
 .../diagnostics/tests/inline/returns.lazy.log |   123 -
 .../diagnostics/tests/inline/sam.lazy.log     |   482 -
 .../diagnostics/tests/inline/typed.lazy.log   |   165 -
 .../unaryExpressions/mathOperation.lazy.log   |   371 -
 .../unaryExpressions/notOnCall.lazy.log       |    72 -
 .../unaryExpressions/notOperation.lazy.log    |   212 -
 .../inline/unsupportedConstruction.lazy.log   |    75 -
 .../diagnostics/tests/inline/vararg.lazy.log  |   209 -
 .../tests/inline/wrongUsage.lazy.log          |   313 -
 .../inner/classesInClassObjectHeader.lazy.log |    61 -
 .../tests/inner/constructorAccess.lazy.log    |   677 -
 .../tests/inner/deepInnerClass.lazy.log       |    25 -
 .../tests/inner/enumEntries.lazy.log          |   115 -
 .../tests/inner/extensionFun.lazy.log         |   447 -
 .../extensionLambdaInsideNestedClass.lazy.log |    97 -
 .../tests/inner/illegalModifier.lazy.log      |    36 -
 .../innerClassesInStaticParameters.lazy.log   |    24 -
 .../inner/innerErrorForClassObjects.lazy.log  |   395 -
 .../tests/inner/innerErrorForObjects.lazy.log |   595 -
 .../tests/inner/innerThisSuper.lazy.log       |    64 -
 .../diagnostics/tests/inner/kt5854.lazy.log   |    96 -
 .../diagnostics/tests/inner/kt6026.lazy.log   |   109 -
 .../tests/inner/localClass.lazy.log           |   159 -
 .../inner/localClassInsideNested.lazy.log     |   142 -
 .../tests/inner/localThisSuper.lazy.log       |    58 -
 .../diagnostics/tests/inner/modality.lazy.log |    74 -
 ...ClassAccessedViaInstanceReference.lazy.log |   903 -
 .../inner/nestedClassExtendsOuter.lazy.log    |    60 -
 .../nestedClassExtendsOuterGeneric.lazy.log   |    88 -
 .../inner/nestedClassNotAllowed.lazy.log      |    17 -
 .../nestedVsInnerAccessOuterMember.lazy.log   |   363 -
 .../tests/inner/outerGenericParam.lazy.log    |    43 -
 .../tests/inner/outerProtectedMember.lazy.log |    39 -
 .../inner/outerSuperClassMember.lazy.log      |   168 -
 .../classObjectOfNestedClass.lazy.log         |    83 -
 .../constructNestedClass.lazy.log             |   247 -
 .../dataLocalVariable.lazy.log                |    72 -
 .../qualifiedExpression/enumConstant.lazy.log |    74 -
 .../genericNestedClass.lazy.log               |   145 -
 .../importNestedClass.lazy.log                |   167 -
 .../nestedClassInPackage.lazy.log             |    66 -
 .../nestedEnumConstant.lazy.log               |   100 -
 .../nestedObjects.lazy.log                    |    55 -
 .../qualifiedExpression/typePosition.lazy.log |    35 -
 .../inner/referenceToSelfInLocal.lazy.log     |   120 -
 .../resolvePackageClassInObjects.lazy.log     |    32 -
 .../selfAnnotationForClassObject.lazy.log     |    53 -
 .../diagnostics/tests/inner/traits.lazy.log   |    22 -
 .../tests/inner/visibility.lazy.log           |   434 -
 .../tests/j+k/GenericsInSupertypes.lazy.log   |  2154 --
 .../j+k/InheritedGenericFunction.lazy.log     |   196 -
 .../tests/j+k/KJKInheritance.lazy.log         |   101 -
 .../tests/j+k/KJKInheritanceGeneric.lazy.log  |   141 -
 .../tests/j+k/OverrideVararg.lazy.log         |   104 -
 .../diagnostics/tests/j+k/Simple.lazy.log     |    75 -
 .../StaticMembersFromSuperclasses.lazy.log    |   105 -
 ...sNullability-NotNull-SpecialTypes.lazy.log |   171 -
 ...entsNullability-NotNull-UserTypes.lazy.log |   186 -
 ...ArgumentsNullability-SpecialTypes.lazy.log |   173 -
 ...ypeArgumentsNullability-UserTypes.lazy.log |   193 -
 .../tests/j+k/UnboxingNulls.lazy.log          |   122 -
 .../j+k/accessClassObjectFromJava.lazy.log    |    23 -
 .../tests/j+k/ambiguousSamAdapters.lazy.log   |   224 -
 ...antDeclareIfSamAdapterIsInherited.lazy.log |   104 -
 .../j+k/inheritAbstractSamAdapter.lazy.log    |   141 -
 .../j+k/innerNestedClassFromJava.lazy.log     |    68 -
 ...iblePackagePrivateInheritedMember.lazy.log |   107 -
 .../diagnostics/tests/j+k/kt1402.lazy.log     |   104 -
 .../diagnostics/tests/j+k/kt1431.lazy.log     |   178 -
 .../diagnostics/tests/j+k/kt2152.lazy.log     |    29 -
 .../diagnostics/tests/j+k/kt2394.lazy.log     |    77 -
 .../diagnostics/tests/j+k/kt2606.lazy.log     |    97 -
 .../diagnostics/tests/j+k/kt2619.lazy.log     |    53 -
 .../diagnostics/tests/j+k/kt2641.lazy.log     |   227 -
 .../diagnostics/tests/j+k/kt2890.lazy.log     |   359 -
 .../diagnostics/tests/j+k/kt3307.lazy.log     |   175 -
 .../diagnostics/tests/j+k/kt3311.lazy.log     |   113 -
 .../tests/j+k/mutableIterator.lazy.log        |   363 -
 .../tests/j+k/overrideRawType.lazy.log        |   255 -
 .../packagePrivateClassStaticMember.lazy.log  |    77 -
 .../tests/j+k/packageVisibility.lazy.log      |   508 -
 .../privateNestedClassStaticMember.lazy.log   |   147 -
 .../j+k/protectedStaticSamePackage.lazy.log   |   114 -
 .../tests/j+k/recursiveRawUpperBound.lazy.log |   107 -
 .../j+k/samInConstructorWithGenerics.lazy.log |   157 -
 .../jdk-annotations/ArrayListAndMap.lazy.log  |  1642 --
 .../jdk-annotations/ArrayListClone.lazy.log   |   379 -
 .../jdk-annotations/ArrayListToArray.lazy.log |   486 -
 .../sql/DriverManager.lazy.log                |   929 -
 .../jdk-annotations/sql/ResultSet.lazy.log    |   120 -
 .../jdk-annotations/sql/Statement.lazy.log    |   326 -
 .../testData/diagnostics/tests/kt310.lazy.log |   100 -
 .../testData/diagnostics/tests/kt53.lazy.log  |    44 -
 .../diagnostics/tests/labels/kt1703.lazy.log  |   163 -
 .../diagnostics/tests/labels/kt361.lazy.log   |    34 -
 .../diagnostics/tests/labels/kt3920.lazy.log  |    74 -
 .../diagnostics/tests/labels/kt3988.lazy.log  |   101 -
 .../diagnostics/tests/labels/kt4247.lazy.log  |    74 -
 .../diagnostics/tests/labels/kt4586.lazy.log  |   990 -
 .../diagnostics/tests/labels/kt4603.lazy.log  |    22 -
 .../diagnostics/tests/labels/kt591.lazy.log   |    56 -
 ...ReferencesInsideObjectExpressions.lazy.log |    42 -
 .../tests/labels/labelsMustBeNamed.lazy.log   |   109 -
 .../tests/library/Collections.lazy.log        |  1666 --
 .../diagnostics/tests/library/kt828.lazy.log  |   120 -
 .../collectionMethodStub.lazy.log             |   219 -
 .../differentGenericArguments.lazy.log        |   186 -
 ...differentGenericArgumentsReversed.lazy.log |   186 -
 .../duplicateClass/duplicateClass.lazy.log    |   188 -
 .../duplicateNestedClasses.lazy.log           |   517 -
 .../duplicateSuperClass.lazy.log              |   172 -
 .../genericArgumentNumberMismatch.lazy.log    |   185 -
 .../duplicateClass/genericSuperClass.lazy.log |   294 -
 .../inTheSameModuleWithUsage.lazy.log         |   106 -
 ...meModuleWithUsageNoTypeAnnotation.lazy.log |   153 -
 .../duplicateClass/members.lazy.log           |   224 -
 .../sameClassNameDifferentPackages.lazy.log   |   114 -
 .../sameGenericArguments.lazy.log             |   176 -
 .../classGenericsInParams.lazy.log            |   172 -
 ...lassGenericsInParamsBoundMismatch.lazy.log |   172 -
 ...lassGenericsInParamsIndexMismatch.lazy.log |   189 -
 ...classGenericsInParamsNameMismatch.lazy.log |   174 -
 .../classGenericsInReturnType.lazy.log        |   172 -
 ...sFunctionGenericsInParamsMismatch.lazy.log |   189 -
 .../covariantReturnTypes.lazy.log             |   145 -
 .../differenceInParamNames.lazy.log           |   165 -
 .../differentGenericsInParams.lazy.log        |   243 -
 .../differentNumberOfParams.lazy.log          |   165 -
 .../differentReturnTypes.lazy.log             |   145 -
 .../duplicateMethod/extensionMatch.lazy.log   |   147 -
 .../functionGenericsInParams.lazy.log         |   183 -
 ...ionGenericsInParamsBoundsMismatch.lazy.log |   212 -
 .../functionGenericsInParamsEqNull.lazy.log   |   262 -
 .../functionGenericsInParamsNotIs.lazy.log    |   183 -
 ...unctionGenericsInParamsReturnFooT.lazy.log |   195 -
 .../functionGenericsInParamsReturnT.lazy.log  |   183 -
 .../noGenericsInParams.lazy.log               |   165 -
 .../duplicateMethod/noParams.lazy.log         |   141 -
 .../sameGenericsInParams.lazy.log             |   281 -
 .../simpleWithInheritance.lazy.log            |   161 -
 .../substitutedGenericInParams.lazy.log       |   157 -
 .../differentSuperTraits.lazy.log             |   116 -
 .../duplicateSuper/sameSuperTrait.lazy.log    |   112 -
 .../sameSuperTraitDifferentBounds.lazy.log    |   146 -
 .../sameSuperTraitGenerics.lazy.log           |   135 -
 .../tests/multimodule/internal.lazy.log       |   272 -
 .../tests/multimodule/packagePrivate.lazy.log |    82 -
 .../allowForJavaAnnotation.lazy.log           |    54 -
 .../disallowForJavaConstructor.lazy.log       |    72 -
 .../disallowForJavaMethods.lazy.log           |   222 -
 .../disallowForSamAdapterConstructor.lazy.log |   118 -
 .../disallowForSamAdapterFunction.lazy.log    |   141 -
 .../namedArgumentsAndDefaultValues.lazy.log   |   320 -
 .../AssertNotNull.lazy.log                    |   260 -
 .../InfixCallNullability.lazy.log             |   791 -
 .../NullableNothingIsExactlyNull.lazy.log     |   102 -
 ...referExtensionsOnNullableReceiver.lazy.log |    53 -
 .../QualifiedExpressionNullability.lazy.log   |   609 -
 .../ReceiverNullability.lazy.log              |   529 -
 .../SenselessNullInWhen.lazy.log              |    28 -
 .../dataFlowInfoAfterExclExcl.lazy.log        |    78 -
 .../equalityUnderNotNullCheck.lazy.log        |    44 -
 .../funcLiteralArgsInsideAmbiguity.lazy.log   |    93 -
 ...teralArgsInsideUnresolvedFunction.lazy.log |   100 -
 .../nullabilityAndSmartCasts/kt1270.lazy.log  |   448 -
 .../nullabilityAndSmartCasts/kt1680.lazy.log  |   111 -
 .../nullabilityAndSmartCasts/kt1778.lazy.log  |   204 -
 .../nullabilityAndSmartCasts/kt2109.lazy.log  |    66 -
 .../nullabilityAndSmartCasts/kt2125.lazy.log  |   174 -
 .../nullabilityAndSmartCasts/kt2146.lazy.log  |   183 -
 .../nullabilityAndSmartCasts/kt2164.lazy.log  |   398 -
 .../nullabilityAndSmartCasts/kt2176.lazy.log  |    87 -
 .../nullabilityAndSmartCasts/kt2195.lazy.log  |    58 -
 .../nullabilityAndSmartCasts/kt2212.lazy.log  |   310 -
 .../nullabilityAndSmartCasts/kt2216.lazy.log  |   356 -
 .../nullabilityAndSmartCasts/kt2223.lazy.log  |    58 -
 .../nullabilityAndSmartCasts/kt2234.lazy.log  |   201 -
 .../nullabilityAndSmartCasts/kt2336.lazy.log  |   111 -
 .../nullabilityAndSmartCasts/kt244.lazy.log   |   410 -
 .../nullabilityAndSmartCasts/kt362.lazy.log   |   288 -
 .../noSenselessNullOnNullableType.lazy.log    |   129 -
 ...essaryNotNullAssertionOnErrorType.lazy.log |    86 -
 ...omparisonWithNullOnTypeParameters.lazy.log |   111 -
 .../smartCastReceiverWithGenerics.lazy.log    |    80 -
 .../smartCastsAndBooleanExpressions.lazy.log  |   108 -
 .../baseWithNullableUpperBound.lazy.log       |    46 -
 ...ssertOnTypeWithNullableUpperBound.lazy.log |    83 -
 .../nullableArgumentForIn.lazy.log            |    79 -
 .../nullableTypes/redundantNullable.lazy.log  |    25 -
 .../redundantNullableInSupertype.lazy.log     |    39 -
 ...eCallOnTypeWithNullableUpperBound.lazy.log |    73 -
 .../nullableTypes/safeCallWithInvoke.lazy.log |   148 -
 .../tests/nullableTypes/uselessElvis.lazy.log |    83 -
 .../numbers/characterIsNotANumber.lazy.log    |   133 -
 .../doublesInSimpleConstraints.lazy.log       |   123 -
 .../numbers/intValuesOutOfRange.lazy.log      |    91 -
 .../numbersInSimpleConstraints.lazy.log       |   749 -
 .../tests/objects/Objects.lazy.log            |   142 -
 .../tests/objects/ObjectsInheritance.lazy.log |    21 -
 .../tests/objects/ObjectsLocal.lazy.log       |   142 -
 .../tests/objects/ObjectsNested.lazy.log      |   941 -
 .../objects/invokeOnInnerObject.lazy.log      |   138 -
 .../diagnostics/tests/objects/kt2240.lazy.log |    83 -
 .../diagnostics/tests/objects/kt5527.lazy.log |   187 -
 .../objects/localObjectInsideObject.lazy.log  |    58 -
 .../tests/objects/localObjects.lazy.log       |    53 -
 ...jectLiteralExpressionTypeMismatch.lazy.log |    29 -
 .../tests/objects/upperBoundViolated.lazy.log |    40 -
 .../AssignOperatorAmbiguity.lazy.log          |   137 -
 .../AssignmentOperations.lazy.log             |   883 -
 .../IteratorAmbiguity.lazy.log                |   150 -
 ...signmentOperationsCheckReturnType.lazy.log |  1308 --
 .../operatorsOverloading/kt1028.lazy.log      |  1182 -
 .../operatorsOverloading/kt3450.lazy.log      |   254 -
 ...erloadsFunsDifferentReturnInClass.lazy.log |    23 -
 ...loadsFunsDifferentReturnInPackage.lazy.log |    20 -
 ...verloadsIdenticalExtFunsInPackage.lazy.log |    29 -
 ...tingOverloadsIdenticalFunsInClass.lazy.log |    16 -
 ...ngOverloadsIdenticalFunsTPInClass.lazy.log |    21 -
 ...tingOverloadsIdenticalValsInClass.lazy.log |    23 -
 ...OverloadsValsDifferentTypeInClass.lazy.log |    23 -
 .../ConstructorVsFunOverload.lazy.log         |    24 -
 .../overload/ExtFunDifferentReceiver.lazy.log |    31 -
 .../FunNoConflictInDifferentPackages.lazy.log |    25 -
 .../OverloadFunRegularAndExt.lazy.log         |    25 -
 .../OverloadVarAndFunInClass.lazy.log         |    22 -
 .../SyntheticAndNotSynthetic.lazy.log         |   107 -
 .../tests/overload/kt1998.lazy.log            |    55 -
 .../override/AbstractFunImplemented.lazy.log  |    38 -
 .../AbstractFunNotImplemented.lazy.log        |    34 -
 .../override/AbstractValImplemented.lazy.log  |    39 -
 .../AbstractValNotImplemented.lazy.log        |    34 -
 .../override/AbstractVarImplemented.lazy.log  |    38 -
 .../AbstractVarNotImplemented.lazy.log        |    34 -
 .../AllPrivateFromSuperTypes.lazy.log         |    81 -
 .../AllProtectedFromSupertypes.lazy.log       |    55 -
 .../CannotInferVisibilityForProperty.lazy.log |    30 -
 ...tInferVisibilityForPropertySetter.lazy.log |    29 -
 .../override/ComplexValRedeclaration.lazy.log |    43 -
 ...ngFunctionSignatureFromSuperclass.lazy.log |    32 -
 ...ngPropertySignatureFromSuperclass.lazy.log |    34 -
 .../DefaultParameterValueInOverride.lazy.log  |    40 -
 ...orsWhenInheritingFromOneTypeTwice.lazy.log |    30 -
 .../tests/override/Delegation.lazy.log        |    74 -
 .../tests/override/DelegationFun.lazy.log     |    29 -
 .../tests/override/DelegationVal.lazy.log     |    33 -
 .../tests/override/DelegationVar.lazy.log     |    33 -
 .../tests/override/DuplicateMethod.lazy.log   |    19 -
 .../EqualityOfIntersectionTypes.lazy.log      |    68 -
 .../override/ExtendFunctionClass.lazy.log     |    38 -
 ...OverrideAbstractAndNonAbstractFun.lazy.log |    41 -
 ...ideDifferentDeclarationSignatures.lazy.log |    51 -
 .../tests/override/Generics.lazy.log          |   250 -
 .../InvisiblePotentialOverride.lazy.log       |    38 -
 .../tests/override/MissingDelegate.lazy.log   |    77 -
 ...ipleDefaultParametersInSupertypes.lazy.log |    30 -
 ...tParametersInSupertypesNoOverride.lazy.log |    30 -
 ...tipleDefaultsAndNamesInSupertypes.lazy.log |    49 -
 ...ltsInSupertypesNoExplicitOverride.lazy.log |    30 -
 .../tests/override/NonGenerics.lazy.log       |   193 -
 .../ObjectDelegationManyImpl.lazy.log         |    52 -
 .../override/OverridingFinalMember.lazy.log   |    27 -
 ...-DefaultValueFromOnlyOneSupertype.lazy.log |    29 -
 ...ParentInheritsManyImplementations.lazy.log |    47 -
 .../override/PropertyInConstructor.lazy.log   |    40 -
 ...ProtectedAndPrivateFromSupertypes.lazy.log |    59 -
 .../tests/override/SuspiciousCase1.lazy.log   |    58 -
 ...ToAbstractMembersFromSuper-kt1996.lazy.log |    29 -
 .../tests/override/kt1862.lazy.log            |    43 -
 .../tests/override/kt2052.lazy.log            |    19 -
 .../tests/override/kt2491.lazy.log            |    40 -
 .../tests/override/kt4763.lazy.log            |    51 -
 .../tests/override/kt4763property.lazy.log    |    55 -
 .../tests/override/kt4785.lazy.log            |    40 -
 .../tests/override/kt4785classObject.lazy.log |    26 -
 .../tests/override/kt4785delegation.lazy.log  |    30 -
 .../diagnostics/tests/override/kt880.lazy.log |    57 -
 .../changeOnOverrideDiagnostic.lazy.log       |    30 -
 ...ferentNamesInSupertypesDiagnostic.lazy.log |   172 -
 .../parameterNames/jjkHierarchy.lazy.log      |    89 -
 .../parameterNames/kjkHierarchy.lazy.log      |    62 -
 .../kjkWithSeveralSupers.lazy.log             |   247 -
 .../kotlinInheritsBothJavaAndKotlin.lazy.log  |    62 -
 .../kotlinInheritsJava.lazy.log               |    63 -
 .../commonSupertype/collectionOrNull.lazy.log |   176 -
 .../inferenceWithBound.lazy.log               |   284 -
 .../commonSupertype/mixedElvis.lazy.log       |   402 -
 .../commonSupertype/mixedIf.lazy.log          |   185 -
 .../commonSupertype/recursiveGeneric.lazy.log |   172 -
 .../commonSupertype/stringOrNull.lazy.log     |   152 -
 .../commonSupertype/typeOfElvis.lazy.log      |   146 -
 .../commonSupertype/withNothing.lazy.log      |   245 -
 .../tests/platformTypes/dereference.lazy.log  |   218 -
 .../tests/platformTypes/elvis.lazy.log        |    92 -
 .../explicitFlexibleNoPackage.lazy.log        |   111 -
 .../explicitFlexibleWithPackage.lazy.log      |   101 -
 .../platformTypes/getParentOfType.lazy.log    |   416 -
 .../tests/platformTypes/inference.lazy.log    |   329 -
 .../intVsIntegerAmbiguity.lazy.log            |   322 -
 .../methodCall/entrySet.lazy.log              |   257 -
 .../methodCall/genericsAndArrays.lazy.log     |   261 -
 .../platformTypes/methodCall/int.lazy.log     |   129 -
 .../methodCall/intArray.lazy.log              |   105 -
 .../javaCollectionToKotlin.lazy.log           |   309 -
 .../methodCall/javaToJava.lazy.log            |   363 -
 .../methodCall/javaToKotlin.lazy.log          |   113 -
 .../kotlinCollectionToJava.lazy.log           |   172 -
 .../platformTypes/methodCall/list.lazy.log    |   202 -
 .../methodCall/multipleExactBounds.lazy.log   |   334 -
 .../multipleExactBoundsNullable.lazy.log      |   383 -
 .../methodCall/objectArray.lazy.log           |   169 -
 .../overloadingForSubclass.lazy.log           |   212 -
 .../platformTypes/methodCall/sam.lazy.log     |   185 -
 .../methodCall/singleton.lazy.log             |   245 -
 .../platformTypes/methodCall/string.lazy.log  |   117 -
 .../platformTypes/methodCall/visitor.lazy.log |   189 -
 .../nullableTypeArgument.lazy.log             |   534 -
 .../tests/platformTypes/override.lazy.log     |   164 -
 .../tests/platformTypes/safeCall.lazy.log     |   150 -
 .../platformTypes/samConstructor.lazy.log     |   286 -
 .../supertypeArgumentsExplicit.lazy.log       |    53 -
 .../supertypeTypeArguments.lazy.log           |  2928 ---
 .../recovery/absentLeftHandSide.lazy.log      |   252 -
 .../tests/recovery/namelessInJava.lazy.log    |    84 -
 .../tests/recovery/namelessMembers.lazy.log   |    29 -
 .../namelessToplevelDeclarations.lazy.log     |    26 -
 ...lassRedeclarationInDifferentFiles.lazy.log |    19 -
 .../ConflictingExtensionProperties.lazy.log   |    21 -
 .../EnumEntriesAndClassObjectMembers.lazy.log |    20 -
 .../MultiFilePackageRedeclaration.lazy.log    |    17 -
 .../PropertyAndFunInClass.lazy.log            |    29 -
 .../PropertyAndInnerClass.lazy.log            |    29 -
 .../RedeclarationInMultiFile.lazy.log         |    28 -
 .../redeclarations/Redeclarations.lazy.log    |    30 -
 .../RedeclarationsInObjects.lazy.log          |    28 -
 .../RedeclaredTypeParameters.lazy.log         |    27 -
 .../SingletonAndFunctionSameName.lazy.log     |    51 -
 .../tests/redeclarations/kt2247.lazy.log      |    17 -
 .../tests/redeclarations/kt2418.lazy.log      |    25 -
 .../tests/redeclarations/kt2438.lazy.log      |    18 -
 .../tests/redeclarations/kt470.lazy.log       |    42 -
 .../AmbiguityOnLazyTypeComputation.lazy.log   |    71 -
 .../AssignmentsUnderOperators.lazy.log        |    50 -
 .../tests/regressions/CoercionToUnit.lazy.log |    86 -
 .../tests/regressions/DoubleDefine.lazy.log   |  2774 ---
 ...rsOnIbjectExpressionsAsParameters.lazy.log |    49 -
 .../tests/regressions/Jet11.lazy.log          |    27 -
 .../tests/regressions/Jet121.lazy.log         |   119 -
 .../tests/regressions/Jet124.lazy.log         |    82 -
 .../tests/regressions/Jet169.lazy.log         |    83 -
 .../tests/regressions/Jet17.lazy.log          |    43 -
 .../tests/regressions/Jet183-1.lazy.log       |   368 -
 .../tests/regressions/Jet183.lazy.log         |   274 -
 .../tests/regressions/Jet53.lazy.log          |   158 -
 .../tests/regressions/Jet67.lazy.log          |    23 -
 .../tests/regressions/Jet68.lazy.log          |    63 -
 .../tests/regressions/Jet69.lazy.log          |    83 -
 .../tests/regressions/Jet72.lazy.log          |   800 -
 .../tests/regressions/Jet81.lazy.log          |   174 -
 .../regressions/OrphanStarProjection.lazy.log |    19 -
 .../tests/regressions/OutProjections.lazy.log |   124 -
 .../regressions/OverrideResolution.lazy.log   |    52 -
 .../SpecififcityByReceiver.lazy.log           |    61 -
 .../TypeMismatchOnUnaryOperations.lazy.log    |   103 -
 .../TypeParameterAsASupertype.lazy.log        |    19 -
 .../UnavaliableQualifiedThis.lazy.log         |    71 -
 .../WrongTraceInCallResolver.lazy.log         |    59 -
 .../tests/regressions/ea40964.lazy.log        |   445 -
 .../tests/regressions/ea43298.lazy.log        |    23 -
 .../tests/regressions/ea53340.lazy.log        |    63 -
 .../tests/regressions/kt127.lazy.log          |    65 -
 .../tests/regressions/kt128.lazy.log          |    58 -
 .../tests/regressions/kt1489_1728.lazy.log    |   304 -
 .../tests/regressions/kt1550.lazy.log         |   825 -
 .../tests/regressions/kt1639-JFrame.lazy.log  | 10795 ---------
 .../tests/regressions/kt1647.lazy.log         |    44 -
 .../tests/regressions/kt1736.lazy.log         |    95 -
 .../tests/regressions/kt174.lazy.log          |   163 -
 .../tests/regressions/kt201.lazy.log          |   171 -
 .../tests/regressions/kt235.lazy.log          |   229 -
 .../tests/regressions/kt2376.lazy.log         |    97 -
 .../tests/regressions/kt251.lazy.log          |    92 -
 .../tests/regressions/kt258.lazy.log          |   375 -
 .../tests/regressions/kt26-1.lazy.log         |    17 -
 .../tests/regressions/kt26.lazy.log           |    32 -
 .../tests/regressions/kt2768.lazy.log         |   323 -
 .../tests/regressions/kt282.lazy.log          |   154 -
 .../tests/regressions/kt287.lazy.log          |   328 -
 .../tests/regressions/kt2956.lazy.log         |    52 -
 .../tests/regressions/kt302.lazy.log          |    25 -
 .../tests/regressions/kt306.lazy.log          |    70 -
 .../tests/regressions/kt307.lazy.log          |    76 -
 .../tests/regressions/kt312.lazy.log          |   139 -
 .../tests/regressions/kt313.lazy.log          |   168 -
 .../tests/regressions/kt316.lazy.log          |    19 -
 .../tests/regressions/kt328.lazy.log          |   192 -
 .../tests/regressions/kt334.lazy.log          |   129 -
 .../tests/regressions/kt335.336.lazy.log      |   599 -
 .../tests/regressions/kt337.lazy.log          |    52 -
 .../tests/regressions/kt352.lazy.log          |    75 -
 .../tests/regressions/kt353.lazy.log          |   112 -
 .../tests/regressions/kt3535.lazy.log         |    53 -
 .../tests/regressions/kt3647.lazy.log         |    96 -
 .../tests/regressions/kt3731.lazy.log         |   134 -
 .../tests/regressions/kt385.109.441.lazy.log  |   604 -
 .../tests/regressions/kt394.lazy.log          |    77 -
 .../tests/regressions/kt398.lazy.log          |   100 -
 .../tests/regressions/kt399.lazy.log          |    89 -
 .../tests/regressions/kt402.lazy.log          |    49 -
 .../tests/regressions/kt41.lazy.log           |    74 -
 .../tests/regressions/kt411.lazy.log          |    75 -
 .../tests/regressions/kt439.lazy.log          |    83 -
 .../tests/regressions/kt442.lazy.log          |   176 -
 .../tests/regressions/kt443.lazy.log          |    83 -
 .../tests/regressions/kt455.lazy.log          |    58 -
 .../tests/regressions/kt456.lazy.log          |    75 -
 .../tests/regressions/kt459.lazy.log          |   384 -
 .../tests/regressions/kt469.lazy.log          |   557 -
 .../tests/regressions/kt4827.lazy.log         |   123 -
 .../tests/regressions/kt498.lazy.log          |   331 -
 .../tests/regressions/kt524.lazy.log          |   980 -
 ...526UnresolvedReferenceInnerStatic.lazy.log |    54 -
 .../tests/regressions/kt549.lazy.log          |   811 -
 .../tests/regressions/kt557.lazy.log          |   107 -
 .../tests/regressions/kt571.lazy.log          |   116 -
 .../tests/regressions/kt575.lazy.log          |   179 -
 .../tests/regressions/kt58.lazy.log           |   240 -
 .../tests/regressions/kt580.lazy.log          |   765 -
 .../tests/regressions/kt588.lazy.log          |   969 -
 .../tests/regressions/kt597.lazy.log          |   219 -
 .../tests/regressions/kt600.lazy.log          |   171 -
 .../tests/regressions/kt604.lazy.log          |   124 -
 .../tests/regressions/kt618.lazy.log          |   362 -
 .../tests/regressions/kt629.lazy.log          |   180 -
 .../tests/regressions/kt630.lazy.log          |    74 -
 .../tests/regressions/kt688.lazy.log          |   145 -
 .../tests/regressions/kt691.lazy.log          |    18 -
 .../tests/regressions/kt701.lazy.log          |   470 -
 .../tests/regressions/kt716.lazy.log          |   468 -
 .../tests/regressions/kt743.lazy.log          |   108 -
 .../tests/regressions/kt750.lazy.log          |   493 -
 .../tests/regressions/kt762.lazy.log          |    31 -
 .../tests/regressions/kt847.lazy.log          |    26 -
 .../tests/regressions/kt860.lazy.log          |   368 -
 .../resolveSubclassOfList.lazy.log            |   606 -
 ...nPropertiesWithTheSamePackageName.lazy.log |    52 -
 .../incompleteConstructorInvocation.lazy.log  |   107 -
 .../tests/resolve/invoke/KT-4372.lazy.log     |   507 -
 .../invoke/errors/ambiguityForInvoke.lazy.log |    65 -
 .../invoke/errors/invisibleInvoke.lazy.log    |   202 -
 .../receiverPresenceErrorForInvoke.lazy.log   |   179 -
 .../typeInferenceErrorForInvoke.lazy.log      |   121 -
 .../invoke/errors/unresolvedInvoke.lazy.log   |    94 -
 .../errors/unsafeCallWithInvoke.lazy.log      |   103 -
 ...rongReceiverForInvokeOnExpression.lazy.log |   109 -
 .../wrongReceiverTypeForInvoke.lazy.log       |    93 -
 .../resolve/invoke/invokeAsExtension.lazy.log |   496 -
 .../resolve/invoke/invokeAsMember.lazy.log    |   446 -
 .../invoke/invokeAsMemberExtension.lazy.log   |  1023 -
 ...MemberExtensionToExplicitReceiver.lazy.log |   118 -
 .../tests/resolve/invoke/kt3772.lazy.log      |   185 -
 .../kt3833-invokeInsideNestedClass.lazy.log   |   152 -
 ...4204-completeNestedCallsForInvoke.lazy.log |   124 -
 .../invoke/kt4321InvokeOnEnum.lazy.log        |   161 -
 .../resolve/invoke/valNamedInvoke.lazy.log    |   111 -
 ...alyzeArgsInFreeExpressionPosition.lazy.log |    76 -
 .../analyzeUnmappedArguments.lazy.log         |   159 -
 .../argumentsInParentheses.lazy.log           |   370 -
 ...nferenceForNestedInNoneApplicable.lazy.log |   205 -
 .../completeUnmappedArguments.lazy.log        |   284 -
 .../nestedCalls/kt5971NestedSafeCall.lazy.log |    73 -
 .../resolveWithFunctionLiteralWithId.lazy.log |   371 -
 .../resolveWithFunctionLiterals.lazy.log      |   177 -
 ...solveWithFunctionLiteralsOverload.lazy.log |   334 -
 .../resolve/resolveWithGenerics.lazy.log      |   168 -
 .../resolveWithRedeclarationError.lazy.log    |  2005 --
 ...ithSpecifiedFunctionLiteralWithId.lazy.log |   384 -
 .../resolve/resolveWithoutGenerics.lazy.log   |   164 -
 .../constantsInIf.lazy.log                    |   101 -
 .../specialConstructions/elvisAsCall.lazy.log |   444 -
 .../exclExclAsCall.lazy.log                   |   319 -
 .../multipleSuperClasses.lazy.log             |    83 -
 ...eportTypeMismatchDeeplyOnBranches.lazy.log |   290 -
 .../wrongNumberOfTypeArguments.lazy.log       |   105 -
 .../AmbiguityBetweenRootAndPackage.lazy.log   |    51 -
 .../scopes/AmbiguousNonExtensions.lazy.log    |    71 -
 .../tests/scopes/DontImportRootScope.lazy.log |   201 -
 ...mportFromCurrentWithDifferentName.lazy.log |    17 -
 .../ImportObjectAndUseAsSupertype.lazy.log    |    50 -
 .../ImportObjectHidesCurrentPackage.lazy.log  |    36 -
 .../tests/scopes/ImportTwoTimes.lazy.log      |    47 -
 .../tests/scopes/ImportTwoTimesStar.lazy.log  |    46 -
 .../tests/scopes/Imports-hidden.lazy.log      |    20 -
 .../diagnostics/tests/scopes/Imports.lazy.log |   525 -
 .../tests/scopes/ImportsConflicting.lazy.log  |    25 -
 .../ImportsUselessSimpleImport.lazy.log       |    18 -
 .../ImportsUselessSimpleImport2.lazy.log      |    19 -
 .../NoAmbiguityBetweenRootAndPackage.lazy.log |    43 -
 .../scopes/VisibilityInheritModifier.lazy.log |   170 -
 ...itializerScopeOfExtensionProperty.lazy.log |   177 -
 .../diagnostics/tests/scopes/kt1078.lazy.log  |    74 -
 .../diagnostics/tests/scopes/kt1080.lazy.log  |    32 -
 .../diagnostics/tests/scopes/kt1244.lazy.log  |    76 -
 .../diagnostics/tests/scopes/kt1248.lazy.log  |    33 -
 .../diagnostics/tests/scopes/kt151.lazy.log   |   109 -
 .../diagnostics/tests/scopes/kt1579.lazy.log  |    18 -
 .../tests/scopes/kt1579_map_entry.lazy.log    |    57 -
 .../diagnostics/tests/scopes/kt1580.lazy.log  |    22 -
 .../diagnostics/tests/scopes/kt1642.lazy.log  |    33 -
 .../diagnostics/tests/scopes/kt1738.lazy.log  |    74 -
 .../diagnostics/tests/scopes/kt1805.lazy.log  |   130 -
 .../diagnostics/tests/scopes/kt1806.lazy.log  |   146 -
 .../diagnostics/tests/scopes/kt1822.lazy.log  |    51 -
 .../diagnostics/tests/scopes/kt1942.lazy.log  |   109 -
 .../diagnostics/tests/scopes/kt2262.lazy.log  |    82 -
 .../tests/scopes/kt250.617.10.lazy.log        |   991 -
 .../diagnostics/tests/scopes/kt323.lazy.log   |    38 -
 .../diagnostics/tests/scopes/kt37.lazy.log    |    80 -
 .../tests/scopes/kt421Scopes.lazy.log         |    54 -
 .../diagnostics/tests/scopes/kt587.lazy.log   |   218 -
 .../diagnostics/tests/scopes/kt900-1.lazy.log |    83 -
 .../diagnostics/tests/scopes/kt900-2.lazy.log |   253 -
 .../diagnostics/tests/scopes/kt900.lazy.log   |   299 -
 .../diagnostics/tests/scopes/kt939.lazy.log   |   269 -
 .../diagnostics/tests/scopes/kt955.lazy.log   |    76 -
 .../scopes/stopResolutionOnAmbiguity.lazy.log |    51 -
 .../tests/scopes/visibility.lazy.log          |   489 -
 .../tests/scopes/visibility2.lazy.log         |  2159 --
 .../AccessForwardDeclarationInScript.lazy.log |   132 -
 .../tests/script/ComplexScript.lazy.log       |    75 -
 .../tests/script/SimpleScript.lazy.log        |    16 -
 .../diagnostics/tests/script/imports.lazy.log |    61 -
 .../parenthesized.lazy.log                    |   280 -
 ...wMultiDeclarationWithFunParameter.lazy.log |   141 -
 .../ShadowParameterInFunctionBody.lazy.log    |    30 -
 ...ShadowParameterInNestedBlockInFor.lazy.log |    45 -
 .../ShadowPropertyInClosure.lazy.log          |    38 -
 .../shadowing/ShadowPropertyInFor.lazy.log    |    43 -
 .../ShadowPropertyInFunction.lazy.log         |    35 -
 .../shadowing/ShadowVariableInFor.lazy.log    |    50 -
 .../ShadowVariableInNestedBlock.lazy.log      |    30 -
 .../ShadowVariableInNestedClosure.lazy.log    |    34 -
 ...hadowVariableInNestedClosureParam.lazy.log |    35 -
 .../tests/smartCasts/afterBinaryExpr.lazy.log |    66 -
 .../smartCasts/classObjectMember.lazy.log     |   158 -
 .../combineWithNoSelectorInfo.lazy.log        |    68 -
 .../dataFlowInfoForArguments.lazy.log         |    54 -
 .../tests/smartCasts/elvisNothingRHS.lazy.log |   123 -
 .../tests/smartCasts/elvisRHS.lazy.log        |    75 -
 .../inference/dependentOnPrevArg.lazy.log     |    63 -
 .../inference/intersectionTypes.lazy.log      |   539 -
 .../smartCasts/inference/kt1355.lazy.log      |   649 -
 .../smartCasts/inference/kt2746.lazy.log      |   102 -
 .../smartCasts/inference/kt2851.lazy.log      |   142 -
 .../smartCasts/inference/kt4009.lazy.log      |   243 -
 .../smartCasts/inference/kt4403.lazy.log      |    60 -
 .../smartCasts/inference/kt4415.lazy.log      |   335 -
 .../smartCasts/inference/kt6242.lazy.log      |   111 -
 .../inference/smartCastOnReceiver.lazy.log    |   131 -
 .../tests/smartCasts/kt1461.lazy.log          |   247 -
 .../tests/smartCasts/kt2422.lazy.log          |   336 -
 .../tests/smartCasts/kt5455.lazy.log          |   124 -
 .../noErrorCheckForPackageLevelVal.lazy.log   |   233 -
 ...noUnnecessarySmartCastForReceiver.lazy.log |    68 -
 .../tests/smartCasts/publicVal.lazy.log       |    89 -
 .../tests/smartCasts/thisWithLabel.lazy.log   |   325 -
 .../thisWithLabelAsReceiverPart.lazy.log      |   379 -
 .../tests/substitutions/kt1558-short.lazy.log |   109 -
 .../tests/substitutions/kt4887.lazy.log       |    68 -
 ...orOverloadResolutionWithAmbiguity.lazy.log |    58 -
 ...rOverloadResolutionWithErrorTypes.lazy.log |   201 -
 .../tests/subtyping/kt-1457.lazy.log          |  1958 --
 .../tests/subtyping/kt2069.lazy.log           |    29 -
 .../tests/subtyping/kt2744.lazy.log           |    33 -
 .../tests/subtyping/kt304.lazy.log            |    19 -
 .../tests/subtyping/kt3159.lazy.log           |    34 -
 .../subtyping/localAnonymousObjects.lazy.log  |    31 -
 .../tests/subtyping/localClasses.lazy.log     |   116 -
 .../subtyping/memberAnonymousObjects.lazy.log |    48 -
 .../subtyping/nestedIntoLocalClasses.lazy.log |   142 -
 .../subtyping/nestedLocalClasses.lazy.log     |   126 -
 .../topLevelAnonymousObjects.lazy.log         |    48 -
 .../suppressWarningsOnClass.lazy.log          |    46 -
 .../suppressWarningsOnClassObject.lazy.log    |    49 -
 .../suppressWarningsOnExpression.lazy.log     |    40 -
 .../suppressWarningsOnFunction.lazy.log       |    41 -
 .../suppressWarningsOnObject.lazy.log         |    41 -
 .../suppressWarningsOnParameter.lazy.log      |    41 -
 .../suppressWarningsOnProperty.lazy.log       |    49 -
 ...uppressWarningsOnPropertyAccessor.lazy.log |    45 -
 .../suppress/manyWarnings/mixed.lazy.log      |    57 -
 .../suppress/manyWarnings/onClass.lazy.log    |    46 -
 .../manyWarnings/onClassObject.lazy.log       |    50 -
 .../manyWarnings/onExpression.lazy.log        |    49 -
 .../suppress/manyWarnings/onFunction.lazy.log |    46 -
 .../suppress/manyWarnings/onObject.lazy.log   |    46 -
 .../manyWarnings/onParameter.lazy.log         |    55 -
 .../suppress/manyWarnings/onProperty.lazy.log |    50 -
 .../manyWarnings/onPropertyAccessor.lazy.log  |    46 -
 .../suppress/oneWarning/onClass.lazy.log      |    45 -
 .../oneWarning/onClassObject.lazy.log         |    49 -
 .../suppress/oneWarning/onExpression.lazy.log |    44 -
 .../suppress/oneWarning/onFunction.lazy.log   |    45 -
 .../oneWarning/onLocalVariable.lazy.log       |    54 -
 .../suppress/oneWarning/onObject.lazy.log     |    45 -
 .../suppress/oneWarning/onParameter.lazy.log  |    54 -
 .../suppress/oneWarning/onProperty.lazy.log   |    49 -
 .../oneWarning/onPropertyAccessor.lazy.log    |    45 -
 .../tests/thisAndSuper/QualifiedThis.lazy.log |    62 -
 .../tests/thisAndSuper/Super.lazy.log         |   254 -
 .../thisAndSuper/ambigousLabelOnThis.lazy.log |    23 -
 .../notAccessibleSuperInTrait.lazy.log        |    27 -
 .../superInExtensionFunction.lazy.log         |    35 -
 .../superInExtensionFunctionCall.lazy.log     |    76 -
 .../superInToplevelFunction.lazy.log          |    35 -
 .../superIsNotAnExpression.lazy.log           |    50 -
 .../thisInFunctionLiterals.lazy.log           |    58 -
 .../thisAndSuper/thisInInnerClasses.lazy.log  |    34 -
 .../thisInPropertyInitializer.lazy.log        |    30 -
 .../thisInToplevelFunction.lazy.log           |    22 -
 .../traitWithRequired/abstractClass.lazy.log  |    33 -
 ...ousObjectExtendsTraitWithRequired.lazy.log |    44 -
 .../differentGenericArguments.lazy.log        |    45 -
 .../tests/traitWithRequired/kt3006.lazy.log   |    70 -
 .../manyRequirementsDisallowed.lazy.log       |    22 -
 .../manyTraitsRequireSameClass.lazy.log       |    47 -
 .../requirementFulfilledBySubclass.lazy.log   |    39 -
 .../traitExtendsTraitWithRequired.lazy.log    |    41 -
 .../traitRequiresAny.lazy.log                 |    35 -
 .../traitSupertypeList.lazy.log               |    37 -
 ...bleTraitDifferentGenericArguments.lazy.log |    36 -
 .../typedefs/TypedefsUnsupported.lazy.log     |    15 -
 .../tests/unit/nullableUnit.lazy.log          |    50 -
 .../tests/varargs/AmbiguousVararg.lazy.log    |    54 -
 .../MoreSpecificVarargsOfEqualLength.lazy.log |    52 -
 .../MostSepcificVarargsWithJava.lazy.log      |   209 -
 .../tests/varargs/NilaryVsVararg.lazy.log     |    85 -
 .../tests/varargs/UnaryVsVararg.lazy.log      |    76 -
 .../diagnostics/tests/varargs/kt1781.lazy.log |    76 -
 .../diagnostics/tests/varargs/kt1835.lazy.log |   134 -
 .../tests/varargs/kt1838-param.lazy.log       |    35 -
 .../tests/varargs/kt1838-val.lazy.log         |    44 -
 .../diagnostics/tests/varargs/kt422.lazy.log  |   107 -
 .../varargsAndFunctionLiterals.lazy.log       |    76 -
 .../when/AnnotatedWhenStatement.lazy.log      |    43 -
 .../tests/when/ElseOnNullableEnum.lazy.log    |   293 -
 .../ElseOnNullableEnumWithSmartCast.lazy.log  |   107 -
 .../tests/when/NoElseExpectedUnit.lazy.log    |    39 -
 .../tests/when/NoElseNoExpectedType.lazy.log  |    39 -
 .../NoElseReturnedCoercionToUnit.lazy.log     |    70 -
 ...ElseReturnedFromLambdaExpectedInt.lazy.log |    66 -
 .../tests/when/NoElseReturnedNonUnit.lazy.log |    34 -
 .../tests/when/NoElseReturnedUnit.lazy.log    |    30 -
 .../tests/when/NoElseWhenStatement.lazy.log   |    30 -
 .../diagnostics/tests/when/When.lazy.log      |   237 -
 .../ClassObjectAnnotatedWithItsClass.lazy.log |   485 -
 .../illegalPlatformName.lazy.log              |   134 -
 .../platformName.lazy.log                     |   322 -
 .../array.lazy.log                            |   788 -
 .../classLiteral.lazy.log                     |   214 -
 .../simple.lazy.log                           |   426 -
 .../vararg.lazy.log                           |   776 -
 .../platformStatic/functions.lazy.log         |   157 -
 .../platformStatic/localFun.lazy.log          |   101 -
 .../platformStatic/property.lazy.log          |   255 -
 .../annotations/qualifiedCallValue.lazy.log   |   785 -
 .../abstractClassConstructors.lazy.log        |   230 -
 .../ambiguityTopLevelVsTopLevel.lazy.log      |   135 -
 .../callableRefrenceOnNestedObject.lazy.log   |   263 -
 .../function/constructorFromClass.lazy.log    |   188 -
 .../constructorFromExtension.lazy.log         |   206 -
 .../constructorFromExtensionInClass.lazy.log  |   338 -
 .../function/constructorFromTopLevel.lazy.log |   149 -
 .../function/differentPackageClass.lazy.log   |   491 -
 .../differentPackageExtension.lazy.log        |   523 -
 .../differentPackageTopLevel.lazy.log         |   305 -
 .../callableReference/function/empty.lazy.log |    34 -
 .../function/extensionFromClass.lazy.log      |   358 -
 .../function/extensionFromExtension.lazy.log  |   358 -
 .../extensionFromExtensionInClass.lazy.log    |   418 -
 .../function/extensionFromTopLevel.lazy.log   |   550 -
 .../extensionInClassDisallowed.lazy.log       |   286 -
 .../function/extensionOnNullable.lazy.log     |   378 -
 .../genericClassFromTopLevel.lazy.log         |   239 -
 .../importedInnerConstructor.lazy.log         |   106 -
 .../innerConstructorFromClass.lazy.log        |   631 -
 .../innerConstructorFromExtension.lazy.log    |   429 -
 .../innerConstructorFromTopLevel.lazy.log     |   264 -
 .../function/javaStaticMethod.lazy.log        |   332 -
 .../function/lhsNotAClass.lazy.log            |    65 -
 .../function/localConstructor.lazy.log        |   149 -
 ...structorFromExtensionInLocalClass.lazy.log |   236 -
 .../localConstructorFromLocalClass.lazy.log   |   174 -
 ...ocalConstructorFromLocalExtension.lazy.log |   196 -
 .../function/localNamedFun.lazy.log           |   300 -
 ...NamedFunFromExtensionInLocalClass.lazy.log |   306 -
 .../localNamedFunFromLocalClass.lazy.log      |   336 -
 .../localNamedFunFromLocalExtension.lazy.log  |   306 -
 .../function/longQualifiedName.lazy.log       |   224 -
 .../longQualifiedNameGeneric.lazy.log         |   267 -
 .../function/memberFromClass.lazy.log         |   340 -
 .../function/memberFromExtension.lazy.log     |   340 -
 .../memberFromExtensionInClass.lazy.log       |   341 -
 .../function/memberFromTopLevel.lazy.log      |   484 -
 .../nestedConstructorFromClass.lazy.log       |   474 -
 .../nestedConstructorFromExtension.lazy.log   |   403 -
 .../nestedConstructorFromTopLevel.lazy.log    |   155 -
 .../noAmbiguityLocalVsTopLevel.lazy.log       |   117 -
 .../noAmbiguityMemberVsExtension.lazy.log     |   217 -
 .../noAmbiguityMemberVsTopLevel.lazy.log      |   182 -
 .../function/renameOnImport.lazy.log          |   521 -
 .../function/topLevelFromClass.lazy.log       |   349 -
 .../function/topLevelFromExtension.lazy.log   |   354 -
 .../topLevelFromExtensionInClass.lazy.log     |   415 -
 .../function/topLevelFromTopLevel.lazy.log    |   312 -
 .../function/unresolved.lazy.log              |   408 -
 .../abstractPropertyViaSubclasses.lazy.log    |   877 -
 .../property/accessViaSubclass.lazy.log       |   388 -
 .../property/classFromClass.lazy.log          |   626 -
 .../property/extensionFromClass.lazy.log      |   589 -
 .../property/extensionFromTopLevel.lazy.log   |  1032 -
 .../extensionPropertyOnNullable.lazy.log      |   405 -
 .../property/genericClass.lazy.log            |   435 -
 .../property/javaInstanceField.lazy.log       |  1170 -
 .../javaStaticFieldViaImport.lazy.log         |   886 -
 .../property/localVariable.lazy.log           |   204 -
 .../property/memberFromExtension.lazy.log     |   960 -
 .../property/memberFromTopLevel.lazy.log      |   908 -
 .../property/topLevelFromTopLevel.lazy.log    |   917 -
 .../callableReference/unused.lazy.log         |   417 -
 .../delegatedProperty.lazy.log                |   472 -
 .../platformNames.lazy.log                    |   101 -
 .../platformNamesDuplicate.lazy.log           |   101 -
 .../platformStaticInClassObject.lazy.log      |    88 -
 .../platformStaticInObject.lazy.log           |   103 -
 .../pseudocodeMemoryOverhead.lazy.log         | 18236 ----------------
 .../constructorNamedArguments.lazy.log        |   107 -
 .../kotlinSignature/parameterNames.lazy.log   |   101 -
 .../reified/arrayOfNullsReified.lazy.log      |   169 -
 .../reified/nonCallableReiefied.lazy.log      |   172 -
 .../reifiedNothingSubstitution.lazy.log       |   379 -
 .../testsWithStdLib/resolve/kt4711.lazy.log   |   992 -
 1669 files changed, 347391 deletions(-)
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log
 delete mode 100644 compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Abstract.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Basic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Bounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/BreakContinue.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Builders.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Casts.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Constants.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Constructors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Dollar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/FinalClassObjectBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/GenericArgumentConsistency.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/IncDec.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/IsExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Nullability.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/PackageQualified.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ProcessingEmptyImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ProjectionsInSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Properties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Return.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ShiftFunctionTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/StringTemplates.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/TypeInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/UnitValue.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Unresolved.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/VarargTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Varargs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/Variance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotationForObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationModifier.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/missingValOnParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/annotations/typeAnnotations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/constants.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/kt614.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/checkType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt2096.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt2397.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/AbstractEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumImplementingTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumModifier.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/enumWithEmptyName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/existingClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/insideTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/twoEnums.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/openMemberInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/float.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/integer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/object.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/Projections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/argumentsForT.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/kt1575-Class.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/kt1575-Function.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/recursive.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/InType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/kt1955.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/kt619.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/opposite.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/assignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/capture.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/constructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/default.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/functions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/invoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/labeled.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/localFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/propagation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/recursion.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/returns.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/sam.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/typed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/vararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/deepInnerClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/illegalModifier.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/localClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/modality.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/traits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/inner/visibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2152.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2606.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/kt310.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/kt53.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt361.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt4603.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/kt591.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/library/Collections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/library/kt828.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/Objects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/ObjectsInheritance.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/objects/upperBoundViolated.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/Delegation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/DuplicateMethod.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/Generics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt1862.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt2052.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt2491.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt4763.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt4785.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt4785classObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/kt880.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/recovery/namelessMembers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/Redeclarations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/kt2247.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/kt2418.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/kt2438.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/redeclarations/kt470.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet67.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/ea43298.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt26-1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt26.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt302.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt316.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt691.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt762.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/Imports-hidden.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportsConflicting.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1080.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1248.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1579.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1580.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1642.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/script/SimpleScript.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/script/imports.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/kt2744.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/kt304.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/kt3159.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
 delete mode 100644 compiler/testData/diagnostics/tests/when/When.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
 delete mode 100644 compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log

diff --git a/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
deleted file mode 100644
index 8228fce7122..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/inference/kt6176.lazy.log
+++ /dev/null
@@ -1,192 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.R': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.R': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('some': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('some1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('f': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('some': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('some1': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('some': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('some1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('equals': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('some': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('some1': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-null {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
deleted file mode 100644
index 8bf577381fc..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
deleted file mode 100644
index ff651fab6e5..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
deleted file mode 100644
index 7d589621862..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
deleted file mode 100644
index bb02cd89778..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Nested': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Nested': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log
deleted file mode 100644
index 61f3d1de737..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum1.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log
deleted file mode 100644
index 62ee7e0702e..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnEnum2.lazy.log
+++ /dev/null
@@ -1,90 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
deleted file mode 100644
index c87d65b6bf2..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('ONE': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
deleted file mode 100644
index 4239e3bdb6c..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('ONE': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log
deleted file mode 100644
index 81885d74a50..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject1.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log
deleted file mode 100644
index e712aaf2f0d..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/invoke/onObjects/invokeOnObject2.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log
deleted file mode 100644
index de1519eb0b9..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/defaultArgs.lazy.log
+++ /dev/null
@@ -1,231 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
-}
-
-LazyJavaClassDescriptor@5['IllegalArgumentException'] {
-    constructors = ArrayList@6[4] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['IllegalArgumentException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['IllegalArgumentException']
-}
-
-LazyJavaClassDescriptor@13['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@4['Exception'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@12['IllegalArgumentException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@14['RuntimeException'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
-}
-
-LazyJavaClassifierType@23['Exception'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@17['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@53['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    packageFragments('Any': FqName@57) = null
-    packageFragments('Int': FqName@58) = null
-    packageFragments('String': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.Any': FqName@64) = null
-    packageFragments('java.lang.Int': FqName@65) = null
-    packageFragments('java.lang.String': FqName@66) = null
-    packageFragments('java.lang.tailRecursive': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.Any': FqName@69) = null
-    packageFragments('kotlin.Int': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    packageFragments('kotlin.tailRecursive': FqName@74) = null
-    packageFragments('tailRecursive': FqName@75) = null
-    topLevelClasses(JavaClassImpl@25['Exception']) = LazyJavaClassDescriptor@3['Exception']
-    topLevelClasses(JavaClassImpl@76['IllegalArgumentException']) = LazyJavaClassDescriptor@5['IllegalArgumentException']
-    topLevelClasses(JavaClassImpl@27['RuntimeException']) = LazyJavaClassDescriptor@13['RuntimeException']
-}
-
-LazyJavaPackageFragment@56['<root>'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('IllegalArgumentException': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('tailRecursive': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@63['lang'] {
-    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[4] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[7] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-}
-
-null {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@140[4] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@141[7] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log
deleted file mode 100644
index d923409b4ee..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/extensionTailCall.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log
deleted file mode 100644
index 610c6b1465f..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNoTails.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.tailRecursive': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('kotlin.tailRecursive': FqName@17) = null
-    packageFragments('tailRecursive': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('noTails': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('tailRecursive': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('noTails': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('noTails': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('noTails': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
deleted file mode 100644
index 7f27f513e7a..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
+++ /dev/null
@@ -1,205 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Int': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.suppress': FqName@19) = null
-    packageFragments('java.lang.tailRecursive': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('kotlin.suppress': FqName@26) = null
-    packageFragments('kotlin.tailRecursive': FqName@27) = null
-    packageFragments('suppress': FqName@28) = null
-    packageFragments('tailRecursive': FqName@29) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('suppress': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tailRecursive': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
-}
-
-null {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@157[7] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@158[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@159[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = ArrayList@162[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log
deleted file mode 100644
index 6b276b3b07b..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/functionWithoutAnnotation.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65, ... }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log
deleted file mode 100644
index 185c2d52ed7..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixCall.lazy.log
+++ /dev/null
@@ -1,99 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@70[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log
deleted file mode 100644
index b5039d714f4..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/infixRecursiveCall.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.tailRecursive': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kotlin.tailRecursive': FqName@21) = null
-    packageFragments('tailRecursive': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log
deleted file mode 100644
index dc21b54f353..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/insideElvis.lazy.log
+++ /dev/null
@@ -1,158 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@112[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log
deleted file mode 100644
index f32a7e0d05d..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/labeledThisReferences.lazy.log
+++ /dev/null
@@ -1,153 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Any': FqName@9) = null
-    packageFragments('B': FqName@10) = null
-    packageFragments('C': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('String': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.C': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.tailRecursive': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.C': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.String': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('kotlin.tailRecursive': FqName@30) = null
-    packageFragments('tailRecursive': FqName@31) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Any': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('tailRecursive': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@110[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log
deleted file mode 100644
index 60582dcafe6..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/loops.lazy.log
+++ /dev/null
@@ -1,156 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@117[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@119[7] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log
deleted file mode 100644
index e13d6d5fb7c..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/multilevelBlocks.lazy.log
+++ /dev/null
@@ -1,188 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-null {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@133[7] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = ArrayList@134[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log
deleted file mode 100644
index 7e85d2f88b2..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realIteratorFoldl.lazy.log
+++ /dev/null
@@ -1,208 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Iterator': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Iterator': FqName@19) = null
-    packageFragments('java.lang.Long': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('java.lang.tailRecursive': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.Iterator': FqName@27) = null
-    packageFragments('kotlin.Long': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-    packageFragments('kotlin.tailRecursive': FqName@33) = null
-    packageFragments('tailRecursive': FqName@34) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Iterator': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Long': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('tailRecursive': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-}
-
-null {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@140[7] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log
deleted file mode 100644
index c238f97c061..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringEscape.lazy.log
+++ /dev/null
@@ -1,1023 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@4['AbstractStringBuilder']
-    functions('append': Name@5) = ArrayList@6[13] { JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], JavaMethodDescriptor@9['append'], ... } // through LazyJavaClassMemberScope@10
-    functions('toString': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['toString'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@17['Appendable'] {
-    defaultType = JetTypeImpl@18['Appendable']
-    functions('append': Name@19) = ArrayList@20[3] { JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'], JavaMethodDescriptor@23['append'] } // through LazyJavaClassMemberScope@24
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassDescriptor@31['Serializable'] {
-    defaultType = JetTypeImpl@32['Serializable']
-    functions('append': Name@5) = EmptyList@33[empty] // through LazyJavaClassMemberScope@34
-    functions('toString': Name@11) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassDescriptor@39['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassDescriptor@41['StringBuilder'] {
-    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
-    defaultType = JetTypeImpl@47['StringBuilder']
-    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
-    functionTypeForSamInterface = null
-    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
-    functions('toString': Name@54) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@46
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@46
-    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
-    nestedClasses('toString': Name@54) = null // through LazyJavaClassMemberScope@46
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@16['AbstractStringBuilder'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@30['Appendable'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { JetTypeImpl@67['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['Serializable'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { JetTypeImpl@67['Any'] }
-}
-
-LazyJavaClassTypeConstructor@40['StringBuffer'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['AbstractStringBuilder'], LazyJavaClassifierType@73['Serializable'], LazyJavaClassifierType@74['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@60['StringBuilder'] {
-    parameters = ArrayList@75[empty]
-    supertypes = ArrayList@76[3] { LazyJavaClassifierType@77['AbstractStringBuilder'], LazyJavaClassifierType@78['Serializable'], LazyJavaClassifierType@79['CharSequence'] }
-}
-
-LazyJavaClassifierType@77['AbstractStringBuilder'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@81['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@82['AbstractStringBuilder'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@86['AbstractStringBuilder'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@89['AbstractStringBuilder'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@92['AbstractStringBuilder'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@95['AbstractStringBuilder'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@98['AbstractStringBuilder'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@101['AbstractStringBuilder'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@104['AbstractStringBuilder'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@107['AbstractStringBuilder'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@110['AbstractStringBuilder'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@113['AbstractStringBuilder'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@116['AbstractStringBuilder'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@119['AbstractStringBuilder'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@122['AbstractStringBuilder'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@125['AbstractStringBuilder'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@127['AbstractStringBuilder'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@129['AbstractStringBuilder'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@131['AbstractStringBuilder'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@133['AbstractStringBuilder'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@135['AbstractStringBuilder'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@137['AbstractStringBuilder'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@139['AbstractStringBuilder'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@141['AbstractStringBuilder'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@143['AbstractStringBuilder'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@145['AbstractStringBuilder'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@147['AbstractStringBuilder'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@72['AbstractStringBuilder'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@150['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@63['Appendable'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@152['Appendable']
-    memberScope = LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@153['Appendable'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@156['Appendable'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@158['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@159['Appendable'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@162['Appendable'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@158['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@164['Appendable'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@166['Appendable'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@155['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@64['CharSequence'] {
-    arguments = ArrayList@168[empty]
-    classifier = JavaClassImpl@169['CharSequence']
-    memberScope = DeserializedClassMemberScope@170
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@79['CharSequence'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaClassImpl@173['CharSequence']
-    memberScope = DeserializedClassMemberScope@170
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@174['CharSequence'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaClassImpl@176['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@177['CharSequence'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaClassImpl@179['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@180['CharSequence'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@183['CharSequence'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@186['CharSequence'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@189['CharSequence'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@192['CharSequence'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@195['CharSequence'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@197['CharSequence'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@199['CharSequence'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@176['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@201['CharSequence'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@203['CharSequence'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@205['CharSequence'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@179['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@207['CharSequence'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@74['CharSequence'] {
-    classifier = JavaClassImpl@209['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@210['Object'] {
-    arguments = ArrayList@211[empty]
-    classifier = JavaClassImpl@212['Object']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@214['Object'] {
-    arguments = ArrayList@215[empty]
-    classifier = JavaClassImpl@216['Object']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@217['Object'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaClassImpl@212['Object']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@219['Object'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@216['Object']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@221['Object'] {
-    classifier = JavaClassImpl@222['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@223['Object'] {
-    classifier = JavaClassImpl@224['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@225['Object'] {
-    classifier = JavaClassImpl@226['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@78['Serializable'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaClassImpl@228['Serializable']
-    memberScope = LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@73['Serializable'] {
-    classifier = JavaClassImpl@229['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@230['String'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaClassImpl@232['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@234['String'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaClassImpl@236['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@237['String'] {
-    arguments = ArrayList@238[empty]
-    classifier = JavaClassImpl@239['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@240['String'] {
-    arguments = ArrayList@241[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@243['String'] {
-    arguments = ArrayList@244[empty]
-    classifier = JavaClassImpl@245['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@246['String'] {
-    arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@232['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@248['String'] {
-    arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@239['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@250['String'] {
-    arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@236['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@252['String'] {
-    arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@245['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@254['String'] {
-    arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@256['StringBuffer'] {
-    arguments = ArrayList@257[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@259['StringBuffer'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@262['StringBuffer'] {
-    arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@264['StringBuffer'] {
-    arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@266['StringBuilder'] {
-    arguments = ArrayList@267[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@269['StringBuilder'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@272['StringBuilder'] {
-    arguments = ArrayList@273[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@275['StringBuilder'] {
-    arguments = ArrayList@276[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@278['StringBuilder'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@281['StringBuilder'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@284['StringBuilder'] {
-    arguments = ArrayList@285[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@287['StringBuilder'] {
-    arguments = ArrayList@288[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@290['StringBuilder'] {
-    arguments = ArrayList@291[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@293['StringBuilder'] {
-    arguments = ArrayList@294[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@296['StringBuilder'] {
-    arguments = ArrayList@297[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@299['StringBuilder'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@302['StringBuilder'] {
-    arguments = ArrayList@303[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@305['StringBuilder'] {
-    arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@308['StringBuilder'] {
-    arguments = ArrayList@309[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@311['StringBuilder'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@313['StringBuilder'] {
-    arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@315['StringBuilder'] {
-    arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@317['StringBuilder'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@319['StringBuilder'] {
-    arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@321['StringBuilder'] {
-    arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@323['StringBuilder'] {
-    arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@325['StringBuilder'] {
-    arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@327['StringBuilder'] {
-    arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@329['StringBuilder'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@331['StringBuilder'] {
-    arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@333['StringBuilder'] {
-    arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@335['StringBuilder'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@337['StringBuilder'] {
-    arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@339['StringBuilder'] {
-    arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaPackageFragmentProvider@341 {
-    packageFragments('<root>': FqName@342) = LazyJavaPackageFragment@343['<root>']
-    packageFragments('Char': FqName@344) = null
-    packageFragments('Int': FqName@345) = null
-    packageFragments('String': FqName@346) = null
-    packageFragments('StringBuilder': FqName@347) = null
-    packageFragments('java': FqName@348) = LazyJavaPackageFragment@349['java']
-    packageFragments('java.io': FqName@350) = LazyJavaPackageFragment@351['io']
-    packageFragments('java.lang': FqName@352) = LazyJavaPackageFragment@353['lang']
-    packageFragments('java.lang.Char': FqName@354) = null
-    packageFragments('java.lang.Int': FqName@355) = null
-    packageFragments('java.lang.String': FqName@356) = null
-    packageFragments('java.lang.StringBuilder': FqName@357) = null
-    packageFragments('java.lang.tailRecursive': FqName@358) = null
-    packageFragments('kotlin': FqName@359) = null
-    packageFragments('kotlin.Char': FqName@360) = null
-    packageFragments('kotlin.Int': FqName@361) = null
-    packageFragments('kotlin.String': FqName@362) = null
-    packageFragments('kotlin.StringBuilder': FqName@363) = null
-    packageFragments('kotlin.io': FqName@364) = null
-    packageFragments('kotlin.jvm': FqName@365) = null
-    packageFragments('kotlin.tailRecursive': FqName@366) = null
-    packageFragments('tailRecursive': FqName@367) = null
-    topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
-    topLevelClasses(JavaClassImpl@368['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
-}
-
-LazyJavaPackageFragment@343['<root>'] {
-    classes('Char': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Int': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('String': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('StringBuilder': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('tailRecursive': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@381 // through LazyPackageFragmentScopeForJavaPackage@370
-}
-
-LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@382) = null // through LazyPackageFragmentScopeForJavaPackage@383
-    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@383
-    functions('lang': Name@384) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@383
-    memberIndex = computeMemberIndex$1@385 // through LazyPackageFragmentScopeForJavaPackage@383
-}
-
-LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@386
-    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@386
-    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@386
-    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@386
-    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@386
-    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@386
-    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
-    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
-    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
-    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
-    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@386
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[13] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@392, ... }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[4] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-}
-
-null {
-    <name not found> = ArrayList@454[14] { ResolutionCandidate@390, ResolutionCandidate@391, ResolutionCandidate@455, ... }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@473[4] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
-    <name not found> = ArrayList@474[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log
deleted file mode 100644
index 5c7b33f42c7..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/realStringRepeat.lazy.log
+++ /dev/null
@@ -1,982 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@4['AbstractStringBuilder']
-    functions('append': Name@5) = ArrayList@6[13] { JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], JavaMethodDescriptor@9['append'], ... } // through LazyJavaClassMemberScope@10
-    functions('toString': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['toString'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@17['Appendable'] {
-    defaultType = JetTypeImpl@18['Appendable']
-    functions('append': Name@19) = ArrayList@20[3] { JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'], JavaMethodDescriptor@23['append'] } // through LazyJavaClassMemberScope@24
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassDescriptor@31['Serializable'] {
-    defaultType = JetTypeImpl@32['Serializable']
-    functions('append': Name@5) = EmptyList@33[empty] // through LazyJavaClassMemberScope@34
-    functions('toString': Name@11) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassDescriptor@39['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassDescriptor@41['StringBuilder'] {
-    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
-    defaultType = JetTypeImpl@47['StringBuilder']
-    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
-    functionTypeForSamInterface = null
-    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
-    functions('toString': Name@54) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@46
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@46
-    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
-    nestedClasses('toString': Name@54) = null // through LazyJavaClassMemberScope@46
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@16['AbstractStringBuilder'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@30['Appendable'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { JetTypeImpl@67['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['Serializable'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { JetTypeImpl@67['Any'] }
-}
-
-LazyJavaClassTypeConstructor@40['StringBuffer'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['AbstractStringBuilder'], LazyJavaClassifierType@73['Serializable'], LazyJavaClassifierType@74['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@60['StringBuilder'] {
-    parameters = ArrayList@75[empty]
-    supertypes = ArrayList@76[3] { LazyJavaClassifierType@77['AbstractStringBuilder'], LazyJavaClassifierType@78['Serializable'], LazyJavaClassifierType@79['CharSequence'] }
-}
-
-LazyJavaClassifierType@77['AbstractStringBuilder'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@81['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@82['AbstractStringBuilder'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@86['AbstractStringBuilder'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@89['AbstractStringBuilder'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@92['AbstractStringBuilder'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@95['AbstractStringBuilder'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@98['AbstractStringBuilder'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@101['AbstractStringBuilder'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@104['AbstractStringBuilder'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@107['AbstractStringBuilder'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@110['AbstractStringBuilder'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@113['AbstractStringBuilder'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@116['AbstractStringBuilder'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@119['AbstractStringBuilder'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@122['AbstractStringBuilder'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@125['AbstractStringBuilder'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@127['AbstractStringBuilder'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@129['AbstractStringBuilder'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@131['AbstractStringBuilder'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@133['AbstractStringBuilder'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@135['AbstractStringBuilder'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@137['AbstractStringBuilder'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@139['AbstractStringBuilder'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@141['AbstractStringBuilder'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@143['AbstractStringBuilder'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@145['AbstractStringBuilder'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@147['AbstractStringBuilder'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@72['AbstractStringBuilder'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@150['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@63['Appendable'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@152['Appendable']
-    memberScope = LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@153['Appendable'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@156['Appendable'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@158['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@159['Appendable'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@162['Appendable'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@158['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@164['Appendable'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@166['Appendable'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@155['Appendable']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
-}
-
-LazyJavaClassifierType@79['CharSequence'] {
-    arguments = ArrayList@168[empty]
-    classifier = JavaClassImpl@169['CharSequence']
-    memberScope = DeserializedClassMemberScope@170
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@64['CharSequence'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaClassImpl@173['CharSequence']
-    memberScope = DeserializedClassMemberScope@170
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@174['CharSequence'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaClassImpl@176['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@177['CharSequence'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaClassImpl@179['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@180['CharSequence'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@183['CharSequence'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@186['CharSequence'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@189['CharSequence'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@192['CharSequence'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@195['CharSequence'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@176['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@197['CharSequence'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@199['CharSequence'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@179['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@201['CharSequence'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@203['CharSequence'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@205['CharSequence'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@207['CharSequence'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@74['CharSequence'] {
-    classifier = JavaClassImpl@209['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@210['Object'] {
-    arguments = ArrayList@211[empty]
-    classifier = JavaClassImpl@212['Object']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@214['Object'] {
-    arguments = ArrayList@215[empty]
-    classifier = JavaClassImpl@216['Object']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@217['Object'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaClassImpl@212['Object']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@219['Object'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@216['Object']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@221['Object'] {
-    classifier = JavaClassImpl@222['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@223['Object'] {
-    classifier = JavaClassImpl@224['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@225['Object'] {
-    classifier = JavaClassImpl@226['Object']
-    typeConstructor = DeserializedClassTypeConstructor@213
-}
-
-LazyJavaClassifierType@78['Serializable'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaClassImpl@228['Serializable']
-    memberScope = LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@73['Serializable'] {
-    classifier = JavaClassImpl@229['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@230['String'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaClassImpl@232['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@234['String'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaClassImpl@236['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@237['String'] {
-    arguments = ArrayList@238[empty]
-    classifier = JavaClassImpl@239['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@240['String'] {
-    arguments = ArrayList@241[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@243['String'] {
-    arguments = ArrayList@244[empty]
-    classifier = JavaClassImpl@245['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@246['String'] {
-    arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@232['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@248['String'] {
-    arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@239['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@250['String'] {
-    arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@245['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@252['String'] {
-    arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@254['String'] {
-    arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@236['String']
-    nullable = 'true': Boolean@124
-    typeConstructor = DeserializedClassTypeConstructor@233
-}
-
-LazyJavaClassifierType@256['StringBuffer'] {
-    arguments = ArrayList@257[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@259['StringBuffer'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@262['StringBuffer'] {
-    arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@264['StringBuffer'] {
-    arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@266['StringBuilder'] {
-    arguments = ArrayList@267[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@269['StringBuilder'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@272['StringBuilder'] {
-    arguments = ArrayList@273[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@275['StringBuilder'] {
-    arguments = ArrayList@276[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@278['StringBuilder'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@281['StringBuilder'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@284['StringBuilder'] {
-    arguments = ArrayList@285[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@287['StringBuilder'] {
-    arguments = ArrayList@288[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@290['StringBuilder'] {
-    arguments = ArrayList@291[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@293['StringBuilder'] {
-    arguments = ArrayList@294[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@296['StringBuilder'] {
-    arguments = ArrayList@297[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@299['StringBuilder'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@302['StringBuilder'] {
-    arguments = ArrayList@303[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@305['StringBuilder'] {
-    arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@308['StringBuilder'] {
-    arguments = ArrayList@309[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@311['StringBuilder'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@313['StringBuilder'] {
-    arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@315['StringBuilder'] {
-    arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@317['StringBuilder'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@319['StringBuilder'] {
-    arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@321['StringBuilder'] {
-    arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@323['StringBuilder'] {
-    arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@325['StringBuilder'] {
-    arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@327['StringBuilder'] {
-    arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@329['StringBuilder'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@331['StringBuilder'] {
-    arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@333['StringBuilder'] {
-    arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@335['StringBuilder'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@337['StringBuilder'] {
-    arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaClassifierType@339['StringBuilder'] {
-    arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
-}
-
-LazyJavaPackageFragmentProvider@341 {
-    packageFragments('<root>': FqName@342) = LazyJavaPackageFragment@343['<root>']
-    packageFragments('Int': FqName@344) = null
-    packageFragments('String': FqName@345) = null
-    packageFragments('StringBuilder': FqName@346) = null
-    packageFragments('java': FqName@347) = LazyJavaPackageFragment@348['java']
-    packageFragments('java.io': FqName@349) = LazyJavaPackageFragment@350['io']
-    packageFragments('java.lang': FqName@351) = LazyJavaPackageFragment@352['lang']
-    packageFragments('java.lang.Int': FqName@353) = null
-    packageFragments('java.lang.String': FqName@354) = null
-    packageFragments('java.lang.StringBuilder': FqName@355) = null
-    packageFragments('java.lang.tailRecursive': FqName@356) = null
-    packageFragments('kotlin': FqName@357) = null
-    packageFragments('kotlin.Int': FqName@358) = null
-    packageFragments('kotlin.String': FqName@359) = null
-    packageFragments('kotlin.StringBuilder': FqName@360) = null
-    packageFragments('kotlin.io': FqName@361) = null
-    packageFragments('kotlin.jvm': FqName@362) = null
-    packageFragments('kotlin.tailRecursive': FqName@363) = null
-    packageFragments('tailRecursive': FqName@364) = null
-    topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
-    topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
-}
-
-LazyJavaPackageFragment@343['<root>'] {
-    classes('Int': Name@366) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('String': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('StringBuilder': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('tailRecursive': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    memberIndex = computeMemberIndex$1@374 // through LazyPackageFragmentScopeForJavaPackage@367
-}
-
-LazyJavaPackageFragment@348['java'] {
-    classes('lang': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@376
-    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@376
-    functions('lang': Name@377) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@376
-    memberIndex = computeMemberIndex$1@378 // through LazyPackageFragmentScopeForJavaPackage@376
-}
-
-LazyJavaPackageFragment@352['lang'] {
-    classes('StringBuilder': Name@369) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@379
-    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@379
-    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@379
-    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
-    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
-    memberIndex = computeMemberIndex$1@380 // through LazyPackageFragmentScopeForJavaPackage@379
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[13] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@385, ... }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[4] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-}
-
-null {
-    <name not found> = ArrayList@444[14] { ResolutionCandidate@383, ResolutionCandidate@384, ResolutionCandidate@445, ... }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@462[4] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
-    <name not found> = ArrayList@463[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log
deleted file mode 100644
index 5523d1148a6..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLambda.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('bar': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('bar': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
deleted file mode 100644
index f7ca2043272..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.tailRecursive': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('kotlin.tailRecursive': FqName@17) = null
-    packageFragments('tailRecursive': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('tailRecursive': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log
deleted file mode 100644
index f6686573531..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/recursiveInnerFunction.lazy.log
+++ /dev/null
@@ -1,97 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@71[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log
deleted file mode 100644
index 824a3eed5b2..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnIf.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@124[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log
deleted file mode 100644
index 7f4bfcc2805..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInCatch.lazy.log
+++ /dev/null
@@ -1,221 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Exception': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Exception': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.String': FqName@62) = null
-    packageFragments('java.lang.tailRecursive': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Exception': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.String': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    packageFragments('kotlin.tailRecursive': FqName@70) = null
-    packageFragments('tailRecursive': FqName@71) = null
-    topLevelClasses(JavaClassImpl@72['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('Exception': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('tailRecursive': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@131[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log
deleted file mode 100644
index bc67d0d09e3..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInFinally.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log
deleted file mode 100644
index 04faeb9572b..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInIfInFinally.lazy.log
+++ /dev/null
@@ -1,117 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[7] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@87[7] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log
deleted file mode 100644
index 15ff9aecfbe..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInParentheses.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log
deleted file mode 100644
index 48e633749e9..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/returnInTry.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('Throwable': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.Throwable': FqName@15) = null
-    packageFragments('java.lang.tailRecursive': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.Throwable': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.tailRecursive': FqName@23) = null
-    packageFragments('tailRecursive': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Throwable': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log
deleted file mode 100644
index dd6ecac5ef8..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleBlock.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@124[8] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log
deleted file mode 100644
index c19a4361bd4..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturn.lazy.log
+++ /dev/null
@@ -1,136 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@102[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log
deleted file mode 100644
index 7353ec4e88b..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/simpleReturnWithElse.lazy.log
+++ /dev/null
@@ -1,155 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-null {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log
deleted file mode 100644
index 7ced8869eac..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/sum.lazy.log
+++ /dev/null
@@ -1,158 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Long': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Long': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.tailRecursive': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Long': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kotlin.tailRecursive': FqName@21) = null
-    packageFragments('tailRecursive': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Long': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
deleted file mode 100644
index fe03c9f6c23..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@75[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log
deleted file mode 100644
index 0c8330264e6..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailCallInParentheses.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log
deleted file mode 100644
index dd153a61b2a..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/tailRecursionInFinally.lazy.log
+++ /dev/null
@@ -1,125 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
-}
-
-LazyJavaClassTypeConstructor@4['Exception'] {
-    parameters = ArrayList@5[empty]
-    supertypes = ArrayList@6[1] { LazyJavaClassifierType@7['Throwable'] }
-}
-
-LazyJavaClassifierType@7['Throwable'] {
-    arguments = ArrayList@8[empty]
-    classifier = JavaClassImpl@9['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Boolean': FqName@14) = null
-    packageFragments('Exception': FqName@15) = null
-    packageFragments('String': FqName@16) = null
-    packageFragments('Unit': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Boolean': FqName@22) = null
-    packageFragments('java.lang.Exception': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('java.lang.Unit': FqName@25) = null
-    packageFragments('java.lang.tailRecursive': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Boolean': FqName@28) = null
-    packageFragments('kotlin.Exception': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.Unit': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('kotlin.tailRecursive': FqName@34) = null
-    packageFragments('tailRecursive': FqName@35) = null
-    topLevelClasses(JavaClassImpl@36['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('Boolean': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Exception': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tailRecursive': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log
deleted file mode 100644
index fea1aedf608..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/thisReferences.lazy.log
+++ /dev/null
@@ -1,178 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['tailRecursive']
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('A': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('String': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.A': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.tailRecursive': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-    packageFragments('kotlin.tailRecursive': FqName@29) = null
-    packageFragments('tailRecursive': FqName@30) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tailRecursive': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log
deleted file mode 100644
index 9f01e5d5179..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/unitBlocks.lazy.log
+++ /dev/null
@@ -1,227 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.Unit': FqName@15) = null
-    packageFragments('java.lang.tailRecursive': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.Unit': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.tailRecursive': FqName@23) = null
-    packageFragments('tailRecursive': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-}
-
-null {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@166[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@168[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@170[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log
deleted file mode 100644
index 15b32b2b26a..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithCondition.lazy.log
+++ /dev/null
@@ -1,126 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log
deleted file mode 100644
index f8dbeb9cb96..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithInRange.lazy.log
+++ /dev/null
@@ -1,207 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.tailRecursive': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.tailRecursive': FqName@23) = null
-    packageFragments('tailRecursive': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('withWhen': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('withWhen': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-}
-
-null {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@152[7] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@153[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@154[8] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@156[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@157[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log
deleted file mode 100644
index 5bb94fde9b4..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithIs.lazy.log
+++ /dev/null
@@ -1,288 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
-}
-
-LazyJavaClassDescriptor@5['IllegalStateException'] {
-    constructors = ArrayList@6[4] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['IllegalStateException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['IllegalStateException']
-}
-
-LazyJavaClassDescriptor@13['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@4['Exception'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@12['IllegalStateException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@14['RuntimeException'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Exception'] }
-}
-
-LazyJavaClassifierType@23['Exception'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@4['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@17['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@53['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    packageFragments('Any': FqName@57) = null
-    packageFragments('Int': FqName@58) = null
-    packageFragments('Number': FqName@59) = null
-    packageFragments('String': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Any': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Number': FqName@67) = null
-    packageFragments('java.lang.String': FqName@68) = null
-    packageFragments('java.lang.tailRecursive': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Any': FqName@71) = null
-    packageFragments('kotlin.Int': FqName@72) = null
-    packageFragments('kotlin.Number': FqName@73) = null
-    packageFragments('kotlin.String': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('kotlin.tailRecursive': FqName@77) = null
-    packageFragments('tailRecursive': FqName@78) = null
-    topLevelClasses(JavaClassImpl@25['Exception']) = LazyJavaClassDescriptor@3['Exception']
-    topLevelClasses(JavaClassImpl@79['IllegalStateException']) = LazyJavaClassDescriptor@5['IllegalStateException']
-    topLevelClasses(JavaClassImpl@27['RuntimeException']) = LazyJavaClassDescriptor@13['RuntimeException']
-}
-
-LazyJavaPackageFragment@56['<root>'] {
-    classes('Any': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('IllegalStateException': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Number': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[4] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@180[4] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@182[8] { ResolutionCandidate@160, ResolutionCandidate@161, ResolutionCandidate@162, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
diff --git a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log b/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log
deleted file mode 100644
index 908aab0811b..00000000000
--- a/compiler/testData/codegen/box/diagnostics/functions/tailRecursion/whenWithoutCondition.lazy.log
+++ /dev/null
@@ -1,155 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['tailRecursive']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.tailRecursive': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.tailRecursive': FqName@20) = null
-    packageFragments('tailRecursive': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-null {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@83, ResolutionCandidate@84, ResolutionCandidate@85, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log b/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
deleted file mode 100644
index eac3f803a79..00000000000
--- a/compiler/testData/diagnostics/checkerTestUtil/test_with_diagnostic.lazy.log
+++ /dev/null
@@ -1,298 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('A': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('java.lang.xx': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kotlin.xx': FqName@19) = null
-    packageFragments('xx': FqName@20) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Unit': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('xx': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo1': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('minus': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('xx': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('xx': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo1': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('xx': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Abstract.lazy.log b/compiler/testData/diagnostics/tests/Abstract.lazy.log
deleted file mode 100644
index a10a7de6d29..00000000000
--- a/compiler/testData/diagnostics/tests/Abstract.lazy.log
+++ /dev/null
@@ -1,204 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('B1': FqName@8) = null
-    packageFragments('B2': FqName@9) = null
-    packageFragments('B3': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('MyPackage': FqName@12) = null
-    packageFragments('MyPackage.Int': FqName@13) = null
-    packageFragments('MyPackage.a': FqName@14) = null
-    packageFragments('MyPackage.a1': FqName@15) = null
-    packageFragments('MyPackage.a2': FqName@16) = null
-    packageFragments('MyPackage.a3': FqName@17) = null
-    packageFragments('MyPackage.b': FqName@18) = null
-    packageFragments('MyPackage.b1': FqName@19) = null
-    packageFragments('MyPackage.b2': FqName@20) = null
-    packageFragments('MyPackage.b3': FqName@21) = null
-    packageFragments('MyPackage.c': FqName@22) = null
-    packageFragments('MyPackage.c1': FqName@23) = null
-    packageFragments('MyPackage.c2': FqName@24) = null
-    packageFragments('MyPackage.c3': FqName@25) = null
-    packageFragments('MyPackage.e': FqName@26) = null
-    packageFragments('MyPackage.e1': FqName@27) = null
-    packageFragments('MyPackage.e2': FqName@28) = null
-    packageFragments('MyPackage.e3': FqName@29) = null
-    packageFragments('MyPackage.i': FqName@30) = null
-    packageFragments('MyPackage.i1': FqName@31) = null
-    packageFragments('MyPackage.j': FqName@32) = null
-    packageFragments('MyPackage.j1': FqName@33) = null
-    packageFragments('MyPackage.k': FqName@34) = null
-    packageFragments('MyPackage.k1': FqName@35) = null
-    packageFragments('MyPackage.l': FqName@36) = null
-    packageFragments('MyPackage.l1': FqName@37) = null
-    packageFragments('MyPackage.n': FqName@38) = null
-    packageFragments('String': FqName@39) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.B1': FqName@44) = null
-    packageFragments('java.lang.B3': FqName@45) = null
-    packageFragments('java.lang.Int': FqName@46) = null
-    packageFragments('java.lang.String': FqName@47) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.B1': FqName@49) = null
-    packageFragments('kotlin.B3': FqName@50) = null
-    packageFragments('kotlin.Int': FqName@51) = null
-    packageFragments('kotlin.String': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('B1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('B3': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Int': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('String': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('B1': Name@55) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('B3': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@65) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('B1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('B3': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('a': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('c': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('c1': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('c2': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('c3': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('i': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('B1': Name@55) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('B3': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-null {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
deleted file mode 100644
index 22e707f8733..00000000000
--- a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
+++ /dev/null
@@ -1,131 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Int': FqName@8) = null
-    packageFragments('abstract': FqName@9) = null
-    packageFragments('abstract.Int': FqName@10) = null
-    packageFragments('abstract.MyAbstractClass': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c2': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c3': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log b/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
deleted file mode 100644
index 4e3955cd3a3..00000000000
--- a/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
+++ /dev/null
@@ -1,131 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Int': FqName@8) = null
-    packageFragments('abstract': FqName@9) = null
-    packageFragments('abstract.Int': FqName@10) = null
-    packageFragments('abstract.MyClass': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c2': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c3': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log b/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
deleted file mode 100644
index 949961d1ed7..00000000000
--- a/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('abstract': FqName@4) = null
-    packageFragments('abstract.Int': FqName@5) = null
-    packageFragments('abstract.MyTrait': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('c': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('c1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('c2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('c3': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('i': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log b/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
deleted file mode 100644
index 91fe7e10661..00000000000
--- a/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log b/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
deleted file mode 100644
index bf5707e7d5f..00000000000
--- a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
+++ /dev/null
@@ -1,274 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('$y': FqName@1) = null
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Int': FqName@4) = null
-    packageFragments('NoC': FqName@5) = null
-    packageFragments('WithC': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.$y': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.b': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.$y': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.b': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('$y': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('a': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('b': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('x': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('$y': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('b': Name@31) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('$y': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('a': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('b': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('x': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('$y': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('b': Name@31) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log b/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
deleted file mode 100644
index 75db2772d93..00000000000
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
+++ /dev/null
@@ -1,358 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('URI': FqName@7) = null
-    packageFragments('it': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.URI': FqName@17) = null
-    packageFragments('java.lang.it': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Boolean': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.URI': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.it': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Boolean': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('it': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('on': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('to': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('URI': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar1': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar2': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('it': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('on': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('to': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('it': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('on': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('to': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('URI': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('bar': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('bar1': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('bar2': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('it': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('on': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('to': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-null {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@159[8] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Basic.lazy.log b/compiler/testData/diagnostics/tests/Basic.lazy.log
deleted file mode 100644
index eac3f803a79..00000000000
--- a/compiler/testData/diagnostics/tests/Basic.lazy.log
+++ /dev/null
@@ -1,298 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('A': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('java.lang.xx': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kotlin.xx': FqName@19) = null
-    packageFragments('xx': FqName@20) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Unit': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('xx': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo1': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('minus': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('xx': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('xx': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo1': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('xx': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
deleted file mode 100644
index 50003c3d27b..00000000000
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
+++ /dev/null
@@ -1,425 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = BooleanValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Boolean': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Unit': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('A': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Any': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Boolean': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Unit': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('contains': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plusAssign': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('A': Name@25) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('compareTo': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('contains': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plusAssign': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('rangeTo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('A': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('contains': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plusAssign': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('rangeTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@25) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('compareTo': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('contains': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('equals': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plus': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plusAssign': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('rangeTo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[7] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[7] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-null {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@176[7] { ResolutionCandidate@141, ResolutionCandidate@142, ResolutionCandidate@143, ... }
-    <name not found> = ArrayList@177[7] { ResolutionCandidate@136, ResolutionCandidate@137, ResolutionCandidate@138, ... }
-    <name not found> = ArrayList@178[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = ArrayList@179[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@180[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Bounds.lazy.log b/compiler/testData/diagnostics/tests/Bounds.lazy.log
deleted file mode 100644
index ac7e783365a..00000000000
--- a/compiler/testData/diagnostics/tests/Bounds.lazy.log
+++ /dev/null
@@ -1,245 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B<1>']
-    <name not found> = JetTypeImpl@2['B<1>']
-    <name not found> = JetTypeImpl@3['B<1>']
-    <name not found> = JetTypeImpl@4['X<2>']
-    <name not found> = JetTypeImpl@5['X<2>']
-    <name not found> = JetTypeImpl@6['X<2>']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('A': FqName@10) = null
-    packageFragments('Any': FqName@11) = null
-    packageFragments('B': FqName@12) = null
-    packageFragments('C': FqName@13) = null
-    packageFragments('Char': FqName@14) = null
-    packageFragments('Double': FqName@15) = null
-    packageFragments('Int': FqName@16) = null
-    packageFragments('Pair': FqName@17) = null
-    packageFragments('String': FqName@18) = null
-    packageFragments('Unit': FqName@19) = null
-    packageFragments('X': FqName@20) = null
-    packageFragments('boundsWithSubstitutors': FqName@21) = null
-    packageFragments('boundsWithSubstitutors.A': FqName@22) = null
-    packageFragments('boundsWithSubstitutors.Any': FqName@23) = null
-    packageFragments('boundsWithSubstitutors.B': FqName@24) = null
-    packageFragments('boundsWithSubstitutors.C': FqName@25) = null
-    packageFragments('boundsWithSubstitutors.Int': FqName@26) = null
-    packageFragments('boundsWithSubstitutors.String': FqName@27) = null
-    packageFragments('boundsWithSubstitutors.X': FqName@28) = null
-    packageFragments('boundsWithSubstitutors.a': FqName@29) = null
-    packageFragments('boundsWithSubstitutors.a1': FqName@30) = null
-    packageFragments('boundsWithSubstitutors.b': FqName@31) = null
-    packageFragments('boundsWithSubstitutors.b0': FqName@32) = null
-    packageFragments('boundsWithSubstitutors.b1': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.A': FqName@38) = null
-    packageFragments('java.lang.Any': FqName@39) = null
-    packageFragments('java.lang.B': FqName@40) = null
-    packageFragments('java.lang.C': FqName@41) = null
-    packageFragments('java.lang.Char': FqName@42) = null
-    packageFragments('java.lang.Double': FqName@43) = null
-    packageFragments('java.lang.Int': FqName@44) = null
-    packageFragments('java.lang.Pair': FqName@45) = null
-    packageFragments('java.lang.String': FqName@46) = null
-    packageFragments('java.lang.Unit': FqName@47) = null
-    packageFragments('java.lang.X': FqName@48) = null
-    packageFragments('kotlin': FqName@49) = null
-    packageFragments('kotlin.A': FqName@50) = null
-    packageFragments('kotlin.Any': FqName@51) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.C': FqName@53) = null
-    packageFragments('kotlin.Char': FqName@54) = null
-    packageFragments('kotlin.Double': FqName@55) = null
-    packageFragments('kotlin.Int': FqName@56) = null
-    packageFragments('kotlin.Pair': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.Unit': FqName@59) = null
-    packageFragments('kotlin.X': FqName@60) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Any': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Char': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Double': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Unit': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('buzz': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@65) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('buzz': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('foo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('B': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('X': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('buzz': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('foo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('B': Name@65) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('X': Name@81) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('buzz': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('foo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-null {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/BreakContinue.lazy.log b/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
deleted file mode 100644
index 71e88b75354..00000000000
--- a/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
+++ /dev/null
@@ -1,426 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Array': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Boolean': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('compareTo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-}
-
-null {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@230[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = ArrayList@231[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-    <name not found> = ArrayList@232[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Builders.lazy.log b/compiler/testData/diagnostics/tests/Builders.lazy.log
deleted file mode 100644
index 61e91c27536..00000000000
--- a/compiler/testData/diagnostics/tests/Builders.lazy.log
+++ /dev/null
@@ -1,3647 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ArrayList<1>']
-    <name not found> = JetTypeImpl@2['HashMap<2>']
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@4
-    <name not found> = MutableClassDescriptor$1@5
-    <name not found> = MutableClassDescriptor$1@6
-    <name not found> = MutableClassDescriptor$1@7
-    <name not found> = MutableClassDescriptor$1@8
-    <name not found> = MutableClassDescriptor$1@9
-    <name not found> = MutableClassDescriptor$1@10
-    <name not found> = NullableType@11
-}
-
-LazyJavaClassDescriptor@12['AbstractCollection'] {
-    defaultType = JetTypeImpl@13['AbstractCollection<1>']
-    functions('add': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    functions('iterator': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['iterator'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@24['AbstractList'] {
-    defaultType = JetTypeImpl@25['AbstractList<1>']
-    functions('add': Name@26) = ArrayList@27[2] { JavaMethodDescriptor@28['add'], JavaMethodDescriptor@29['add'] } // through LazyJavaClassMemberScope@30
-    functions('iterator': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['iterator'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
-}
-
-LazyJavaClassDescriptor@37['AbstractMap'] {
-    defaultType = JetTypeImpl@38['AbstractMap<2>']
-    functions('get': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['get'] } // through LazyJavaClassMemberScope@42
-    functions('keySet': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['keySet'] } // through LazyJavaClassMemberScope@42
-    functions('put': Name@46) = ArrayList@47[1] { JavaMethodDescriptor@48['put'] } // through LazyJavaClassMemberScope@42
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@42
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@50['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractMap']
-}
-
-LazyJavaClassDescriptor@52['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@53['AbstractStringBuilder']
-    functions('append': Name@54) = ArrayList@55[13] { JavaMethodDescriptor@56['append'], JavaMethodDescriptor@57['append'], JavaMethodDescriptor@58['append'], ... } // through LazyJavaClassMemberScope@59
-    functions('toString': Name@60) = ArrayList@61[1] { JavaMethodDescriptor@62['toString'] } // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@63 // through LazyJavaClassMemberScope@59
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@64['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@66['Appendable'] {
-    defaultType = JetTypeImpl@67['Appendable']
-    functions('append': Name@68) = ArrayList@69[3] { JavaMethodDescriptor@70['append'], JavaMethodDescriptor@71['append'], JavaMethodDescriptor@72['append'] } // through LazyJavaClassMemberScope@73
-    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@73
-    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@73
-    functions('toString': Name@77) = ArrayList@78[1] { DeserializedSimpleFunctionDescriptor@79['toString'] } // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@80 // through LazyJavaClassMemberScope@73
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@81['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassDescriptor@83['ArrayList'] {
-    constructors = ArrayList@84[3] { JavaConstructorDescriptor@85['<init>'], JavaConstructorDescriptor@86['<init>'], JavaConstructorDescriptor@87['<init>'] } // through LazyJavaClassMemberScope@88
-    defaultType = JetTypeImpl@89['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@90 // through LazyJavaClassMemberScope@88
-    functionTypeForSamInterface = null
-    functions('add': Name@91) = ArrayList@92[2] { JavaMethodDescriptor@93['add'], JavaMethodDescriptor@94['add'] } // through LazyJavaClassMemberScope@88
-    functions('iterator': Name@95) = ArrayList@96[1] { JavaMethodDescriptor@97['iterator'] } // through LazyJavaClassMemberScope@88
-    memberIndex = computeMemberIndex$1@98 // through LazyJavaClassMemberScope@88
-    nestedClassIndex = LinkedHashMap@99 // through LazyJavaClassMemberScope@88
-    nestedClasses('add': Name@91) = null // through LazyJavaClassMemberScope@88
-    nestedClasses('iterator': Name@95) = null // through LazyJavaClassMemberScope@88
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@100['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@101['ArrayList']
-}
-
-LazyJavaClassDescriptor@102['AutoCloseable'] {
-    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@103
-    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@103
-    memberIndex = computeMemberIndex$1@104 // through LazyJavaClassMemberScope@103
-    typeConstructor = LazyJavaClassTypeConstructor@105['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@106['Closeable'] {
-    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@107
-    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@107
-    memberIndex = computeMemberIndex$1@108 // through LazyJavaClassMemberScope@107
-    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
-}
-
-LazyJavaClassDescriptor@110['FilterOutputStream'] {
-    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@111
-    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@111
-    memberIndex = computeMemberIndex$1@112 // through LazyJavaClassMemberScope@111
-    typeConstructor = LazyJavaClassTypeConstructor@113['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@114['HashMap'] {
-    constructors = ArrayList@115[4] { JavaConstructorDescriptor@116['<init>'], JavaConstructorDescriptor@117['<init>'], JavaConstructorDescriptor@118['<init>'], ... } // through LazyJavaClassMemberScope@119
-    defaultType = JetTypeImpl@120['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@121 // through LazyJavaClassMemberScope@119
-    functionTypeForSamInterface = null
-    functions('get': Name@122) = ArrayList@123[1] { JavaMethodDescriptor@124['get'] } // through LazyJavaClassMemberScope@119
-    functions('keySet': Name@125) = ArrayList@126[1] { JavaMethodDescriptor@127['keySet'] } // through LazyJavaClassMemberScope@119
-    functions('put': Name@128) = ArrayList@129[1] { JavaMethodDescriptor@130['put'] } // through LazyJavaClassMemberScope@119
-    memberIndex = computeMemberIndex$1@131 // through LazyJavaClassMemberScope@119
-    nestedClassIndex = LinkedHashMap@132 // through LazyJavaClassMemberScope@119
-    nestedClasses('get': Name@122) = null // through LazyJavaClassMemberScope@119
-    nestedClasses('keySet': Name@125) = null // through LazyJavaClassMemberScope@119
-    nestedClasses('put': Name@128) = null // through LazyJavaClassMemberScope@119
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@133['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@134['HashMap']
-}
-
-LazyJavaClassDescriptor@135['OutputStream'] {
-    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@136
-    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@136
-    memberIndex = computeMemberIndex$1@137 // through LazyJavaClassMemberScope@136
-    typeConstructor = LazyJavaClassTypeConstructor@138['OutputStream']
-}
-
-LazyJavaClassDescriptor@139['PrintStream'] {
-    defaultType = JetTypeImpl@140['PrintStream']
-    enumEntryIndex = LinkedHashMap@141 // through LazyJavaClassMemberScope@142
-    functions('print': Name@143) = ArrayList@144[9] { JavaMethodDescriptor@145['print'], JavaMethodDescriptor@146['print'], JavaMethodDescriptor@147['print'], ... } // through LazyJavaClassMemberScope@142
-    functions('println': Name@148) = ArrayList@149[10] { JavaMethodDescriptor@150['println'], JavaMethodDescriptor@151['println'], JavaMethodDescriptor@152['println'], ... } // through LazyJavaClassMemberScope@142
-    memberIndex = computeMemberIndex$1@153 // through LazyJavaClassMemberScope@142
-    nestedClassIndex = LinkedHashMap@154 // through LazyJavaClassMemberScope@142
-    nestedClasses('print': Name@143) = null // through LazyJavaClassMemberScope@142
-    nestedClasses('println': Name@148) = null // through LazyJavaClassMemberScope@142
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@155['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
-}
-
-LazyJavaClassDescriptor@157['RandomAccess'] {
-    functions('add': Name@26) = EmptyList@75[empty] // through LazyJavaClassMemberScope@158
-    functions('iterator': Name@31) = EmptyList@75[empty] // through LazyJavaClassMemberScope@158
-    memberIndex = computeMemberIndex$1@159 // through LazyJavaClassMemberScope@158
-    typeConstructor = LazyJavaClassTypeConstructor@160['RandomAccess']
-}
-
-LazyJavaClassDescriptor@161['Serializable'] {
-    defaultType = JetTypeImpl@162['Serializable']
-    functions('add': Name@26) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('append': Name@54) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('get': Name@39) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('iterator': Name@31) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('keySet': Name@43) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('put': Name@46) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
-    functions('toString': Name@60) = ArrayList@164[1] { DeserializedSimpleFunctionDescriptor@165['toString'] } // through LazyJavaClassMemberScope@163
-    memberIndex = computeMemberIndex$1@166 // through LazyJavaClassMemberScope@163
-    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
-}
-
-LazyJavaClassDescriptor@168['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
-}
-
-LazyJavaClassDescriptor@170['StringBuilder'] {
-    constructors = ArrayList@171[4] { JavaConstructorDescriptor@172['<init>'], JavaConstructorDescriptor@173['<init>'], JavaConstructorDescriptor@174['<init>'], ... } // through LazyJavaClassMemberScope@175
-    defaultType = JetTypeImpl@176['StringBuilder']
-    enumEntryIndex = LinkedHashMap@177 // through LazyJavaClassMemberScope@175
-    functionTypeForSamInterface = null
-    functions('append': Name@178) = ArrayList@179[14] { JavaMethodDescriptor@180['append'], JavaMethodDescriptor@181['append'], JavaMethodDescriptor@182['append'], ... } // through LazyJavaClassMemberScope@175
-    functions('toString': Name@183) = ArrayList@184[1] { JavaMethodDescriptor@185['toString'] } // through LazyJavaClassMemberScope@175
-    memberIndex = computeMemberIndex$1@186 // through LazyJavaClassMemberScope@175
-    nestedClassIndex = LinkedHashMap@187 // through LazyJavaClassMemberScope@175
-    nestedClasses('append': Name@178) = null // through LazyJavaClassMemberScope@175
-    nestedClasses('toString': Name@183) = null // through LazyJavaClassMemberScope@175
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@188['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassDescriptor@190['System'] {
-    enumEntryIndex = LinkedHashMap@191 // through LazyJavaClassMemberScope@192
-    memberIndex = computeMemberIndex$1@193 // through LazyJavaClassMemberScope@192
-    memberIndex = computeMemberIndex$1@194 // through LazyJavaStaticClassScope@195
-    nestedClassIndex = LinkedHashMap@196 // through LazyJavaClassMemberScope@192
-    nestedClasses('out': Name@197) = null // through LazyJavaClassMemberScope@192
-    properties('out': Name@197) = ArrayList@198[1] { JavaPropertyDescriptor@199['out'] } // through LazyJavaStaticClassScope@195
-    properties('out': Name@197) = EmptyList@75[empty] // through LazyJavaClassMemberScope@192
-    typeConstructor = LazyJavaClassTypeConstructor@200['System']
-}
-
-LazyJavaClassTypeConstructor@23['AbstractCollection'] {
-    parameters = ArrayList@201[1] { LazyJavaTypeParameterDescriptor@202['E'] }
-    supertypes = ArrayList@203[1] { LazyJavaClassifierType@204['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@36['AbstractList'] {
-    parameters = ArrayList@205[1] { LazyJavaTypeParameterDescriptor@206['E'] }
-    supertypes = ArrayList@207[2] { LazyJavaClassifierType@208['AbstractCollection<E>'], LazyJavaClassifierType@209['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@51['AbstractMap'] {
-    parameters = ArrayList@210[2] { LazyJavaTypeParameterDescriptor@211['K'], LazyJavaTypeParameterDescriptor@212['V'] }
-    supertypes = ArrayList@213[1] { LazyJavaClassifierType@214['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@65['AbstractStringBuilder'] {
-    parameters = ArrayList@215[empty]
-    supertypes = ArrayList@216[2] { LazyJavaClassifierType@217['Appendable'], LazyJavaClassifierType@218['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@82['Appendable'] {
-    parameters = ArrayList@219[empty]
-    supertypes = ArrayList@220[1] { JetTypeImpl@221['Any'] }
-}
-
-LazyJavaClassTypeConstructor@101['ArrayList'] {
-    parameters = ArrayList@222[1] { LazyJavaTypeParameterDescriptor@223['E'] }
-    supertypes = ArrayList@224[5] { LazyJavaClassifierType@225['AbstractList<E>'], LazyJavaClassifierType@226['List<E>'], LazyJavaClassifierType@227['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@105['AutoCloseable'] {
-    parameters = ArrayList@228[empty]
-    supertypes = ArrayList@229[1] { JetTypeImpl@221['Any'] }
-}
-
-LazyJavaClassTypeConstructor@109['Closeable'] {
-    parameters = ArrayList@230[empty]
-    supertypes = ArrayList@231[1] { LazyJavaClassifierType@232['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@113['FilterOutputStream'] {
-    parameters = ArrayList@233[empty]
-    supertypes = ArrayList@234[1] { LazyJavaClassifierType@235['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@134['HashMap'] {
-    parameters = ArrayList@236[2] { LazyJavaTypeParameterDescriptor@237['K'], LazyJavaTypeParameterDescriptor@238['V'] }
-    supertypes = ArrayList@239[4] { LazyJavaClassifierType@240['AbstractMap<K, V>'], LazyJavaClassifierType@241['Map<K, V>'], LazyJavaClassifierType@242['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@138['OutputStream'] {
-    parameters = ArrayList@243[empty]
-    supertypes = ArrayList@244[1] { LazyJavaClassifierType@245['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@156['PrintStream'] {
-    parameters = ArrayList@246[empty]
-    supertypes = ArrayList@247[3] { LazyJavaClassifierType@248['FilterOutputStream'], LazyJavaClassifierType@249['Appendable'], LazyJavaClassifierType@250['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@160['RandomAccess'] {
-    parameters = ArrayList@251[empty]
-    supertypes = ArrayList@252[1] { JetTypeImpl@221['Any'] }
-}
-
-LazyJavaClassTypeConstructor@167['Serializable'] {
-    parameters = ArrayList@253[empty]
-    supertypes = ArrayList@254[1] { JetTypeImpl@221['Any'] }
-}
-
-LazyJavaClassTypeConstructor@169['StringBuffer'] {
-    parameters = ArrayList@255[empty]
-    supertypes = ArrayList@256[3] { LazyJavaClassifierType@257['AbstractStringBuilder'], LazyJavaClassifierType@258['Serializable'], LazyJavaClassifierType@259['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@189['StringBuilder'] {
-    parameters = ArrayList@260[empty]
-    supertypes = ArrayList@261[3] { LazyJavaClassifierType@262['AbstractStringBuilder'], LazyJavaClassifierType@263['Serializable'], LazyJavaClassifierType@264['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@200['System'] {
-    supertypes = ArrayList@265[1] { JetTypeImpl@221['Any'] }
-}
-
-LazyJavaClassifierType@208['AbstractCollection<E>'] {
-    arguments = ArrayList@266[1] { TypeProjectionImpl@267 }
-    classifier = JavaClassImpl@268['AbstractCollection']
-    memberScope = SubstitutingScope@269
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractCollection']
-}
-
-LazyJavaClassifierType@225['AbstractList<E>'] {
-    arguments = ArrayList@270[1] { TypeProjectionImpl@271 }
-    classifier = JavaClassImpl@272['AbstractList']
-    memberScope = SubstitutingScope@273
-    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
-}
-
-LazyJavaClassifierType@240['AbstractMap<K, V>'] {
-    arguments = ArrayList@274[2] { TypeProjectionImpl@275, TypeProjectionImpl@276 }
-    classifier = JavaClassImpl@277['AbstractMap']
-    memberScope = SubstitutingScope@278
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractMap']
-}
-
-LazyJavaClassifierType@262['AbstractStringBuilder'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@281['AbstractStringBuilder'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@285['AbstractStringBuilder'] {
-    arguments = ArrayList@286[empty]
-    classifier = JavaClassImpl@287['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@288['AbstractStringBuilder'] {
-    arguments = ArrayList@289[empty]
-    classifier = JavaClassImpl@290['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@291['AbstractStringBuilder'] {
-    arguments = ArrayList@292[empty]
-    classifier = JavaClassImpl@293['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@294['AbstractStringBuilder'] {
-    arguments = ArrayList@295[empty]
-    classifier = JavaClassImpl@296['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@297['AbstractStringBuilder'] {
-    arguments = ArrayList@298[empty]
-    classifier = JavaClassImpl@299['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@300['AbstractStringBuilder'] {
-    arguments = ArrayList@301[empty]
-    classifier = JavaClassImpl@302['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@303['AbstractStringBuilder'] {
-    arguments = ArrayList@304[empty]
-    classifier = JavaClassImpl@305['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@306['AbstractStringBuilder'] {
-    arguments = ArrayList@307[empty]
-    classifier = JavaClassImpl@308['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@309['AbstractStringBuilder'] {
-    arguments = ArrayList@310[empty]
-    classifier = JavaClassImpl@311['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@312['AbstractStringBuilder'] {
-    arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@314['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@315['AbstractStringBuilder'] {
-    arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@317['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@318['AbstractStringBuilder'] {
-    arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@320['AbstractStringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@321['AbstractStringBuilder'] {
-    arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@299['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@324['AbstractStringBuilder'] {
-    arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@305['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@326['AbstractStringBuilder'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@314['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@328['AbstractStringBuilder'] {
-    arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@296['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@330['AbstractStringBuilder'] {
-    arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@320['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@332['AbstractStringBuilder'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@283['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@334['AbstractStringBuilder'] {
-    arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@287['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@336['AbstractStringBuilder'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@317['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@338['AbstractStringBuilder'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@308['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@340['AbstractStringBuilder'] {
-    arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@302['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@342['AbstractStringBuilder'] {
-    arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@290['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@344['AbstractStringBuilder'] {
-    arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@311['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@346['AbstractStringBuilder'] {
-    arguments = ArrayList@347[empty]
-    classifier = JavaClassImpl@293['AbstractStringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@257['AbstractStringBuilder'] {
-    arguments = ArrayList@348[empty]
-    classifier = JavaClassImpl@349['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@249['Appendable'] {
-    arguments = ArrayList@350[empty]
-    classifier = JavaClassImpl@351['Appendable']
-    memberScope = LazyJavaClassMemberScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@217['Appendable'] {
-    arguments = ArrayList@352[empty]
-    classifier = JavaClassImpl@353['Appendable']
-    memberScope = LazyJavaClassMemberScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@354['Appendable'] {
-    arguments = ArrayList@355[empty]
-    classifier = JavaClassImpl@356['Appendable']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@357['Appendable'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@359['Appendable']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@360['Appendable'] {
-    arguments = ArrayList@361[empty]
-    classifier = JavaClassImpl@362['Appendable']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@363['Appendable'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@362['Appendable']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@365['Appendable'] {
-    arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@356['Appendable']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@367['Appendable'] {
-    arguments = ArrayList@368[empty]
-    classifier = JavaClassImpl@359['Appendable']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
-}
-
-LazyJavaClassifierType@232['AutoCloseable'] {
-    arguments = ArrayList@369[empty]
-    classifier = JavaClassImpl@370['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@103
-    typeConstructor = LazyJavaClassTypeConstructor@105['AutoCloseable']
-}
-
-LazyJavaClassifierType@264['CharSequence'] {
-    arguments = ArrayList@371[empty]
-    classifier = JavaClassImpl@372['CharSequence']
-    memberScope = DeserializedClassMemberScope@373
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@218['CharSequence'] {
-    arguments = ArrayList@375[empty]
-    classifier = JavaClassImpl@376['CharSequence']
-    memberScope = DeserializedClassMemberScope@373
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@377['CharSequence'] {
-    arguments = ArrayList@378[empty]
-    classifier = JavaClassImpl@379['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@380['CharSequence'] {
-    arguments = ArrayList@381[empty]
-    classifier = JavaClassImpl@382['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@383['CharSequence'] {
-    arguments = ArrayList@384[empty]
-    classifier = JavaClassImpl@385['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@386['CharSequence'] {
-    arguments = ArrayList@387[empty]
-    classifier = JavaClassImpl@388['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@389['CharSequence'] {
-    arguments = ArrayList@390[empty]
-    classifier = JavaClassImpl@391['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@392['CharSequence'] {
-    arguments = ArrayList@393[empty]
-    classifier = JavaClassImpl@394['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@395['CharSequence'] {
-    arguments = ArrayList@396[empty]
-    classifier = JavaClassImpl@397['CharSequence']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@398['CharSequence'] {
-    arguments = ArrayList@399[empty]
-    classifier = JavaClassImpl@385['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@400['CharSequence'] {
-    arguments = ArrayList@401[empty]
-    classifier = JavaClassImpl@397['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@402['CharSequence'] {
-    arguments = ArrayList@403[empty]
-    classifier = JavaClassImpl@382['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@404['CharSequence'] {
-    arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@388['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@406['CharSequence'] {
-    arguments = ArrayList@407[empty]
-    classifier = JavaClassImpl@391['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@408['CharSequence'] {
-    arguments = ArrayList@409[empty]
-    classifier = JavaClassImpl@379['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@410['CharSequence'] {
-    arguments = ArrayList@411[empty]
-    classifier = JavaClassImpl@394['CharSequence']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@259['CharSequence'] {
-    classifier = JavaClassImpl@412['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@374
-}
-
-LazyJavaClassifierType@413['Cloneable'] {
-    arguments = ArrayList@414[empty]
-    classifier = JavaClassImpl@415['Cloneable']
-    memberScope = DeserializedClassMemberScope@416
-    typeConstructor = DeserializedClassTypeConstructor@417
-}
-
-LazyJavaClassifierType@242['Cloneable'] {
-    arguments = ArrayList@418[empty]
-    classifier = JavaClassImpl@419['Cloneable']
-    memberScope = DeserializedClassMemberScope@416
-    typeConstructor = DeserializedClassTypeConstructor@417
-}
-
-LazyJavaClassifierType@250['Closeable'] {
-    arguments = ArrayList@420[empty]
-    classifier = JavaClassImpl@421['Closeable']
-    memberScope = LazyJavaClassMemberScope@107
-    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
-}
-
-LazyJavaClassifierType@245['Closeable'] {
-    arguments = ArrayList@422[empty]
-    classifier = JavaClassImpl@423['Closeable']
-    memberScope = LazyJavaClassMemberScope@107
-    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
-}
-
-LazyJavaClassifierType@424['Collection<? extends E>'] {
-    arguments = ArrayList@425[1] { TypeProjectionImpl@426 }
-    classifier = JavaClassImpl@427['Collection']
-    memberScope = SubstitutingScope@428
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@429
-}
-
-LazyJavaClassifierType@430['Collection<? extends E>'] {
-    arguments = ArrayList@431[1] { TypeProjectionImpl@432 }
-    classifier = JavaClassImpl@427['Collection']
-    memberScope = SubstitutingScope@433
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@204['Collection<E>'] {
-    arguments = ArrayList@435[1] { TypeProjectionImpl@436 }
-    classifier = JavaClassImpl@437['Collection']
-    memberScope = SubstitutingScope@438
-    typeConstructor = DeserializedClassTypeConstructor@429
-}
-
-LazyJavaClassifierType@439['E'] {
-    arguments = ArrayList@440[empty]
-    classifier = JavaTypeParameterImpl@441['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@443['E'] {
-    arguments = ArrayList@444[empty]
-    classifier = JavaTypeParameterImpl@445['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@447['E'] {
-    arguments = ArrayList@448[empty]
-    classifier = JavaTypeParameterImpl@449['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@450['E'] {
-    arguments = ArrayList@451[empty]
-    classifier = JavaTypeParameterImpl@452['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@454['E'] {
-    arguments = ArrayList@455[empty]
-    classifier = JavaTypeParameterImpl@456['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@457['E'] {
-    arguments = ArrayList@458[empty]
-    classifier = JavaTypeParameterImpl@459['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@460['E'] {
-    arguments = ArrayList@461[empty]
-    classifier = JavaTypeParameterImpl@462['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@463['E'] {
-    arguments = ArrayList@464[empty]
-    classifier = JavaTypeParameterImpl@465['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@466['E'] {
-    arguments = ArrayList@467[empty]
-    classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@469['E'] {
-    arguments = ArrayList@470[empty]
-    classifier = JavaTypeParameterImpl@471['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@472['E'] {
-    arguments = ArrayList@473[empty]
-    classifier = JavaTypeParameterImpl@474['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@475['E'] {
-    arguments = ArrayList@476[empty]
-    classifier = JavaTypeParameterImpl@477['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@478['E'] {
-    arguments = ArrayList@479[empty]
-    classifier = JavaTypeParameterImpl@480['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@481['E'] {
-    arguments = ArrayList@482[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@484['E'] {
-    arguments = ArrayList@485[empty]
-    classifier = JavaTypeParameterImpl@486['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@487['E'] {
-    arguments = ArrayList@488[empty]
-    classifier = JavaTypeParameterImpl@489['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@490['E'] {
-    arguments = ArrayList@491[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@493['E'] {
-    arguments = ArrayList@494[empty]
-    classifier = JavaTypeParameterImpl@495['E']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@496['E'] {
-    arguments = ArrayList@497[empty]
-    classifier = JavaTypeParameterImpl@465['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@498['E'] {
-    arguments = ArrayList@499[empty]
-    classifier = JavaTypeParameterImpl@441['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@500['E'] {
-    arguments = ArrayList@501[empty]
-    classifier = JavaTypeParameterImpl@495['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@502['E'] {
-    arguments = ArrayList@503[empty]
-    classifier = JavaTypeParameterImpl@459['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@504['E'] {
-    arguments = ArrayList@505[empty]
-    classifier = JavaTypeParameterImpl@471['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@506['E'] {
-    arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@462['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@508['E'] {
-    arguments = ArrayList@509[empty]
-    classifier = JavaTypeParameterImpl@449['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@510['E'] {
-    arguments = ArrayList@511[empty]
-    classifier = JavaTypeParameterImpl@486['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@512['E'] {
-    arguments = ArrayList@513[empty]
-    classifier = JavaTypeParameterImpl@480['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@514['E'] {
-    arguments = ArrayList@515[empty]
-    classifier = JavaTypeParameterImpl@452['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@516['E'] {
-    arguments = ArrayList@517[empty]
-    classifier = JavaTypeParameterImpl@489['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-}
-
-LazyJavaClassifierType@518['E'] {
-    arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@456['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@520['E'] {
-    arguments = ArrayList@521[empty]
-    classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@522['E'] {
-    arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@477['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@524['E'] {
-    arguments = ArrayList@525[empty]
-    classifier = JavaTypeParameterImpl@445['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@526['E'] {
-    arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@474['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@528['E'] {
-    arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@530['E'] {
-    arguments = ArrayList@531[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-}
-
-LazyJavaClassifierType@248['FilterOutputStream'] {
-    arguments = ArrayList@532[empty]
-    classifier = JavaClassImpl@533['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@111
-    typeConstructor = LazyJavaClassTypeConstructor@113['FilterOutputStream']
-}
-
-LazyJavaClassifierType@534['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@535
-}
-
-LazyJavaClassifierType@536['Iterator<E>'] {
-    arguments = ArrayList@537[1] { TypeProjectionImpl@538 }
-    classifier = JavaClassImpl@539['Iterator']
-    memberScope = SubstitutingScope@540
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@541
-}
-
-LazyJavaClassifierType@542['Iterator<E>'] {
-    arguments = ArrayList@543[1] { TypeProjectionImpl@544 }
-    classifier = JavaClassImpl@545['Iterator']
-    memberScope = SubstitutingScope@546
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@541
-}
-
-LazyJavaClassifierType@547['Iterator<E>'] {
-    arguments = ArrayList@548[1] { TypeProjectionImpl@549 }
-    classifier = JavaClassImpl@550['Iterator']
-    memberScope = SubstitutingScope@551
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@541
-}
-
-LazyJavaClassifierType@552['Iterator<E>'] {
-    arguments = ArrayList@553[1] { TypeProjectionImpl@554 }
-    classifier = JavaClassImpl@545['Iterator']
-    memberScope = SubstitutingScope@555
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@556
-}
-
-LazyJavaClassifierType@557['Iterator<E>'] {
-    arguments = ArrayList@558[1] { TypeProjectionImpl@559 }
-    classifier = JavaClassImpl@539['Iterator']
-    memberScope = SubstitutingScope@560
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@556
-}
-
-LazyJavaClassifierType@561['Iterator<E>'] {
-    arguments = ArrayList@562[1] { TypeProjectionImpl@563 }
-    classifier = JavaClassImpl@550['Iterator']
-    memberScope = SubstitutingScope@564
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@556
-}
-
-LazyJavaClassifierType@565['K'] {
-    arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@567['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@569['K'] {
-    arguments = ArrayList@570[empty]
-    classifier = JavaTypeParameterImpl@571['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@573['K'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@575['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@576['K'] {
-    arguments = ArrayList@577[empty]
-    classifier = JavaTypeParameterImpl@578['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@579['K'] {
-    arguments = ArrayList@580[empty]
-    classifier = JavaTypeParameterImpl@581['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@582['K'] {
-    arguments = ArrayList@583[empty]
-    classifier = JavaTypeParameterImpl@584['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@585['K'] {
-    arguments = ArrayList@586[empty]
-    classifier = JavaTypeParameterImpl@587['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@588['K'] {
-    arguments = ArrayList@589[empty]
-    classifier = JavaTypeParameterImpl@590['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@591['K'] {
-    arguments = ArrayList@592[empty]
-    classifier = JavaTypeParameterImpl@593['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@594['K'] {
-    arguments = ArrayList@595[empty]
-    classifier = JavaTypeParameterImpl@596['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@597['K'] {
-    arguments = ArrayList@598[empty]
-    classifier = JavaTypeParameterImpl@599['K']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@600['K'] {
-    arguments = ArrayList@601[empty]
-    classifier = JavaTypeParameterImpl@567['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@602['K'] {
-    arguments = ArrayList@603[empty]
-    classifier = JavaTypeParameterImpl@584['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@604['K'] {
-    arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@599['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@606['K'] {
-    arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@593['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@608['K'] {
-    arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@587['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@610['K'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@578['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@612['K'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@590['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@614['K'] {
-    arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@571['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@616['K'] {
-    arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@596['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-}
-
-LazyJavaClassifierType@618['K'] {
-    arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@575['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@620['K'] {
-    arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@581['K']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-}
-
-LazyJavaClassifierType@226['List<E>'] {
-    arguments = ArrayList@622[1] { TypeProjectionImpl@623 }
-    classifier = JavaClassImpl@624['List']
-    memberScope = SubstitutingScope@625
-    typeConstructor = DeserializedClassTypeConstructor@626
-}
-
-LazyJavaClassifierType@209['List<E>'] {
-    arguments = ArrayList@627[1] { TypeProjectionImpl@628 }
-    classifier = JavaClassImpl@629['List']
-    memberScope = SubstitutingScope@630
-    typeConstructor = DeserializedClassTypeConstructor@626
-}
-
-LazyJavaClassifierType@631['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@632[2] { TypeProjectionImpl@633, TypeProjectionImpl@634 }
-    classifier = JavaClassImpl@635['Map']
-    memberScope = SubstitutingScope@636
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@637
-}
-
-LazyJavaClassifierType@638['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@639[2] { TypeProjectionImpl@640, TypeProjectionImpl@641 }
-    classifier = JavaClassImpl@635['Map']
-    memberScope = SubstitutingScope@642
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@643
-}
-
-LazyJavaClassifierType@214['Map<K, V>'] {
-    arguments = ArrayList@644[2] { TypeProjectionImpl@645, TypeProjectionImpl@646 }
-    classifier = JavaClassImpl@647['Map']
-    memberScope = SubstitutingScope@648
-    typeConstructor = DeserializedClassTypeConstructor@637
-}
-
-LazyJavaClassifierType@241['Map<K, V>'] {
-    arguments = ArrayList@649[2] { TypeProjectionImpl@650, TypeProjectionImpl@651 }
-    classifier = JavaClassImpl@652['Map']
-    memberScope = SubstitutingScope@653
-    typeConstructor = DeserializedClassTypeConstructor@637
-}
-
-LazyJavaClassifierType@654['Object'] {
-    arguments = ArrayList@655[empty]
-    classifier = JavaClassImpl@656['Object']
-    memberScope = DeserializedClassMemberScope@657
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@659['Object'] {
-    arguments = ArrayList@660[empty]
-    classifier = JavaClassImpl@661['Object']
-    memberScope = DeserializedClassMemberScope@657
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@662['Object'] {
-    arguments = ArrayList@663[empty]
-    classifier = JavaClassImpl@656['Object']
-    memberScope = DeserializedClassMemberScope@657
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@664['Object'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaClassImpl@661['Object']
-    memberScope = DeserializedClassMemberScope@657
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@666['Object'] {
-    arguments = ArrayList@667[empty]
-    classifier = JavaClassImpl@668['Object']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@669['Object'] {
-    arguments = ArrayList@670[empty]
-    classifier = JavaClassImpl@671['Object']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@672['Object'] {
-    arguments = ArrayList@673[empty]
-    classifier = JavaClassImpl@674['Object']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@675['Object'] {
-    arguments = ArrayList@676[empty]
-    classifier = JavaClassImpl@677['Object']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@678['Object'] {
-    arguments = ArrayList@679[empty]
-    classifier = JavaClassImpl@671['Object']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@680['Object'] {
-    arguments = ArrayList@681[empty]
-    classifier = JavaClassImpl@677['Object']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@682['Object'] {
-    arguments = ArrayList@683[empty]
-    classifier = JavaClassImpl@674['Object']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@684['Object'] {
-    arguments = ArrayList@685[empty]
-    classifier = JavaClassImpl@668['Object']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@686['Object'] {
-    classifier = JavaClassImpl@687['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@688['Object'] {
-    classifier = JavaClassImpl@689['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@690['Object'] {
-    classifier = JavaClassImpl@691['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@692['Object'] {
-    classifier = JavaClassImpl@693['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@694['Object'] {
-    classifier = JavaClassImpl@695['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@696['Object'] {
-    classifier = JavaClassImpl@697['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@698['Object'] {
-    classifier = JavaClassImpl@699['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@700['Object'] {
-    classifier = JavaClassImpl@701['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@702['Object'] {
-    classifier = JavaClassImpl@703['Object']
-    typeConstructor = DeserializedClassTypeConstructor@658
-}
-
-LazyJavaClassifierType@235['OutputStream'] {
-    arguments = ArrayList@704[empty]
-    classifier = JavaClassImpl@705['OutputStream']
-    memberScope = LazyJavaClassMemberScope@136
-    typeConstructor = LazyJavaClassTypeConstructor@138['OutputStream']
-}
-
-LazyJavaClassifierType@706['PrintStream'] {
-    arguments = ArrayList@707[empty]
-    classifier = JavaClassImpl@708['PrintStream']
-    memberScope = LazyJavaClassMemberScope@142
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
-}
-
-LazyJavaClassifierType@709['PrintStream'] {
-    arguments = ArrayList@710[empty]
-    classifier = JavaClassImpl@708['PrintStream']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
-}
-
-LazyJavaClassifierType@227['RandomAccess'] {
-    arguments = ArrayList@711[empty]
-    classifier = JavaClassImpl@712['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@158
-    typeConstructor = LazyJavaClassTypeConstructor@160['RandomAccess']
-}
-
-LazyJavaClassifierType@713['Serializable'] {
-    arguments = ArrayList@714[empty]
-    classifier = JavaClassImpl@715['Serializable']
-    memberScope = LazyJavaClassMemberScope@163
-    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
-}
-
-LazyJavaClassifierType@716['Serializable'] {
-    arguments = ArrayList@717[empty]
-    classifier = JavaClassImpl@718['Serializable']
-    memberScope = LazyJavaClassMemberScope@163
-    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
-}
-
-LazyJavaClassifierType@263['Serializable'] {
-    arguments = ArrayList@719[empty]
-    classifier = JavaClassImpl@720['Serializable']
-    memberScope = LazyJavaClassMemberScope@163
-    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
-}
-
-LazyJavaClassifierType@258['Serializable'] {
-    classifier = JavaClassImpl@721['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
-}
-
-LazyJavaClassifierType@722['Set<K>'] {
-    arguments = ArrayList@723[1] { TypeProjectionImpl@724 }
-    classifier = JavaClassImpl@725['Set']
-    memberScope = SubstitutingScope@726
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@727
-}
-
-LazyJavaClassifierType@728['Set<K>'] {
-    arguments = ArrayList@729[1] { TypeProjectionImpl@730 }
-    classifier = JavaClassImpl@731['Set']
-    memberScope = SubstitutingScope@732
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@727
-}
-
-LazyJavaClassifierType@733['Set<K>'] {
-    arguments = ArrayList@734[1] { TypeProjectionImpl@735 }
-    classifier = JavaClassImpl@731['Set']
-    memberScope = SubstitutingScope@736
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@737
-}
-
-LazyJavaClassifierType@738['Set<K>'] {
-    arguments = ArrayList@739[1] { TypeProjectionImpl@740 }
-    classifier = JavaClassImpl@725['Set']
-    memberScope = SubstitutingScope@741
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@737
-}
-
-LazyJavaClassifierType@742['String'] {
-    arguments = ArrayList@743[empty]
-    classifier = JavaClassImpl@744['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@746['String'] {
-    arguments = ArrayList@747[empty]
-    classifier = JavaClassImpl@748['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@749['String'] {
-    arguments = ArrayList@750[empty]
-    classifier = JavaClassImpl@751['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@752['String'] {
-    arguments = ArrayList@753[empty]
-    classifier = JavaClassImpl@754['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@755['String'] {
-    arguments = ArrayList@756[empty]
-    classifier = JavaClassImpl@757['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@758['String'] {
-    arguments = ArrayList@759[empty]
-    classifier = JavaClassImpl@760['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@761['String'] {
-    arguments = ArrayList@762[empty]
-    classifier = JavaClassImpl@763['String']
-    nullable = 'false': Boolean@284
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@764['String'] {
-    arguments = ArrayList@765[empty]
-    classifier = JavaClassImpl@763['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@766['String'] {
-    arguments = ArrayList@767[empty]
-    classifier = JavaClassImpl@744['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@768['String'] {
-    arguments = ArrayList@769[empty]
-    classifier = JavaClassImpl@760['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@770['String'] {
-    arguments = ArrayList@771[empty]
-    classifier = JavaClassImpl@748['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@772['String'] {
-    arguments = ArrayList@773[empty]
-    classifier = JavaClassImpl@751['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@774['String'] {
-    arguments = ArrayList@775[empty]
-    classifier = JavaClassImpl@757['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@776['String'] {
-    arguments = ArrayList@777[empty]
-    classifier = JavaClassImpl@754['String']
-    nullable = 'true': Boolean@323
-    typeConstructor = DeserializedClassTypeConstructor@745
-}
-
-LazyJavaClassifierType@778['StringBuffer'] {
-    arguments = ArrayList@779[empty]
-    classifier = JavaClassImpl@780['StringBuffer']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
-}
-
-LazyJavaClassifierType@781['StringBuffer'] {
-    arguments = ArrayList@782[empty]
-    classifier = JavaClassImpl@783['StringBuffer']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
-}
-
-LazyJavaClassifierType@784['StringBuffer'] {
-    arguments = ArrayList@785[empty]
-    classifier = JavaClassImpl@780['StringBuffer']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
-}
-
-LazyJavaClassifierType@786['StringBuffer'] {
-    arguments = ArrayList@787[empty]
-    classifier = JavaClassImpl@783['StringBuffer']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
-}
-
-LazyJavaClassifierType@788['StringBuilder'] {
-    arguments = ArrayList@789[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@791['StringBuilder'] {
-    arguments = ArrayList@792[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@794['StringBuilder'] {
-    arguments = ArrayList@795[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@797['StringBuilder'] {
-    arguments = ArrayList@798[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@800['StringBuilder'] {
-    arguments = ArrayList@801[empty]
-    classifier = JavaClassImpl@802['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@803['StringBuilder'] {
-    arguments = ArrayList@804[empty]
-    classifier = JavaClassImpl@805['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@806['StringBuilder'] {
-    arguments = ArrayList@807[empty]
-    classifier = JavaClassImpl@808['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@809['StringBuilder'] {
-    arguments = ArrayList@810[empty]
-    classifier = JavaClassImpl@811['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@812['StringBuilder'] {
-    arguments = ArrayList@813[empty]
-    classifier = JavaClassImpl@814['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@815['StringBuilder'] {
-    arguments = ArrayList@816[empty]
-    classifier = JavaClassImpl@817['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@818['StringBuilder'] {
-    arguments = ArrayList@819[empty]
-    classifier = JavaClassImpl@820['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@821['StringBuilder'] {
-    arguments = ArrayList@822[empty]
-    classifier = JavaClassImpl@823['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@824['StringBuilder'] {
-    arguments = ArrayList@825[empty]
-    classifier = JavaClassImpl@826['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@827['StringBuilder'] {
-    arguments = ArrayList@828[empty]
-    classifier = JavaClassImpl@829['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@830['StringBuilder'] {
-    arguments = ArrayList@831[empty]
-    classifier = JavaClassImpl@832['StringBuilder']
-    nullable = 'false': Boolean@284
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@833['StringBuilder'] {
-    arguments = ArrayList@834[empty]
-    classifier = JavaClassImpl@829['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@835['StringBuilder'] {
-    arguments = ArrayList@836[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@837['StringBuilder'] {
-    arguments = ArrayList@838[empty]
-    classifier = JavaClassImpl@805['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@839['StringBuilder'] {
-    arguments = ArrayList@840[empty]
-    classifier = JavaClassImpl@832['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@841['StringBuilder'] {
-    arguments = ArrayList@842[empty]
-    classifier = JavaClassImpl@811['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@843['StringBuilder'] {
-    arguments = ArrayList@844[empty]
-    classifier = JavaClassImpl@802['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@845['StringBuilder'] {
-    arguments = ArrayList@846[empty]
-    classifier = JavaClassImpl@808['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@847['StringBuilder'] {
-    arguments = ArrayList@848[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@849['StringBuilder'] {
-    arguments = ArrayList@850[empty]
-    classifier = JavaClassImpl@817['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@851['StringBuilder'] {
-    arguments = ArrayList@852[empty]
-    classifier = JavaClassImpl@814['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@853['StringBuilder'] {
-    arguments = ArrayList@854[empty]
-    classifier = JavaClassImpl@820['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@855['StringBuilder'] {
-    arguments = ArrayList@856[empty]
-    classifier = JavaClassImpl@823['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@857['StringBuilder'] {
-    arguments = ArrayList@858[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@859['StringBuilder'] {
-    arguments = ArrayList@860[empty]
-    classifier = JavaClassImpl@826['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@861['StringBuilder'] {
-    arguments = ArrayList@862[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
-    nullable = 'true': Boolean@323
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
-}
-
-LazyJavaClassifierType@863['V'] {
-    arguments = ArrayList@864[empty]
-    classifier = JavaTypeParameterImpl@865['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@867['V'] {
-    arguments = ArrayList@868[empty]
-    classifier = JavaTypeParameterImpl@869['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@871['V'] {
-    arguments = ArrayList@872[empty]
-    classifier = JavaTypeParameterImpl@873['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@874['V'] {
-    arguments = ArrayList@875[empty]
-    classifier = JavaTypeParameterImpl@876['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@877['V'] {
-    arguments = ArrayList@878[empty]
-    classifier = JavaTypeParameterImpl@879['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@880['V'] {
-    arguments = ArrayList@881[empty]
-    classifier = JavaTypeParameterImpl@882['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@883['V'] {
-    arguments = ArrayList@884[empty]
-    classifier = JavaTypeParameterImpl@885['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@886['V'] {
-    arguments = ArrayList@887[empty]
-    classifier = JavaTypeParameterImpl@888['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@889['V'] {
-    arguments = ArrayList@890[empty]
-    classifier = JavaTypeParameterImpl@891['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@892['V'] {
-    arguments = ArrayList@893[empty]
-    classifier = JavaTypeParameterImpl@894['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@895['V'] {
-    arguments = ArrayList@896[empty]
-    classifier = JavaTypeParameterImpl@897['V']
-    nullable = 'false': Boolean@284
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@898['V'] {
-    arguments = ArrayList@899[empty]
-    classifier = JavaTypeParameterImpl@897['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@900['V'] {
-    arguments = ArrayList@901[empty]
-    classifier = JavaTypeParameterImpl@894['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@902['V'] {
-    arguments = ArrayList@903[empty]
-    classifier = JavaTypeParameterImpl@865['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@904['V'] {
-    arguments = ArrayList@905[empty]
-    classifier = JavaTypeParameterImpl@882['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@906['V'] {
-    arguments = ArrayList@907[empty]
-    classifier = JavaTypeParameterImpl@888['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@908['V'] {
-    arguments = ArrayList@909[empty]
-    classifier = JavaTypeParameterImpl@891['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@910['V'] {
-    arguments = ArrayList@911[empty]
-    classifier = JavaTypeParameterImpl@869['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@912['V'] {
-    arguments = ArrayList@913[empty]
-    classifier = JavaTypeParameterImpl@876['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@914['V'] {
-    arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@885['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaClassifierType@916['V'] {
-    arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@873['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-}
-
-LazyJavaClassifierType@918['V'] {
-    arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@879['V']
-    nullable = 'true': Boolean@323
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-}
-
-LazyJavaPackageFragmentProvider@920 {
-    packageFragments('<root>': FqName@921) = LazyJavaPackageFragment@922['<root>']
-    packageFragments('A': FqName@923) = null
-    packageFragments('Any': FqName@924) = null
-    packageFragments('Array': FqName@925) = null
-    packageFragments('B': FqName@926) = null
-    packageFragments('Body': FqName@927) = null
-    packageFragments('BodyTag': FqName@928) = null
-    packageFragments('Element': FqName@929) = null
-    packageFragments('H1': FqName@930) = null
-    packageFragments('HTML': FqName@931) = null
-    packageFragments('Head': FqName@932) = null
-    packageFragments('K': FqName@933) = null
-    packageFragments('LI': FqName@934) = null
-    packageFragments('MutableMap': FqName@935) = null
-    packageFragments('P': FqName@936) = null
-    packageFragments('String': FqName@937) = null
-    packageFragments('StringBuilder': FqName@938) = null
-    packageFragments('System': FqName@939) = null
-    packageFragments('T': FqName@940) = null
-    packageFragments('Tag': FqName@941) = null
-    packageFragments('TagWithText': FqName@942) = null
-    packageFragments('Title': FqName@943) = null
-    packageFragments('UL': FqName@944) = null
-    packageFragments('Unit': FqName@945) = null
-    packageFragments('V': FqName@946) = null
-    packageFragments('html': FqName@947) = null
-    packageFragments('html.A': FqName@948) = null
-    packageFragments('html.Any': FqName@949) = null
-    packageFragments('html.Array': FqName@950) = null
-    packageFragments('html.B': FqName@951) = null
-    packageFragments('html.Body': FqName@952) = null
-    packageFragments('html.BodyTag': FqName@953) = null
-    packageFragments('html.Element': FqName@954) = null
-    packageFragments('html.H1': FqName@955) = null
-    packageFragments('html.HTML': FqName@956) = null
-    packageFragments('html.Head': FqName@957) = null
-    packageFragments('html.K': FqName@958) = null
-    packageFragments('html.LI': FqName@959) = null
-    packageFragments('html.MutableMap': FqName@960) = null
-    packageFragments('html.P': FqName@961) = null
-    packageFragments('html.String': FqName@962) = null
-    packageFragments('html.StringBuilder': FqName@963) = null
-    packageFragments('html.System': FqName@964) = null
-    packageFragments('html.T': FqName@965) = null
-    packageFragments('html.Tag': FqName@966) = null
-    packageFragments('html.TagWithText': FqName@967) = null
-    packageFragments('html.TextElement': FqName@968) = null
-    packageFragments('html.Title': FqName@969) = null
-    packageFragments('html.UL': FqName@970) = null
-    packageFragments('html.Unit': FqName@971) = null
-    packageFragments('html.V': FqName@972) = null
-    packageFragments('java': FqName@973) = LazyJavaPackageFragment@974['java']
-    packageFragments('java.io': FqName@975) = LazyJavaPackageFragment@976['io']
-    packageFragments('java.lang': FqName@977) = LazyJavaPackageFragment@978['lang']
-    packageFragments('java.lang.A': FqName@979) = null
-    packageFragments('java.lang.Any': FqName@980) = null
-    packageFragments('java.lang.Array': FqName@981) = null
-    packageFragments('java.lang.B': FqName@982) = null
-    packageFragments('java.lang.Body': FqName@983) = null
-    packageFragments('java.lang.BodyTag': FqName@984) = null
-    packageFragments('java.lang.Element': FqName@985) = null
-    packageFragments('java.lang.H1': FqName@986) = null
-    packageFragments('java.lang.HTML': FqName@987) = null
-    packageFragments('java.lang.Head': FqName@988) = null
-    packageFragments('java.lang.K': FqName@989) = null
-    packageFragments('java.lang.LI': FqName@990) = null
-    packageFragments('java.lang.MutableMap': FqName@991) = null
-    packageFragments('java.lang.P': FqName@992) = null
-    packageFragments('java.lang.String': FqName@993) = null
-    packageFragments('java.lang.StringBuilder': FqName@994) = null
-    packageFragments('java.lang.System': FqName@995) = null
-    packageFragments('java.lang.T': FqName@996) = null
-    packageFragments('java.lang.Tag': FqName@997) = null
-    packageFragments('java.lang.TagWithText': FqName@998) = null
-    packageFragments('java.lang.Title': FqName@999) = null
-    packageFragments('java.lang.UL': FqName@1000) = null
-    packageFragments('java.lang.Unit': FqName@1001) = null
-    packageFragments('java.lang.V': FqName@1002) = null
-    packageFragments('java.util': FqName@1003) = LazyJavaPackageFragment@1004['util']
-    packageFragments('java.util.A': FqName@1005) = null
-    packageFragments('java.util.Any': FqName@1006) = null
-    packageFragments('java.util.Array': FqName@1007) = null
-    packageFragments('java.util.B': FqName@1008) = null
-    packageFragments('java.util.Body': FqName@1009) = null
-    packageFragments('java.util.BodyTag': FqName@1010) = null
-    packageFragments('java.util.Element': FqName@1011) = null
-    packageFragments('java.util.H1': FqName@1012) = null
-    packageFragments('java.util.HTML': FqName@1013) = null
-    packageFragments('java.util.Head': FqName@1014) = null
-    packageFragments('java.util.K': FqName@1015) = null
-    packageFragments('java.util.LI': FqName@1016) = null
-    packageFragments('java.util.MutableMap': FqName@1017) = null
-    packageFragments('java.util.P': FqName@1018) = null
-    packageFragments('java.util.String': FqName@1019) = null
-    packageFragments('java.util.StringBuilder': FqName@1020) = null
-    packageFragments('java.util.System': FqName@1021) = null
-    packageFragments('java.util.T': FqName@1022) = null
-    packageFragments('java.util.Tag': FqName@1023) = null
-    packageFragments('java.util.TagWithText': FqName@1024) = null
-    packageFragments('java.util.Title': FqName@1025) = null
-    packageFragments('java.util.UL': FqName@1026) = null
-    packageFragments('java.util.Unit': FqName@1027) = null
-    packageFragments('java.util.V': FqName@1028) = null
-    packageFragments('kotlin': FqName@1029) = null
-    packageFragments('kotlin.A': FqName@1030) = null
-    packageFragments('kotlin.Any': FqName@1031) = null
-    packageFragments('kotlin.Array': FqName@1032) = null
-    packageFragments('kotlin.B': FqName@1033) = null
-    packageFragments('kotlin.Body': FqName@1034) = null
-    packageFragments('kotlin.BodyTag': FqName@1035) = null
-    packageFragments('kotlin.Element': FqName@1036) = null
-    packageFragments('kotlin.H1': FqName@1037) = null
-    packageFragments('kotlin.HTML': FqName@1038) = null
-    packageFragments('kotlin.Head': FqName@1039) = null
-    packageFragments('kotlin.K': FqName@1040) = null
-    packageFragments('kotlin.LI': FqName@1041) = null
-    packageFragments('kotlin.MutableMap': FqName@1042) = null
-    packageFragments('kotlin.P': FqName@1043) = null
-    packageFragments('kotlin.String': FqName@1044) = null
-    packageFragments('kotlin.StringBuilder': FqName@1045) = null
-    packageFragments('kotlin.System': FqName@1046) = null
-    packageFragments('kotlin.T': FqName@1047) = null
-    packageFragments('kotlin.Tag': FqName@1048) = null
-    packageFragments('kotlin.TagWithText': FqName@1049) = null
-    packageFragments('kotlin.Title': FqName@1050) = null
-    packageFragments('kotlin.UL': FqName@1051) = null
-    packageFragments('kotlin.Unit': FqName@1052) = null
-    packageFragments('kotlin.V': FqName@1053) = null
-    packageFragments('kotlin.io': FqName@1054) = null
-    packageFragments('kotlin.jvm': FqName@1055) = null
-    topLevelClasses(JavaClassImpl@268['AbstractCollection']) = LazyJavaClassDescriptor@12['AbstractCollection']
-    topLevelClasses(JavaClassImpl@272['AbstractList']) = LazyJavaClassDescriptor@24['AbstractList']
-    topLevelClasses(JavaClassImpl@277['AbstractMap']) = LazyJavaClassDescriptor@37['AbstractMap']
-    topLevelClasses(JavaClassImpl@280['AbstractStringBuilder']) = LazyJavaClassDescriptor@52['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@351['Appendable']) = LazyJavaClassDescriptor@66['Appendable']
-    topLevelClasses(JavaClassImpl@1056['ArrayList']) = LazyJavaClassDescriptor@83['ArrayList']
-    topLevelClasses(JavaClassImpl@370['AutoCloseable']) = LazyJavaClassDescriptor@102['AutoCloseable']
-    topLevelClasses(JavaClassImpl@421['Closeable']) = LazyJavaClassDescriptor@106['Closeable']
-    topLevelClasses(JavaClassImpl@533['FilterOutputStream']) = LazyJavaClassDescriptor@110['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@1057['HashMap']) = LazyJavaClassDescriptor@114['HashMap']
-    topLevelClasses(JavaClassImpl@705['OutputStream']) = LazyJavaClassDescriptor@135['OutputStream']
-    topLevelClasses(JavaClassImpl@708['PrintStream']) = LazyJavaClassDescriptor@139['PrintStream']
-    topLevelClasses(JavaClassImpl@712['RandomAccess']) = LazyJavaClassDescriptor@157['RandomAccess']
-    topLevelClasses(JavaClassImpl@718['Serializable']) = LazyJavaClassDescriptor@161['Serializable']
-    topLevelClasses(JavaClassImpl@780['StringBuffer']) = LazyJavaClassDescriptor@168['StringBuffer']
-    topLevelClasses(JavaClassImpl@1058['StringBuilder']) = LazyJavaClassDescriptor@170['StringBuilder']
-    topLevelClasses(JavaClassImpl@1059['System']) = LazyJavaClassDescriptor@190['System']
-}
-
-LazyJavaPackageFragment@974['java'] {
-    classes('lang': Name@1060) = null // through LazyPackageFragmentScopeForJavaPackage@1061
-    classes('util': Name@1062) = null // through LazyPackageFragmentScopeForJavaPackage@1061
-    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1061
-    functions('lang': Name@1064) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1061
-    functions('util': Name@1065) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1061
-    memberIndex = computeMemberIndex$1@1066 // through LazyPackageFragmentScopeForJavaPackage@1061
-}
-
-LazyJavaPackageFragment@978['lang'] {
-    classes('A': Name@1067) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('ArrayList': Name@1069) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('B': Name@1070) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('Body': Name@1071) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('H1': Name@1072) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('HTML': Name@1073) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('HashMap': Name@1074) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('Head': Name@1075) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('LI': Name@1076) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('P': Name@1077) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('StringBuilder': Name@1078) = LazyJavaClassDescriptor@170['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('System': Name@1079) = LazyJavaClassDescriptor@190['System'] // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('TextElement': Name@1080) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('Title': Name@1081) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('UL': Name@1082) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('a': Name@1083) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('attributes': Name@1084) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('b': Name@1085) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('body': Name@1086) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('children': Name@1087) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('equals': Name@1088) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('h1': Name@1089) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('head': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('html': Name@1091) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('init': Name@1092) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('initTag': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('invoke': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('li': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('name': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('p': Name@1097) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('println': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('render': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('renderAttributes': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('text': Name@1101) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('title': Name@1102) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    classes('ul': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1068
-    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('A': Name@1067) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('ArrayList': Name@1069) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('B': Name@1070) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('Body': Name@1071) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('H1': Name@1072) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('HTML': Name@1073) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('HashMap': Name@1074) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('Head': Name@1075) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('LI': Name@1076) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('P': Name@1077) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('StringBuilder': Name@1104) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('TextElement': Name@1080) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('Title': Name@1081) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('UL': Name@1082) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('a': Name@1083) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('b': Name@1085) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('body': Name@1086) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('equals': Name@1088) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('h1': Name@1089) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('head': Name@1090) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('html': Name@1091) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('init': Name@1092) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('initTag': Name@1093) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('invoke': Name@1094) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('li': Name@1095) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('p': Name@1097) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('println': Name@1098) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('render': Name@1099) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('renderAttributes': Name@1100) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('title': Name@1102) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    functions('ul': Name@1103) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
-    memberIndex = computeMemberIndex$1@1105 // through LazyPackageFragmentScopeForJavaPackage@1068
-}
-
-LazyJavaPackageFragment@1004['util'] {
-    classes('A': Name@1067) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Any': Name@1107) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Array': Name@1108) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('ArrayList': Name@1069) = LazyJavaClassDescriptor@83['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('B': Name@1070) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Body': Name@1071) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('H1': Name@1072) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('HTML': Name@1073) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('HashMap': Name@1074) = LazyJavaClassDescriptor@114['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Head': Name@1075) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('LI': Name@1076) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('MutableMap': Name@1109) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('P': Name@1077) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('String': Name@1110) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('StringBuilder': Name@1078) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('System': Name@1079) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('TextElement': Name@1080) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Title': Name@1081) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('UL': Name@1082) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('Unit': Name@1111) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('a': Name@1083) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('attributes': Name@1084) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('b': Name@1085) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('body': Name@1086) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('children': Name@1087) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('equals': Name@1088) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('h1': Name@1089) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('head': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('html': Name@1091) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('init': Name@1092) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('initTag': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('invoke': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('li': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('name': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('p': Name@1097) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('println': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('render': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('renderAttributes': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('text': Name@1101) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('title': Name@1102) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    classes('ul': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1106
-    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('A': Name@1067) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('ArrayList': Name@1069) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('B': Name@1070) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('Body': Name@1071) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('H1': Name@1072) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('HTML': Name@1073) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('HashMap': Name@1074) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('Head': Name@1075) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('LI': Name@1076) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('P': Name@1077) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('StringBuilder': Name@1104) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('TextElement': Name@1080) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('Title': Name@1081) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('UL': Name@1082) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('a': Name@1083) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('b': Name@1085) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('body': Name@1086) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('equals': Name@1088) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('h1': Name@1089) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('head': Name@1090) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('html': Name@1091) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('init': Name@1092) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('initTag': Name@1093) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('invoke': Name@1094) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('li': Name@1095) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('p': Name@1097) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('println': Name@1098) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('render': Name@1099) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('renderAttributes': Name@1100) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('title': Name@1102) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    functions('ul': Name@1103) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
-    memberIndex = computeMemberIndex$1@1112 // through LazyPackageFragmentScopeForJavaPackage@1106
-}
-
-LazyJavaTypeParameterDescriptor@223['E'] {
-    defaultType = JetTypeImpl@1113['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-    upperBounds = LinkedHashSet@1114[1] { NullableType@1115 }
-    upperBoundsAsType = NullableType@1115
-}
-
-LazyJavaTypeParameterDescriptor@202['E'] {
-    defaultType = JetTypeImpl@1116['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@453
-    upperBounds = LinkedHashSet@1117[1] { NullableType@1118 }
-    upperBoundsAsType = NullableType@1118
-}
-
-LazyJavaTypeParameterDescriptor@206['E'] {
-    defaultType = JetTypeImpl@1119['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
-    upperBounds = LinkedHashSet@1120[1] { NullableType@1121 }
-    upperBoundsAsType = NullableType@1121
-}
-
-LazyJavaTypeParameterDescriptor@237['K'] {
-    defaultType = JetTypeImpl@1122['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
-    upperBounds = LinkedHashSet@1123[1] { NullableType@1124 }
-    upperBoundsAsType = NullableType@1124
-}
-
-LazyJavaTypeParameterDescriptor@211['K'] {
-    defaultType = JetTypeImpl@1125['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-    upperBounds = LinkedHashSet@1126[1] { NullableType@1127 }
-    upperBoundsAsType = NullableType@1127
-}
-
-LazyJavaTypeParameterDescriptor@212['V'] {
-    defaultType = JetTypeImpl@1128['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
-    upperBounds = LinkedHashSet@1129[1] { NullableType@1130 }
-    upperBoundsAsType = NullableType@1130
-}
-
-LazyJavaTypeParameterDescriptor@238['V'] {
-    defaultType = JetTypeImpl@1131['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
-    upperBounds = LinkedHashSet@1132[1] { NullableType@1133 }
-    upperBoundsAsType = NullableType@1133
-}
-
-LazyJavaTypeParameterResolver@1134 {
-    resolve(JavaTypeParameterImpl@1135['E']) = LazyJavaTypeParameterDescriptor@206['E']
-}
-
-LazyJavaTypeParameterResolver@1136 {
-    resolve(JavaTypeParameterImpl@1137['E']) = LazyJavaTypeParameterDescriptor@202['E']
-}
-
-LazyJavaTypeParameterResolver@1138 {
-    resolve(JavaTypeParameterImpl@1139['E']) = LazyJavaTypeParameterDescriptor@223['E']
-}
-
-LazyJavaTypeParameterResolver@1140 {
-    resolve(JavaTypeParameterImpl@462['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1141 {
-    resolve(JavaTypeParameterImpl@474['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1142 {
-    resolve(JavaTypeParameterImpl@489['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1143 {
-    resolve(JavaTypeParameterImpl@449['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1144 {
-    resolve(JavaTypeParameterImpl@471['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1145 {
-    resolve(JavaTypeParameterImpl@492['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1146 {
-    resolve(JavaTypeParameterImpl@459['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1147 {
-    resolve(JavaTypeParameterImpl@445['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1148 {
-    resolve(JavaTypeParameterImpl@1149['K']) = LazyJavaTypeParameterDescriptor@237['K']
-    resolve(JavaTypeParameterImpl@1150['V']) = LazyJavaTypeParameterDescriptor@238['V']
-}
-
-LazyJavaTypeParameterResolver@1151 {
-    resolve(JavaTypeParameterImpl@1152['K']) = LazyJavaTypeParameterDescriptor@211['K']
-    resolve(JavaTypeParameterImpl@1153['V']) = LazyJavaTypeParameterDescriptor@212['V']
-}
-
-LazyJavaTypeParameterResolver@1154 {
-    resolve(JavaTypeParameterImpl@599['K']) = null
-    resolve(JavaTypeParameterImpl@869['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1155 {
-    resolve(JavaTypeParameterImpl@587['K']) = null
-    resolve(JavaTypeParameterImpl@882['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1156 {
-    resolve(JavaTypeParameterImpl@571['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1157 {
-    resolve(JavaTypeParameterImpl@581['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1158 {
-    resolve(JavaTypeParameterImpl@885['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1159 {
-    resolve(JavaTypeParameterImpl@876['V']) = null
-}
-
-ResolutionTaskHolder@1160 {
-    <name not found> = ArrayList@1161[10] { ResolutionCandidate@1162, ResolutionCandidate@1163, ResolutionCandidate@1164, ... }
-}
-
-ResolutionTaskHolder@1165 {
-    <name not found> = ArrayList@1166[13] { ResolutionCandidate@1167, ResolutionCandidate@1168, ResolutionCandidate@1169, ... }
-}
-
-ResolutionTaskHolder@1170 {
-    <name not found> = ArrayList@1171[13] { ResolutionCandidate@1172, ResolutionCandidate@1173, ResolutionCandidate@1174, ... }
-}
-
-ResolutionTaskHolder@1175 {
-    <name not found> = ArrayList@1176[13] { ResolutionCandidate@1177, ResolutionCandidate@1178, ResolutionCandidate@1179, ... }
-}
-
-ResolutionTaskHolder@1180 {
-    <name not found> = ArrayList@1181[13] { ResolutionCandidate@1182, ResolutionCandidate@1183, ResolutionCandidate@1184, ... }
-}
-
-ResolutionTaskHolder@1185 {
-    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
-    <name not found> = ArrayList@1188[1] { ResolutionCandidate@1189 }
-    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1191 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1192 {
-    <name not found> = ArrayList@1193[1] { ResolutionCandidate@1194 }
-    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1197 {
-    <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1201 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1202 {
-    <name not found> = ArrayList@1203[1] { ResolutionCandidate@1204 }
-    <name not found> = ArrayList@1205[1] { ResolutionCandidate@1206 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1207 {
-    <name not found> = ArrayList@1208[1] { ResolutionCandidate@1209 }
-    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1212 {
-    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
-    <name not found> = ArrayList@1215[1] { ResolutionCandidate@1216 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1217 {
-    <name not found> = ArrayList@1218[1] { ResolutionCandidate@1219 }
-    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1221 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1222 {
-    <name not found> = ArrayList@1223[1] { ResolutionCandidate@1224 }
-    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1227 {
-    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
-    <name not found> = ArrayList@1230[1] { ResolutionCandidate@1231 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1232 {
-    <name not found> = ArrayList@1233[1] { ResolutionCandidate@1234 }
-    <name not found> = ArrayList@1235[1] { ResolutionCandidate@1236 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1237 {
-    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1239 }
-    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1242 {
-    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
-    <name not found> = ArrayList@1245[1] { ResolutionCandidate@1246 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1247 {
-    <name not found> = ArrayList@1248[1] { ResolutionCandidate@1249 }
-    <name not found> = ArrayList@1250[1] { ResolutionCandidate@1251 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1252 {
-    <name not found> = ArrayList@1253[1] { ResolutionCandidate@1254 }
-    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1257 {
-    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
-    <name not found> = ArrayList@1260[1] { ResolutionCandidate@1261 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1262 {
-    <name not found> = ArrayList@1263[1] { ResolutionCandidate@1264 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1265 {
-    <name not found> = ArrayList@1266[1] { ResolutionCandidate@1267 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1268 {
-    <name not found> = ArrayList@1269[1] { ResolutionCandidate@1270 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1271 {
-    <name not found> = ArrayList@1272[1] { ResolutionCandidate@1273 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1274 {
-    <name not found> = ArrayList@1275[1] { ResolutionCandidate@1276 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1277 {
-    <name not found> = ArrayList@1278[1] { ResolutionCandidate@1279 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1280 {
-    <name not found> = ArrayList@1281[1] { ResolutionCandidate@1282 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1283 {
-    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1285 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1286 {
-    <name not found> = ArrayList@1287[1] { ResolutionCandidate@1288 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1289 {
-    <name not found> = ArrayList@1290[1] { ResolutionCandidate@1291 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1292 {
-    <name not found> = ArrayList@1293[1] { ResolutionCandidate@1294 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1295 {
-    <name not found> = ArrayList@1296[1] { ResolutionCandidate@1297 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1298 {
-    <name not found> = ArrayList@1299[1] { ResolutionCandidate@1300 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1301 {
-    <name not found> = ArrayList@1302[1] { ResolutionCandidate@1303 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1304 {
-    <name not found> = ArrayList@1305[1] { ResolutionCandidate@1306 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1307 {
-    <name not found> = ArrayList@1308[1] { ResolutionCandidate@1309 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1310 {
-    <name not found> = ArrayList@1311[1] { ResolutionCandidate@1312 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1313 {
-    <name not found> = ArrayList@1314[1] { ResolutionCandidate@1315 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1316 {
-    <name not found> = ArrayList@1317[1] { ResolutionCandidate@1318 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1319 {
-    <name not found> = ArrayList@1320[1] { ResolutionCandidate@1321 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1322 {
-    <name not found> = ArrayList@1323[1] { ResolutionCandidate@1324 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1325 {
-    <name not found> = ArrayList@1326[1] { ResolutionCandidate@1327 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1328 {
-    <name not found> = ArrayList@1329[1] { ResolutionCandidate@1330 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1331 {
-    <name not found> = ArrayList@1332[1] { ResolutionCandidate@1333 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1334 {
-    <name not found> = ArrayList@1335[1] { ResolutionCandidate@1336 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1337 {
-    <name not found> = ArrayList@1338[1] { ResolutionCandidate@1339 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1340 {
-    <name not found> = ArrayList@1341[1] { ResolutionCandidate@1342 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1343 {
-    <name not found> = ArrayList@1344[1] { ResolutionCandidate@1345 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1346 {
-    <name not found> = ArrayList@1347[1] { ResolutionCandidate@1348 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1349 {
-    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1351 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1352 {
-    <name not found> = ArrayList@1353[1] { ResolutionCandidate@1354 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1355 {
-    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1357 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1358 {
-    <name not found> = ArrayList@1359[1] { ResolutionCandidate@1360 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1361 {
-    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1363 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1364 {
-    <name not found> = ArrayList@1365[1] { ResolutionCandidate@1366 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1367 {
-    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1369 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1370 {
-    <name not found> = ArrayList@1371[1] { ResolutionCandidate@1372 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1373 {
-    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1375 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1376 {
-    <name not found> = ArrayList@1377[1] { ResolutionCandidate@1378 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1379 {
-    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1381 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1382 {
-    <name not found> = ArrayList@1383[1] { ResolutionCandidate@1384 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1385 {
-    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1387 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1388 {
-    <name not found> = ArrayList@1389[1] { ResolutionCandidate@1390 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1391 {
-    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1393 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1394 {
-    <name not found> = ArrayList@1395[1] { ResolutionCandidate@1396 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1397 {
-    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1399 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1400 {
-    <name not found> = ArrayList@1401[1] { ResolutionCandidate@1402 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1403 {
-    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1405 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1406 {
-    <name not found> = ArrayList@1407[1] { ResolutionCandidate@1408 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1409 {
-    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1411 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1412 {
-    <name not found> = ArrayList@1413[1] { ResolutionCandidate@1414 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1415 {
-    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1417 }
-}
-
-ResolutionTaskHolder@1418 {
-    <name not found> = ArrayList@1419[1] { ResolutionCandidate@1420 }
-}
-
-ResolutionTaskHolder@1421 {
-    <name not found> = ArrayList@1422[1] { ResolutionCandidate@1423 }
-}
-
-ResolutionTaskHolder@1424 {
-    <name not found> = ArrayList@1425[1] { ResolutionCandidate@1426 }
-}
-
-ResolutionTaskHolder@1427 {
-    <name not found> = ArrayList@1428[1] { ResolutionCandidate@1429 }
-}
-
-ResolutionTaskHolder@1430 {
-    <name not found> = ArrayList@1431[1] { ResolutionCandidate@1432 }
-}
-
-ResolutionTaskHolder@1433 {
-    <name not found> = ArrayList@1434[1] { ResolutionCandidate@1435 }
-}
-
-ResolutionTaskHolder@1436 {
-    <name not found> = ArrayList@1437[1] { ResolutionCandidate@1438 }
-}
-
-ResolutionTaskHolder@1439 {
-    <name not found> = ArrayList@1440[1] { ResolutionCandidate@1441 }
-}
-
-ResolutionTaskHolder@1442 {
-    <name not found> = ArrayList@1443[1] { ResolutionCandidate@1444 }
-}
-
-ResolutionTaskHolder@1445 {
-    <name not found> = ArrayList@1446[1] { ResolutionCandidate@1447 }
-}
-
-ResolutionTaskHolder@1448 {
-    <name not found> = ArrayList@1449[1] { ResolutionCandidate@1450 }
-}
-
-ResolutionTaskHolder@1451 {
-    <name not found> = ArrayList@1452[1] { ResolutionCandidate@1453 }
-}
-
-ResolutionTaskHolder@1454 {
-    <name not found> = ArrayList@1455[1] { ResolutionCandidate@1456 }
-}
-
-ResolutionTaskHolder@1457 {
-    <name not found> = ArrayList@1458[1] { ResolutionCandidate@1459 }
-}
-
-ResolutionTaskHolder@1460 {
-    <name not found> = ArrayList@1461[1] { ResolutionCandidate@1462 }
-}
-
-ResolutionTaskHolder@1463 {
-    <name not found> = ArrayList@1464[1] { ResolutionCandidate@1465 }
-}
-
-ResolutionTaskHolder@1466 {
-    <name not found> = ArrayList@1467[1] { ResolutionCandidate@1468 }
-}
-
-ResolutionTaskHolder@1469 {
-    <name not found> = ArrayList@1470[1] { ResolutionCandidate@1471 }
-}
-
-ResolutionTaskHolder@1472 {
-    <name not found> = ArrayList@1473[1] { ResolutionCandidate@1474 }
-}
-
-ResolutionTaskHolder@1475 {
-    <name not found> = ArrayList@1476[1] { ResolutionCandidate@1477 }
-}
-
-ResolutionTaskHolder@1478 {
-    <name not found> = ArrayList@1479[1] { ResolutionCandidate@1480 }
-}
-
-ResolutionTaskHolder@1481 {
-    <name not found> = ArrayList@1482[1] { ResolutionCandidate@1483 }
-}
-
-ResolutionTaskHolder@1484 {
-    <name not found> = ArrayList@1485[1] { ResolutionCandidate@1486 }
-}
-
-ResolutionTaskHolder@1487 {
-    <name not found> = ArrayList@1488[1] { ResolutionCandidate@1489 }
-}
-
-ResolutionTaskHolder@1490 {
-    <name not found> = ArrayList@1491[1] { ResolutionCandidate@1492 }
-}
-
-ResolutionTaskHolder@1493 {
-    <name not found> = ArrayList@1494[1] { ResolutionCandidate@1495 }
-}
-
-ResolutionTaskHolder@1496 {
-    <name not found> = ArrayList@1497[1] { ResolutionCandidate@1498 }
-}
-
-ResolutionTaskHolder@1499 {
-    <name not found> = ArrayList@1500[1] { ResolutionCandidate@1501 }
-}
-
-ResolutionTaskHolder@1502 {
-    <name not found> = ArrayList@1503[1] { ResolutionCandidate@1504 }
-}
-
-ResolutionTaskHolder@1505 {
-    <name not found> = ArrayList@1506[1] { ResolutionCandidate@1507 }
-}
-
-ResolutionTaskHolder@1508 {
-    <name not found> = ArrayList@1509[1] { ResolutionCandidate@1510 }
-}
-
-ResolutionTaskHolder@1511 {
-    <name not found> = ArrayList@1512[1] { ResolutionCandidate@1513 }
-}
-
-ResolutionTaskHolder@1514 {
-    <name not found> = ArrayList@1515[1] { ResolutionCandidate@1516 }
-}
-
-ResolutionTaskHolder@1517 {
-    <name not found> = ArrayList@1518[1] { ResolutionCandidate@1519 }
-}
-
-ResolutionTaskHolder@1520 {
-    <name not found> = ArrayList@1521[1] { ResolutionCandidate@1522 }
-}
-
-ResolutionTaskHolder@1523 {
-    <name not found> = ArrayList@1524[1] { ResolutionCandidate@1525 }
-}
-
-ResolutionTaskHolder@1526 {
-    <name not found> = ArrayList@1527[1] { ResolutionCandidate@1528 }
-}
-
-ResolutionTaskHolder@1529 {
-    <name not found> = ArrayList@1530[1] { ResolutionCandidate@1531 }
-}
-
-ResolutionTaskHolder@1532 {
-    <name not found> = ArrayList@1533[1] { ResolutionCandidate@1534 }
-}
-
-ResolutionTaskHolder@1535 {
-    <name not found> = ArrayList@1536[1] { ResolutionCandidate@1537 }
-}
-
-ResolutionTaskHolder@1538 {
-    <name not found> = ArrayList@1539[1] { ResolutionCandidate@1540 }
-}
-
-ResolutionTaskHolder@1541 {
-    <name not found> = ArrayList@1542[1] { ResolutionCandidate@1543 }
-}
-
-ResolutionTaskHolder@1544 {
-    <name not found> = ArrayList@1545[1] { ResolutionCandidate@1546 }
-}
-
-ResolutionTaskHolder@1547 {
-    <name not found> = ArrayList@1548[1] { ResolutionCandidate@1549 }
-}
-
-ResolutionTaskHolder@1550 {
-    <name not found> = ArrayList@1551[1] { ResolutionCandidate@1552 }
-}
-
-ResolutionTaskHolder@1553 {
-    <name not found> = ArrayList@1554[1] { ResolutionCandidate@1555 }
-}
-
-ResolutionTaskHolder@1556 {
-    <name not found> = ArrayList@1557[1] { ResolutionCandidate@1558 }
-}
-
-ResolutionTaskHolder@1559 {
-    <name not found> = ArrayList@1560[1] { ResolutionCandidate@1561 }
-}
-
-ResolutionTaskHolder@1562 {
-    <name not found> = ArrayList@1563[1] { ResolutionCandidate@1564 }
-}
-
-ResolutionTaskHolder@1565 {
-    <name not found> = ArrayList@1566[1] { ResolutionCandidate@1567 }
-}
-
-ResolutionTaskHolder@1568 {
-    <name not found> = ArrayList@1569[1] { ResolutionCandidate@1570 }
-}
-
-ResolutionTaskHolder@1571 {
-    <name not found> = ArrayList@1572[1] { ResolutionCandidate@1573 }
-}
-
-ResolutionTaskHolder@1574 {
-    <name not found> = ArrayList@1575[1] { ResolutionCandidate@1576 }
-}
-
-ResolutionTaskHolder@1577 {
-    <name not found> = ArrayList@1578[1] { ResolutionCandidate@1579 }
-}
-
-ResolutionTaskHolder@1580 {
-    <name not found> = ArrayList@1581[1] { ResolutionCandidate@1582 }
-}
-
-ResolutionTaskHolder@1583 {
-    <name not found> = ArrayList@1584[1] { ResolutionCandidate@1585 }
-}
-
-ResolutionTaskHolder@1586 {
-    <name not found> = ArrayList@1587[1] { ResolutionCandidate@1588 }
-}
-
-ResolutionTaskHolder@1589 {
-    <name not found> = ArrayList@1590[1] { ResolutionCandidate@1591 }
-}
-
-ResolutionTaskHolder@1592 {
-    <name not found> = ArrayList@1593[1] { ResolutionCandidate@1594 }
-}
-
-ResolutionTaskHolder@1595 {
-    <name not found> = ArrayList@1596[1] { ResolutionCandidate@1597 }
-}
-
-ResolutionTaskHolder@1598 {
-    <name not found> = ArrayList@1599[1] { ResolutionCandidate@1600 }
-}
-
-ResolutionTaskHolder@1601 {
-    <name not found> = ArrayList@1602[1] { ResolutionCandidate@1603 }
-}
-
-ResolutionTaskHolder@1604 {
-    <name not found> = ArrayList@1605[1] { ResolutionCandidate@1606 }
-}
-
-ResolutionTaskHolder@1607 {
-    <name not found> = ArrayList@1608[1] { ResolutionCandidate@1609 }
-}
-
-ResolutionTaskHolder@1610 {
-    <name not found> = ArrayList@1611[1] { ResolutionCandidate@1612 }
-}
-
-ResolutionTaskHolder@1613 {
-    <name not found> = ArrayList@1614[1] { ResolutionCandidate@1615 }
-}
-
-ResolutionTaskHolder@1616 {
-    <name not found> = ArrayList@1617[1] { ResolutionCandidate@1618 }
-}
-
-ResolutionTaskHolder@1619 {
-    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1621 }
-}
-
-ResolutionTaskHolder@1622 {
-    <name not found> = ArrayList@1623[1] { ResolutionCandidate@1624 }
-}
-
-ResolutionTaskHolder@1625 {
-    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1627 }
-}
-
-ResolutionTaskHolder@1628 {
-    <name not found> = ArrayList@1629[1] { ResolutionCandidate@1630 }
-}
-
-ResolutionTaskHolder@1631 {
-    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1633 }
-}
-
-ResolutionTaskHolder@1634 {
-    <name not found> = ArrayList@1635[1] { ResolutionCandidate@1636 }
-}
-
-ResolutionTaskHolder@1637 {
-    <name not found> = ArrayList@1638[1] { ResolutionCandidate@1639 }
-}
-
-ResolutionTaskHolder@1640 {
-    <name not found> = ArrayList@1641[2] { ResolutionCandidate@1642, ResolutionCandidate@1643 }
-}
-
-ResolutionTaskHolder@1644 {
-    <name not found> = ArrayList@1645[2] { ResolutionCandidate@1646, ResolutionCandidate@1647 }
-}
-
-ResolutionTaskHolder@1648 {
-    <name not found> = ArrayList@1649[3] { ResolutionCandidate@1650, ResolutionCandidate@1651, ResolutionCandidate@1652 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1653 {
-    <name not found> = ArrayList@1654[4] { ResolutionCandidate@1655, ResolutionCandidate@1656, ResolutionCandidate@1657, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1658 {
-    <name not found> = ArrayList@1659[4] { ResolutionCandidate@1660, ResolutionCandidate@1661, ResolutionCandidate@1662, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1663 {
-    <name not found> = ArrayList@1664[4] { ResolutionCandidate@1665, ResolutionCandidate@1666, ResolutionCandidate@1667, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1668 {
-    <name not found> = ArrayList@1669[9] { ResolutionCandidate@1670, ResolutionCandidate@1671, ResolutionCandidate@1672, ... }
-}
-
-ResolutionTaskHolder@1673 {
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@1674 {
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-null {
-    <name not found> = ArrayList@1675[10] { ResolutionCandidate@1162, ResolutionCandidate@1163, ResolutionCandidate@1164, ... }
-    <name not found> = ArrayList@1676[14] { ResolutionCandidate@1172, ResolutionCandidate@1173, ResolutionCandidate@1677, ... }
-    <name not found> = ArrayList@1678[14] { ResolutionCandidate@1182, ResolutionCandidate@1183, ResolutionCandidate@1679, ... }
-    <name not found> = ArrayList@1680[14] { ResolutionCandidate@1177, ResolutionCandidate@1178, ResolutionCandidate@1681, ... }
-    <name not found> = ArrayList@1682[14] { ResolutionCandidate@1167, ResolutionCandidate@1168, ResolutionCandidate@1683, ... }
-    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1279 }
-    <name not found> = ArrayList@1685[1] { ResolutionCandidate@1504 }
-    <name not found> = ArrayList@1686[1] { ResolutionCandidate@1351 }
-    <name not found> = ArrayList@1687[1] { ResolutionCandidate@1291 }
-    <name not found> = ArrayList@1688[1] { ResolutionCandidate@1594 }
-    <name not found> = ArrayList@1689[1] { ResolutionCandidate@1309 }
-    <name not found> = ArrayList@1690[1] { ResolutionCandidate@1282 }
-    <name not found> = ArrayList@1691[1] { ResolutionCandidate@1627 }
-    <name not found> = ArrayList@1692[1] { ResolutionCandidate@1363 }
-    <name not found> = ArrayList@1693[1] { ResolutionCandidate@1270 }
-    <name not found> = ArrayList@1694[1] { ResolutionCandidate@1585 }
-    <name not found> = ArrayList@1695[1] { ResolutionCandidate@1345 }
-    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1489 }
-    <name not found> = ArrayList@1697[1] { ResolutionCandidate@1516 }
-    <name not found> = ArrayList@1698[1] { ResolutionCandidate@1417 }
-    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1534 }
-    <name not found> = ArrayList@1700[1] { ResolutionCandidate@1435 }
-    <name not found> = ArrayList@1701[1] { ResolutionCandidate@1624 }
-    <name not found> = ArrayList@1702[1] { ResolutionCandidate@1465 }
-    <name not found> = ArrayList@1703[1] { ResolutionCandidate@1636 }
-    <name not found> = ArrayList@1704[1] { ResolutionCandidate@1621 }
-    <name not found> = ArrayList@1705[1] { ResolutionCandidate@1609 }
-    <name not found> = ArrayList@1706[1] { ResolutionCandidate@1612 }
-    <name not found> = ArrayList@1707[1] { ResolutionCandidate@1552 }
-    <name not found> = ArrayList@1708[1] { ResolutionCandidate@1471 }
-    <name not found> = ArrayList@1709[1] { ResolutionCandidate@1450 }
-    <name not found> = ArrayList@1710[1] { ResolutionCandidate@1384 }
-    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1579 }
-    <name not found> = ArrayList@1712[1] { ResolutionCandidate@1477 }
-    <name not found> = ArrayList@1713[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1714[1] { ResolutionCandidate@1201 }
-    <name not found> = ArrayList@1715[1] { ResolutionCandidate@1393 }
-    <name not found> = ArrayList@1716[1] { ResolutionCandidate@1507 }
-    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1543 }
-    <name not found> = ArrayList@1718[1] { ResolutionCandidate@1357 }
-    <name not found> = ArrayList@1719[1] { ResolutionCandidate@1339 }
-    <name not found> = ArrayList@1720[1] { ResolutionCandidate@1366 }
-    <name not found> = ArrayList@1721[1] { ResolutionCandidate@1234 }
-    <name not found> = ArrayList@1722[1] { ResolutionCandidate@1236 }
-    <name not found> = ArrayList@1723[1] { ResolutionCandidate@1276 }
-    <name not found> = ArrayList@1724[1] { ResolutionCandidate@1588 }
-    <name not found> = ArrayList@1725[1] { ResolutionCandidate@1315 }
-    <name not found> = ArrayList@1726[1] { ResolutionCandidate@1273 }
-    <name not found> = ArrayList@1727[1] { ResolutionCandidate@1603 }
-    <name not found> = ArrayList@1728[1] { ResolutionCandidate@1303 }
-    <name not found> = ArrayList@1729[1] { ResolutionCandidate@1342 }
-    <name not found> = ArrayList@1730[1] { ResolutionCandidate@1378 }
-    <name not found> = ArrayList@1731[1] { ResolutionCandidate@1239 }
-    <name not found> = ArrayList@1732[1] { ResolutionCandidate@1241 }
-    <name not found> = ArrayList@1733[1] { ResolutionCandidate@1348 }
-    <name not found> = ArrayList@1734[1] { ResolutionCandidate@1254 }
-    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1256 }
-    <name not found> = ArrayList@1736[1] { ResolutionCandidate@1354 }
-    <name not found> = ArrayList@1737[1] { ResolutionCandidate@1219 }
-    <name not found> = ArrayList@1738[1] { ResolutionCandidate@1221 }
-    <name not found> = ArrayList@1739[1] { ResolutionCandidate@1306 }
-    <name not found> = ArrayList@1740[1] { ResolutionCandidate@1229 }
-    <name not found> = ArrayList@1741[1] { ResolutionCandidate@1231 }
-    <name not found> = ArrayList@1742[1] { ResolutionCandidate@1324 }
-    <name not found> = ArrayList@1743[1] { ResolutionCandidate@1259 }
-    <name not found> = ArrayList@1744[1] { ResolutionCandidate@1261 }
-    <name not found> = ArrayList@1745[1] { ResolutionCandidate@1214 }
-    <name not found> = ArrayList@1746[1] { ResolutionCandidate@1216 }
-    <name not found> = ArrayList@1747[1] { ResolutionCandidate@1330 }
-    <name not found> = ArrayList@1748[1] { ResolutionCandidate@1209 }
-    <name not found> = ArrayList@1749[1] { ResolutionCandidate@1211 }
-    <name not found> = ArrayList@1750[1] { ResolutionCandidate@1244 }
-    <name not found> = ArrayList@1751[1] { ResolutionCandidate@1246 }
-    <name not found> = ArrayList@1752[1] { ResolutionCandidate@1321 }
-    <name not found> = ArrayList@1753[1] { ResolutionCandidate@1224 }
-    <name not found> = ArrayList@1754[1] { ResolutionCandidate@1226 }
-    <name not found> = ArrayList@1755[1] { ResolutionCandidate@1369 }
-    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1204 }
-    <name not found> = ArrayList@1757[1] { ResolutionCandidate@1206 }
-    <name not found> = ArrayList@1758[1] { ResolutionCandidate@1360 }
-    <name not found> = ArrayList@1759[1] { ResolutionCandidate@1561 }
-    <name not found> = ArrayList@1760[1] { ResolutionCandidate@1456 }
-    <name not found> = ArrayList@1761[1] { ResolutionCandidate@1600 }
-    <name not found> = ArrayList@1762[1] { ResolutionCandidate@1462 }
-    <name not found> = ArrayList@1763[1] { ResolutionCandidate@1333 }
-    <name not found> = ArrayList@1764[1] { ResolutionCandidate@1606 }
-    <name not found> = ArrayList@1765[1] { ResolutionCandidate@1249 }
-    <name not found> = ArrayList@1766[1] { ResolutionCandidate@1251 }
-    <name not found> = ArrayList@1767[1] { ResolutionCandidate@1288 }
-    <name not found> = ArrayList@1768[1] { ResolutionCandidate@1570 }
-    <name not found> = ArrayList@1769[1] { ResolutionCandidate@1372 }
-    <name not found> = ArrayList@1770[1] { ResolutionCandidate@1285 }
-    <name not found> = ArrayList@1771[1] { ResolutionCandidate@1540 }
-    <name not found> = ArrayList@1772[1] { ResolutionCandidate@1381 }
-    <name not found> = ArrayList@1773[1] { ResolutionCandidate@1510 }
-    <name not found> = ArrayList@1774[1] { ResolutionCandidate@1318 }
-    <name not found> = ArrayList@1775[1] { ResolutionCandidate@1336 }
-    <name not found> = ArrayList@1776[1] { ResolutionCandidate@1522 }
-    <name not found> = ArrayList@1777[1] { ResolutionCandidate@1300 }
-    <name not found> = ArrayList@1778[1] { ResolutionCandidate@1294 }
-    <name not found> = ArrayList@1779[1] { ResolutionCandidate@1492 }
-    <name not found> = ArrayList@1780[1] { ResolutionCandidate@1444 }
-    <name not found> = ArrayList@1781[1] { ResolutionCandidate@1438 }
-    <name not found> = ArrayList@1782[1] { ResolutionCandidate@1486 }
-    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1567 }
-    <name not found> = ArrayList@1784[1] { ResolutionCandidate@1411 }
-    <name not found> = ArrayList@1785[1] { ResolutionCandidate@1513 }
-    <name not found> = ArrayList@1786[1] { ResolutionCandidate@1402 }
-    <name not found> = ArrayList@1787[1] { ResolutionCandidate@1420 }
-    <name not found> = ArrayList@1788[1] { ResolutionCandidate@1558 }
-    <name not found> = ArrayList@1789[1] { ResolutionCandidate@1312 }
-    <name not found> = ArrayList@1790[1] { ResolutionCandidate@1453 }
-    <name not found> = ArrayList@1791[1] { ResolutionCandidate@1432 }
-    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1630 }
-    <name not found> = ArrayList@1793[1] { ResolutionCandidate@1639 }
-    <name not found> = ArrayList@1794[1] { ResolutionCandidate@1405 }
-    <name not found> = ArrayList@1795[1] { ResolutionCandidate@1564 }
-    <name not found> = ArrayList@1796[1] { ResolutionCandidate@1297 }
-    <name not found> = ArrayList@1797[1] { ResolutionCandidate@1194 }
-    <name not found> = ArrayList@1798[1] { ResolutionCandidate@1196 }
-    <name not found> = ArrayList@1799[1] { ResolutionCandidate@1483 }
-    <name not found> = ArrayList@1800[1] { ResolutionCandidate@1396 }
-    <name not found> = ArrayList@1801[1] { ResolutionCandidate@1618 }
-    <name not found> = ArrayList@1802[1] { ResolutionCandidate@1429 }
-    <name not found> = ArrayList@1803[1] { ResolutionCandidate@1468 }
-    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1615 }
-    <name not found> = ArrayList@1805[1] { ResolutionCandidate@1387 }
-    <name not found> = ArrayList@1806[1] { ResolutionCandidate@1327 }
-    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1390 }
-    <name not found> = ArrayList@1808[1] { ResolutionCandidate@1447 }
-    <name not found> = ArrayList@1809[1] { ResolutionCandidate@1531 }
-    <name not found> = ArrayList@1810[1] { ResolutionCandidate@1474 }
-    <name not found> = ArrayList@1811[1] { ResolutionCandidate@1528 }
-    <name not found> = ArrayList@1812[1] { ResolutionCandidate@1525 }
-    <name not found> = ArrayList@1813[1] { ResolutionCandidate@1546 }
-    <name not found> = ArrayList@1814[1] { ResolutionCandidate@1582 }
-    <name not found> = ArrayList@1815[1] { ResolutionCandidate@1519 }
-    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1480 }
-    <name not found> = ArrayList@1817[1] { ResolutionCandidate@1555 }
-    <name not found> = ArrayList@1818[1] { ResolutionCandidate@1414 }
-    <name not found> = ArrayList@1819[1] { ResolutionCandidate@1399 }
-    <name not found> = ArrayList@1820[1] { ResolutionCandidate@1633 }
-    <name not found> = ArrayList@1821[1] { ResolutionCandidate@1597 }
-    <name not found> = ArrayList@1822[1] { ResolutionCandidate@1459 }
-    <name not found> = ArrayList@1823[1] { ResolutionCandidate@1501 }
-    <name not found> = ArrayList@1824[1] { ResolutionCandidate@1495 }
-    <name not found> = ArrayList@1825[1] { ResolutionCandidate@1498 }
-    <name not found> = ArrayList@1826[1] { ResolutionCandidate@1408 }
-    <name not found> = ArrayList@1827[1] { ResolutionCandidate@1549 }
-    <name not found> = ArrayList@1828[1] { ResolutionCandidate@1423 }
-    <name not found> = ArrayList@1829[1] { ResolutionCandidate@1537 }
-    <name not found> = ArrayList@1830[1] { ResolutionCandidate@1426 }
-    <name not found> = ArrayList@1831[1] { ResolutionCandidate@1187 }
-    <name not found> = ArrayList@1832[1] { ResolutionCandidate@1189 }
-    <name not found> = ArrayList@1833[1] { ResolutionCandidate@1191 }
-    <name not found> = ArrayList@1834[1] { ResolutionCandidate@1264 }
-    <name not found> = ArrayList@1835[1] { ResolutionCandidate@1267 }
-    <name not found> = ArrayList@1836[1] { ResolutionCandidate@1576 }
-    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1375 }
-    <name not found> = ArrayList@1838[1] { ResolutionCandidate@1573 }
-    <name not found> = ArrayList@1839[1] { ResolutionCandidate@1591 }
-    <name not found> = ArrayList@1840[1] { ResolutionCandidate@1441 }
-    <name not found> = ArrayList@1841[2] { ResolutionCandidate@1646, ResolutionCandidate@1647 }
-    <name not found> = ArrayList@1842[2] { ResolutionCandidate@1642, ResolutionCandidate@1643 }
-    <name not found> = ArrayList@1843[3] { ResolutionCandidate@1650, ResolutionCandidate@1651, ResolutionCandidate@1652 }
-    <name not found> = ArrayList@1844[4] { ResolutionCandidate@1655, ResolutionCandidate@1656, ResolutionCandidate@1657, ... }
-    <name not found> = ArrayList@1845[4] { ResolutionCandidate@1665, ResolutionCandidate@1666, ResolutionCandidate@1667, ... }
-    <name not found> = ArrayList@1846[4] { ResolutionCandidate@1660, ResolutionCandidate@1661, ResolutionCandidate@1662, ... }
-    <name not found> = ArrayList@1847[9] { ResolutionCandidate@1670, ResolutionCandidate@1671, ResolutionCandidate@1672, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Casts.lazy.log b/compiler/testData/diagnostics/tests/Casts.lazy.log
deleted file mode 100644
index e2980adac58..00000000000
--- a/compiler/testData/diagnostics/tests/Casts.lazy.log
+++ /dev/null
@@ -1,91 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log b/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
deleted file mode 100644
index 2bde4e38102..00000000000
--- a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Char': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Char': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Char': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Char': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('test': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('test': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('test': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log b/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
deleted file mode 100644
index 88f66fce9b6..00000000000
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('java.lang.x': FqName@7) = null
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-    packageFragments('kotlin.x': FqName@11) = null
-    packageFragments('x': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('x': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('x': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@6['lang'] {
-    classes('x': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('x': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Constants.lazy.log b/compiler/testData/diagnostics/tests/Constants.lazy.log
deleted file mode 100644
index e51527199fe..00000000000
--- a/compiler/testData/diagnostics/tests/Constants.lazy.log
+++ /dev/null
@@ -1,336 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ByteArray']
-    <name not found> = JetTypeImpl@2['DoubleArray']
-    <name not found> = JetTypeImpl@3['FloatArray']
-    <name not found> = JetTypeImpl@4['IntArray']
-    <name not found> = JetTypeImpl@5['LongArray']
-    <name not found> = JetTypeImpl@6['ShortArray']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Byte': FqName@10) = null
-    packageFragments('Double': FqName@11) = null
-    packageFragments('Float': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('Long': FqName@14) = null
-    packageFragments('Short': FqName@15) = null
-    packageFragments('T': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Byte': FqName@21) = null
-    packageFragments('java.lang.Double': FqName@22) = null
-    packageFragments('java.lang.Float': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.Long': FqName@25) = null
-    packageFragments('java.lang.Short': FqName@26) = null
-    packageFragments('java.lang.T': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.Byte': FqName@29) = null
-    packageFragments('kotlin.Double': FqName@30) = null
-    packageFragments('kotlin.Float': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.Long': FqName@33) = null
-    packageFragments('kotlin.Short': FqName@34) = null
-    packageFragments('kotlin.T': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Byte': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Double': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Float': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Long': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Short': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('testFun': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargByte': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargDouble': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargFloat': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('testFun': Name@45) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargByte': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargDouble': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargFloat': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargInt': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargLong': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargShort': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@57) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('testFun': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargByte': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargDouble': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargFloat': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('varargShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('testFun': Name@45) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargByte': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargDouble': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargFloat': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargInt': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargLong': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('varargShort': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@162[8] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Constructors.lazy.log b/compiler/testData/diagnostics/tests/Constructors.lazy.log
deleted file mode 100644
index cb4ad7644b5..00000000000
--- a/compiler/testData/diagnostics/tests/Constructors.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Foo': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('NoC': FqName@10) = null
-    packageFragments('NoC1': FqName@11) = null
-    packageFragments('NoC2': FqName@12) = null
-    packageFragments('NoC3': FqName@13) = null
-    packageFragments('NoCPI': FqName@14) = null
-    packageFragments('WithC0': FqName@15) = null
-    packageFragments('WithC1': FqName@16) = null
-    packageFragments('WithC2': FqName@17) = null
-    packageFragments('WithCPI': FqName@18) = null
-    packageFragments('WithCPI_Dup': FqName@19) = null
-    packageFragments('WithPC0': FqName@20) = null
-    packageFragments('WithPC1': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('java.lang.NoC': FqName@27) = null
-    packageFragments('java.lang.WithC1': FqName@28) = null
-    packageFragments('java.lang.WithPC0': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.NoC': FqName@32) = null
-    packageFragments('kotlin.WithC1': FqName@33) = null
-    packageFragments('kotlin.WithPC0': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('a': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('a': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
deleted file mode 100644
index 1185b2edd3a..00000000000
--- a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
+++ /dev/null
@@ -1,274 +0,0 @@
-LazyJavaClassDescriptor@0['Boolean'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@1['Byte'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@2['Double'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@3['Float'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@4['Long'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@5['Short'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    topLevelClasses(JavaClassImpl@16['Boolean']) = LazyJavaClassDescriptor@0['Boolean']
-    topLevelClasses(JavaClassImpl@17['Byte']) = LazyJavaClassDescriptor@1['Byte']
-    topLevelClasses(JavaClassImpl@18['Double']) = LazyJavaClassDescriptor@2['Double']
-    topLevelClasses(JavaClassImpl@19['Float']) = LazyJavaClassDescriptor@3['Float']
-    topLevelClasses(JavaClassImpl@20['Long']) = LazyJavaClassDescriptor@4['Long']
-    topLevelClasses(JavaClassImpl@21['Short']) = LazyJavaClassDescriptor@5['Short']
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Boolean': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Byte': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Double': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Float': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Long': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Short': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Boolean': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Byte': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Char': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Double': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Float': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Int': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Long': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Short': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Boolean': Name@22) = LazyJavaClassDescriptor@0['Boolean'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Byte': Name@24) = LazyJavaClassDescriptor@1['Byte'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Double': Name@26) = LazyJavaClassDescriptor@2['Double'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Float': Name@27) = LazyJavaClassDescriptor@3['Float'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Long': Name@29) = LazyJavaClassDescriptor@4['Long'] // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Short': Name@30) = LazyJavaClassDescriptor@5['Short'] // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Boolean': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Byte': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Char': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Double': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Float': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Int': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Long': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Short': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log b/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
deleted file mode 100644
index 6eff766e901..00000000000
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
+++ /dev/null
@@ -1,67 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Double']
-    <name not found> = DoubleValue@2
-    <name not found> = DoubleValue@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Double': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('Iterator': FqName@11) = null
-    packageFragments('List': FqName@12) = null
-    packageFragments('T': FqName@13) = null
-    packageFragments('Unit': FqName@14) = null
-    packageFragments('X': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.Double': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.Iterator': FqName@23) = null
-    packageFragments('java.lang.List': FqName@24) = null
-    packageFragments('java.lang.T': FqName@25) = null
-    packageFragments('java.lang.Unit': FqName@26) = null
-    packageFragments('java.lang.X': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.A': FqName@29) = null
-    packageFragments('kotlin.Double': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.Iterator': FqName@32) = null
-    packageFragments('kotlin.List': FqName@33) = null
-    packageFragments('kotlin.T': FqName@34) = null
-    packageFragments('kotlin.Unit': FqName@35) = null
-    packageFragments('kotlin.X': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Double': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Int': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('List': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
-}
diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
deleted file mode 100644
index 0f9794e6261..00000000000
--- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
+++ /dev/null
@@ -1,112 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['String']
-    <name not found> = StringValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('Boolean': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Boolean': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('x': FqName@25) = null
-    packageFragments('z': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Boolean': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('z': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('z': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log b/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
deleted file mode 100644
index b6eae51cca7..00000000000
--- a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('Foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('Foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log b/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
deleted file mode 100644
index 88fcef4a3ef..00000000000
--- a/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Diamond': FqName@6) = null
-    packageFragments('Left': FqName@7) = null
-    packageFragments('Right': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Base': FqName@13) = null
-    packageFragments('java.lang.Left': FqName@14) = null
-    packageFragments('java.lang.Right': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@17) = null
-    packageFragments('kotlin.Left': FqName@18) = null
-    packageFragments('kotlin.Right': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log b/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
deleted file mode 100644
index 4a10da143a2..00000000000
--- a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Diamond': FqName@6) = null
-    packageFragments('Left': FqName@7) = null
-    packageFragments('P': FqName@8) = null
-    packageFragments('Right': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.Left': FqName@15) = null
-    packageFragments('java.lang.P': FqName@16) = null
-    packageFragments('java.lang.Right': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.Left': FqName@20) = null
-    packageFragments('kotlin.P': FqName@21) = null
-    packageFragments('kotlin.Right': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log b/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
deleted file mode 100644
index e2942054201..00000000000
--- a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Base': FqName@3) = null
-    packageFragments('Diamond': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Left': FqName@6) = null
-    packageFragments('Right': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Base': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Left': FqName@14) = null
-    packageFragments('java.lang.Right': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Left': FqName@19) = null
-    packageFragments('kotlin.Right': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/Dollar.lazy.log b/compiler/testData/diagnostics/tests/Dollar.lazy.log
deleted file mode 100644
index ca64ce90763..00000000000
--- a/compiler/testData/diagnostics/tests/Dollar.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('$$$$$': FqName@1) = null
-    packageFragments('$': FqName@2) = null
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('dollar': FqName@5) = null
-    packageFragments('dollar.$$$$$': FqName@6) = null
-    packageFragments('dollar.$$': FqName@7) = null
-    packageFragments('dollar.$': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.$$$$$': FqName@13) = null
-    packageFragments('java.lang.$': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.$$$$$': FqName@16) = null
-    packageFragments('kotlin.$': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('$$$': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/FinalClassObjectBound.lazy.log b/compiler/testData/diagnostics/tests/FinalClassObjectBound.lazy.log
deleted file mode 100644
index b7dc60d2df8..00000000000
--- a/compiler/testData/diagnostics/tests/FinalClassObjectBound.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Other': FqName@3) = null
-    packageFragments('Test1': FqName@4) = null
-    packageFragments('Trait': FqName@5) = null
-    packageFragments('WithBounds': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Other': FqName@11) = null
-    packageFragments('java.lang.Trait': FqName@12) = null
-    packageFragments('java.lang.WithBounds': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Other': FqName@15) = null
-    packageFragments('kotlin.Trait': FqName@16) = null
-    packageFragments('kotlin.WithBounds': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log b/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
deleted file mode 100644
index 3bbba540f36..00000000000
--- a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
+++ /dev/null
@@ -1,746 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    supertypes = ArrayList@25[5] { LazyJavaClassifierType@26['AbstractList<E>'], LazyJavaClassifierType@27['List<E>'], LazyJavaClassifierType@28['RandomAccess'], ... }
-}
-
-LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@29['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@26['AbstractList<E>'] {
-    arguments = ArrayList@30[1] { TypeProjectionImpl@31 }
-    classifier = JavaClassImpl@32['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@33['Cloneable'] {
-    classifier = JavaClassImpl@34['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Collection<? extends E>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@39['Collection']
-    memberScope = SubstitutingScope@40
-    nullable = 'false': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Collection<? extends E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@39['Collection']
-    memberScope = SubstitutingScope@46
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@17['Collection<E>'] {
-    classifier = JavaClassImpl@49['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@50['E'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@52['E']
-    nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@54['E'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['E']
-    nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@58['E'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['E']
-    nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@66['E'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@52['E']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@56['E']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@60['E']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@22['List<E>'] {
-    arguments = ArrayList@72[1] { TypeProjectionImpl@73 }
-    classifier = JavaClassImpl@74['List']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@27['List<E>'] {
-    classifier = JavaClassImpl@76['List']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@28['RandomAccess'] {
-    classifier = JavaClassImpl@80['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassifierType@81['Serializable'] {
-    classifier = JavaClassImpl@82['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@83 {
-    packageFragments('<root>': FqName@84) = LazyJavaPackageFragment@85['<root>']
-    packageFragments('AmbiguousHasNextIterator': FqName@86) = null
-    packageFragments('Boolean': FqName@87) = null
-    packageFragments('GoodIterator': FqName@88) = null
-    packageFragments('ImproperIterator1': FqName@89) = null
-    packageFragments('ImproperIterator2': FqName@90) = null
-    packageFragments('ImproperIterator3': FqName@91) = null
-    packageFragments('ImproperIterator4': FqName@92) = null
-    packageFragments('ImproperIterator5': FqName@93) = null
-    packageFragments('Int': FqName@94) = null
-    packageFragments('Iterator': FqName@95) = null
-    packageFragments('List': FqName@96) = null
-    packageFragments('NotRange1': FqName@97) = null
-    packageFragments('NotRange2': FqName@98) = null
-    packageFragments('NotRange3': FqName@99) = null
-    packageFragments('NotRange4': FqName@100) = null
-    packageFragments('NotRange5': FqName@101) = null
-    packageFragments('NotRange6': FqName@102) = null
-    packageFragments('NotRange7': FqName@103) = null
-    packageFragments('NotRange8': FqName@104) = null
-    packageFragments('Range0': FqName@105) = null
-    packageFragments('Range1': FqName@106) = null
-    packageFragments('String': FqName@107) = null
-    packageFragments('Unit': FqName@108) = null
-    packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
-    packageFragments('java.io': FqName@111) = LazyJavaPackageFragment@112['io']
-    packageFragments('java.lang': FqName@113) = LazyJavaPackageFragment@114['lang']
-    packageFragments('java.lang.AmbiguousHasNextIterator': FqName@115) = null
-    packageFragments('java.lang.Boolean': FqName@116) = null
-    packageFragments('java.lang.GoodIterator': FqName@117) = null
-    packageFragments('java.lang.ImproperIterator1': FqName@118) = null
-    packageFragments('java.lang.ImproperIterator2': FqName@119) = null
-    packageFragments('java.lang.ImproperIterator3': FqName@120) = null
-    packageFragments('java.lang.ImproperIterator5': FqName@121) = null
-    packageFragments('java.lang.Int': FqName@122) = null
-    packageFragments('java.lang.Iterator': FqName@123) = null
-    packageFragments('java.lang.List': FqName@124) = null
-    packageFragments('java.lang.NotRange1': FqName@125) = null
-    packageFragments('java.lang.NotRange2': FqName@126) = null
-    packageFragments('java.lang.NotRange3': FqName@127) = null
-    packageFragments('java.lang.NotRange4': FqName@128) = null
-    packageFragments('java.lang.NotRange5': FqName@129) = null
-    packageFragments('java.lang.NotRange6': FqName@130) = null
-    packageFragments('java.lang.NotRange7': FqName@131) = null
-    packageFragments('java.lang.NotRange8': FqName@132) = null
-    packageFragments('java.lang.Range0': FqName@133) = null
-    packageFragments('java.lang.Range1': FqName@134) = null
-    packageFragments('java.lang.String': FqName@135) = null
-    packageFragments('java.lang.Unit': FqName@136) = null
-    packageFragments('java.util': FqName@137) = LazyJavaPackageFragment@138['util']
-    packageFragments('java.util.AmbiguousHasNextIterator': FqName@139) = null
-    packageFragments('java.util.Boolean': FqName@140) = null
-    packageFragments('java.util.GoodIterator': FqName@141) = null
-    packageFragments('java.util.ImproperIterator1': FqName@142) = null
-    packageFragments('java.util.ImproperIterator2': FqName@143) = null
-    packageFragments('java.util.ImproperIterator3': FqName@144) = null
-    packageFragments('java.util.ImproperIterator5': FqName@145) = null
-    packageFragments('java.util.Int': FqName@146) = null
-    packageFragments('java.util.Iterator': FqName@147) = null
-    packageFragments('java.util.List': FqName@148) = null
-    packageFragments('java.util.NotRange1': FqName@149) = null
-    packageFragments('java.util.NotRange2': FqName@150) = null
-    packageFragments('java.util.NotRange3': FqName@151) = null
-    packageFragments('java.util.NotRange4': FqName@152) = null
-    packageFragments('java.util.NotRange5': FqName@153) = null
-    packageFragments('java.util.NotRange6': FqName@154) = null
-    packageFragments('java.util.NotRange7': FqName@155) = null
-    packageFragments('java.util.NotRange8': FqName@156) = null
-    packageFragments('java.util.Range0': FqName@157) = null
-    packageFragments('java.util.Range1': FqName@158) = null
-    packageFragments('java.util.String': FqName@159) = null
-    packageFragments('java.util.Unit': FqName@160) = null
-    packageFragments('kotlin': FqName@161) = null
-    packageFragments('kotlin.AmbiguousHasNextIterator': FqName@162) = null
-    packageFragments('kotlin.Boolean': FqName@163) = null
-    packageFragments('kotlin.GoodIterator': FqName@164) = null
-    packageFragments('kotlin.ImproperIterator1': FqName@165) = null
-    packageFragments('kotlin.ImproperIterator2': FqName@166) = null
-    packageFragments('kotlin.ImproperIterator3': FqName@167) = null
-    packageFragments('kotlin.ImproperIterator5': FqName@168) = null
-    packageFragments('kotlin.Int': FqName@169) = null
-    packageFragments('kotlin.Iterator': FqName@170) = null
-    packageFragments('kotlin.List': FqName@171) = null
-    packageFragments('kotlin.NotRange1': FqName@172) = null
-    packageFragments('kotlin.NotRange2': FqName@173) = null
-    packageFragments('kotlin.NotRange3': FqName@174) = null
-    packageFragments('kotlin.NotRange4': FqName@175) = null
-    packageFragments('kotlin.NotRange5': FqName@176) = null
-    packageFragments('kotlin.NotRange6': FqName@177) = null
-    packageFragments('kotlin.NotRange7': FqName@178) = null
-    packageFragments('kotlin.NotRange8': FqName@179) = null
-    packageFragments('kotlin.Range0': FqName@180) = null
-    packageFragments('kotlin.Range1': FqName@181) = null
-    packageFragments('kotlin.String': FqName@182) = null
-    packageFragments('kotlin.Unit': FqName@183) = null
-    packageFragments('kotlin.io': FqName@184) = null
-    packageFragments('kotlin.jvm': FqName@185) = null
-    topLevelClasses(JavaClassImpl@29['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@32['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@186['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@187['Iterator']) = LazyJavaClassDescriptor@188['Iterator']
-    topLevelClasses(JavaClassImpl@189['List']) = LazyJavaClassDescriptor@190['List']
-    topLevelClasses(JavaClassImpl@80['RandomAccess']) = LazyJavaClassDescriptor@12['RandomAccess']
-    topLevelClasses(JavaClassImpl@82['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@85['<root>'] {
-    classes('ArrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Boolean': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Int': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Iterator': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('List': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('String': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Unit': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('hasNext': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('invoke': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('iterator': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('java': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('next': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('ArrayList': Name@191) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('hasNext': Name@199) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('invoke': Name@200) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('iterator': Name@201) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('java': Name@206) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('next': Name@203) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@192
-}
-
-LazyJavaPackageFragment@110['java'] {
-    classes('lang': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@209
-    classes('util': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@209
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@209
-    functions('lang': Name@211) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@209
-    functions('util': Name@212) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@209
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@209
-}
-
-LazyJavaPackageFragment@114['lang'] {
-    classes('ArrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('hasNext': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('invoke': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('iterator': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('next': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('ArrayList': Name@191) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('hasNext': Name@199) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('invoke': Name@200) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('iterator': Name@201) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('next': Name@203) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@214
-}
-
-LazyJavaPackageFragment@138['util'] {
-    classes('ArrayList': Name@191) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Boolean': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Int': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Iterator': Name@195) = LazyJavaClassDescriptor@188['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('List': Name@196) = LazyJavaClassDescriptor@190['List'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('String': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Unit': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('hasNext': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('invoke': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iterator': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('next': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('ArrayList': Name@191) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('hasNext': Name@199) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('invoke': Name@200) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('iterator': Name@201) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('next': Name@203) = EmptyList@205[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@216
-}
-
-LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@218['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@219[1] { NullableType@220 }
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@24['E']
-}
-
-LazyJavaTypeParameterResolver@223 {
-    resolve(JavaTypeParameterImpl@56['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[3] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336 }
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
-
-null {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@379[3] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336 }
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-    <name not found> = EmptyList@205[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
deleted file mode 100644
index a89a7464787..00000000000
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
+++ /dev/null
@@ -1,804 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('foo.Any': FqName@11) = null
-    packageFragments('foo.Array': FqName@12) = null
-    packageFragments('foo.Int': FqName@13) = null
-    packageFragments('foo.String': FqName@14) = null
-    packageFragments('foo.T': FqName@15) = null
-    packageFragments('foo.Unit': FqName@16) = null
-    packageFragments('foo.a': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Any': FqName@22) = null
-    packageFragments('java.lang.Array': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.String': FqName@25) = null
-    packageFragments('java.lang.T': FqName@26) = null
-    packageFragments('java.lang.Unit': FqName@27) = null
-    packageFragments('java.lang.a': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Any': FqName@30) = null
-    packageFragments('kotlin.Array': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.String': FqName@33) = null
-    packageFragments('kotlin.T': FqName@34) = null
-    packageFragments('kotlin.Unit': FqName@35) = null
-    packageFragments('kotlin.a': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('a': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('f': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('foo1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('foo2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('fooT1': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('fooT2': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('invoke': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('a': Name@54) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('f': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('foo': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('foo1': Name@49) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('foo2': Name@50) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('fooT1': Name@51) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('fooT2': Name@52) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('invoke': Name@53) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-null {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
deleted file mode 100644
index 07fb1284664..00000000000
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
+++ /dev/null
@@ -1,516 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = CharValue@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@4['String']
-}
-
-LazyJavaClassDescriptor@5['Exception'] {
-    constructors = ArrayList@6[5] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['Exception']
-}
-
-LazyJavaClassDescriptor@13['StringBuilder'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@12['Exception'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@14['StringBuilder'] {
-    parameters = ArrayList@18[empty]
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@37['Throwable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@49['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@51['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@17['Throwable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('A': FqName@58) = null
-    packageFragments('Any': FqName@59) = null
-    packageFragments('B': FqName@60) = null
-    packageFragments('Boolean': FqName@61) = null
-    packageFragments('Char': FqName@62) = null
-    packageFragments('Int': FqName@63) = null
-    packageFragments('Nothing': FqName@64) = null
-    packageFragments('String': FqName@65) = null
-    packageFragments('StringBuilder': FqName@66) = null
-    packageFragments('Unit': FqName@67) = null
-    packageFragments('a': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.Any': FqName@73) = null
-    packageFragments('java.lang.Boolean': FqName@74) = null
-    packageFragments('java.lang.Char': FqName@75) = null
-    packageFragments('java.lang.Int': FqName@76) = null
-    packageFragments('java.lang.Nothing': FqName@77) = null
-    packageFragments('java.lang.String': FqName@78) = null
-    packageFragments('java.lang.StringBuilder': FqName@79) = null
-    packageFragments('java.lang.Unit': FqName@80) = null
-    packageFragments('kotlin': FqName@81) = null
-    packageFragments('kotlin.Any': FqName@82) = null
-    packageFragments('kotlin.Boolean': FqName@83) = null
-    packageFragments('kotlin.Char': FqName@84) = null
-    packageFragments('kotlin.Int': FqName@85) = null
-    packageFragments('kotlin.Nothing': FqName@86) = null
-    packageFragments('kotlin.String': FqName@87) = null
-    packageFragments('kotlin.StringBuilder': FqName@88) = null
-    packageFragments('kotlin.Unit': FqName@89) = null
-    packageFragments('kotlin.io': FqName@90) = null
-    packageFragments('kotlin.jvm': FqName@91) = null
-    topLevelClasses(JavaClassImpl@92['Exception']) = LazyJavaClassDescriptor@5['Exception']
-    topLevelClasses(JavaClassImpl@93['StringBuilder']) = LazyJavaClassDescriptor@13['StringBuilder']
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('Any': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Boolean': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Char': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Exception': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Nothing': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('StringBuilder': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('returnNothing': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('Exception': Name@98) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('plusAssign': Name@104) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('returnNothing': Name@105) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('lang': Name@111) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-LazyJavaPackageFragment@72['lang'] {
-    classes('Exception': Name@98) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('StringBuilder': Name@102) = LazyJavaClassDescriptor@13['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('returnNothing': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Exception': Name@98) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('plusAssign': Name@104) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('returnNothing': Name@105) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[4] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[7] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[7] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[7] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[7] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[7] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[7] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[7] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[7] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[7] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[7] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[7] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[7] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[7] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[7] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[7] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[7] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-null {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@353[5] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@354[5] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-    <name not found> = ArrayList@355[7] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@356[7] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@357[7] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@358[7] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@359[7] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@361[7] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-    <name not found> = ArrayList@362[7] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
-    <name not found> = ArrayList@363[7] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-    <name not found> = ArrayList@364[7] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-    <name not found> = ArrayList@365[7] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
-    <name not found> = ArrayList@366[7] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = ArrayList@367[7] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
-    <name not found> = ArrayList@368[7] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
-    <name not found> = ArrayList@369[7] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
-    <name not found> = ArrayList@370[7] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-    <name not found> = ArrayList@371[7] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@372[7] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@373[7] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = ArrayList@374[7] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@375[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = ArrayList@376[7] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-    <name not found> = ArrayList@377[8] { ResolutionCandidate@321, ResolutionCandidate@322, ResolutionCandidate@323, ... }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.lazy.log b/compiler/testData/diagnostics/tests/GenericArgumentConsistency.lazy.log
deleted file mode 100644
index b59f2c2ad55..00000000000
--- a/compiler/testData/diagnostics/tests/GenericArgumentConsistency.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('A1': FqName@4) = null
-    packageFragments('AA1': FqName@5) = null
-    packageFragments('AB1': FqName@6) = null
-    packageFragments('AB3': FqName@7) = null
-    packageFragments('Any': FqName@8) = null
-    packageFragments('B': FqName@9) = null
-    packageFragments('B1': FqName@10) = null
-    packageFragments('B2': FqName@11) = null
-    packageFragments('BA1': FqName@12) = null
-    packageFragments('BB1': FqName@13) = null
-    packageFragments('BB2': FqName@14) = null
-    packageFragments('Boolean': FqName@15) = null
-    packageFragments('C': FqName@16) = null
-    packageFragments('C1': FqName@17) = null
-    packageFragments('Comparable': FqName@18) = null
-    packageFragments('D': FqName@19) = null
-    packageFragments('Double': FqName@20) = null
-    packageFragments('Int': FqName@21) = null
-    packageFragments('Number': FqName@22) = null
-    packageFragments('T': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.A': FqName@28) = null
-    packageFragments('java.lang.A1': FqName@29) = null
-    packageFragments('java.lang.AA1': FqName@30) = null
-    packageFragments('java.lang.AB1': FqName@31) = null
-    packageFragments('java.lang.AB3': FqName@32) = null
-    packageFragments('java.lang.Any': FqName@33) = null
-    packageFragments('java.lang.B': FqName@34) = null
-    packageFragments('java.lang.B1': FqName@35) = null
-    packageFragments('java.lang.BA1': FqName@36) = null
-    packageFragments('java.lang.BB1': FqName@37) = null
-    packageFragments('java.lang.Boolean': FqName@38) = null
-    packageFragments('java.lang.C': FqName@39) = null
-    packageFragments('java.lang.Comparable': FqName@40) = null
-    packageFragments('java.lang.Double': FqName@41) = null
-    packageFragments('java.lang.Int': FqName@42) = null
-    packageFragments('java.lang.Number': FqName@43) = null
-    packageFragments('java.lang.T': FqName@44) = null
-    packageFragments('kotlin': FqName@45) = null
-    packageFragments('kotlin.A': FqName@46) = null
-    packageFragments('kotlin.A1': FqName@47) = null
-    packageFragments('kotlin.AA1': FqName@48) = null
-    packageFragments('kotlin.AB1': FqName@49) = null
-    packageFragments('kotlin.AB3': FqName@50) = null
-    packageFragments('kotlin.Any': FqName@51) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.B1': FqName@53) = null
-    packageFragments('kotlin.BA1': FqName@54) = null
-    packageFragments('kotlin.BB1': FqName@55) = null
-    packageFragments('kotlin.Boolean': FqName@56) = null
-    packageFragments('kotlin.C': FqName@57) = null
-    packageFragments('kotlin.Comparable': FqName@58) = null
-    packageFragments('kotlin.Double': FqName@59) = null
-    packageFragments('kotlin.Int': FqName@60) = null
-    packageFragments('kotlin.Number': FqName@61) = null
-    packageFragments('kotlin.T': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    packageFragments('sx2': FqName@65) = null
-    packageFragments('sx2.AA1': FqName@66) = null
-    packageFragments('sx2.AB1': FqName@67) = null
-    packageFragments('sx2.AB2': FqName@68) = null
-    packageFragments('sx2.AB3': FqName@69) = null
-    packageFragments('sx2.Comparable': FqName@70) = null
-    packageFragments('sx2.Int': FqName@71) = null
-    packageFragments('sx2.Number': FqName@72) = null
-    packageFragments('x': FqName@73) = null
-    packageFragments('x.AA1': FqName@74) = null
-    packageFragments('x.AB1': FqName@75) = null
-    packageFragments('x.AB2': FqName@76) = null
-    packageFragments('x.AB3': FqName@77) = null
-    packageFragments('x.Comparable': FqName@78) = null
-    packageFragments('x.Int': FqName@79) = null
-    packageFragments('x.Number': FqName@80) = null
-    packageFragments('x2': FqName@81) = null
-    packageFragments('x2.AA1': FqName@82) = null
-    packageFragments('x2.AB1': FqName@83) = null
-    packageFragments('x2.AB2': FqName@84) = null
-    packageFragments('x2.AB3': FqName@85) = null
-    packageFragments('x2.Any': FqName@86) = null
-    packageFragments('x2.Comparable': FqName@87) = null
-    packageFragments('x2.Int': FqName@88) = null
-    packageFragments('x2.Number': FqName@89) = null
-    packageFragments('x3': FqName@90) = null
-    packageFragments('x3.AA1': FqName@91) = null
-    packageFragments('x3.AB1': FqName@92) = null
-    packageFragments('x3.AB2': FqName@93) = null
-    packageFragments('x3.AB3': FqName@94) = null
-    packageFragments('x3.Any': FqName@95) = null
-    packageFragments('x3.Comparable': FqName@96) = null
-    packageFragments('x3.Int': FqName@97) = null
-    packageFragments('x3.Number': FqName@98) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Boolean': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Double': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Int': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@107) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@105
-}
diff --git a/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log b/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
deleted file mode 100644
index 21155b4c817..00000000000
--- a/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log b/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
deleted file mode 100644
index 50fec51af5e..00000000000
--- a/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
+++ /dev/null
@@ -1,170 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['IllegalModifiers6']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@9
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@13
-}
-
-LazyAnnotationDescriptor@14 {
-    resolutionResults = OverloadResolutionResultsImpl@15
-    type = JetTypeImpl@16['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = StringValue@17
-}
-
-LazyAnnotationDescriptor@18 {
-    resolutionResults = OverloadResolutionResultsImpl@19
-    type = JetTypeImpl@20['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
-}
-
-LazyAnnotationDescriptor@21 {
-    resolutionResults = OverloadResolutionResultsImpl@22
-    type = JetTypeImpl@23['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
-}
-
-LazyAnnotationDescriptor@24 {
-    resolutionResults = OverloadResolutionResultsImpl@25
-    type = JetTypeImpl@26['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
-}
-
-LazyAnnotationDescriptor@27 {
-    resolutionResults = OverloadResolutionResultsImpl@28
-    type = JetTypeImpl@29['annotated']
-    valueArguments(ValueParameterDescriptorImpl@8['text']) = null
-}
-
-LazyJavaClassDescriptor@30['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@31['Exception']
-}
-
-LazyJavaClassTypeConstructor@31['Exception'] {
-    parameters = ArrayList@32[empty]
-    supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Throwable'] }
-}
-
-LazyJavaClassifierType@34['Throwable'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@39) = LazyJavaPackageFragment@40['<root>']
-    packageFragments('Exception': FqName@41) = null
-    packageFragments('IllegalModifiers6': FqName@42) = null
-    packageFragments('Int': FqName@43) = null
-    packageFragments('String': FqName@44) = null
-    packageFragments('annotated': FqName@45) = null
-    packageFragments('illegal_modifiers': FqName@46) = null
-    packageFragments('illegal_modifiers.A': FqName@47) = null
-    packageFragments('illegal_modifiers.C': FqName@48) = null
-    packageFragments('illegal_modifiers.D': FqName@49) = null
-    packageFragments('illegal_modifiers.Exception': FqName@50) = null
-    packageFragments('illegal_modifiers.FinalClass': FqName@51) = null
-    packageFragments('illegal_modifiers.IllegalModifiers1': FqName@52) = null
-    packageFragments('illegal_modifiers.IllegalModifiers2': FqName@53) = null
-    packageFragments('illegal_modifiers.IllegalModifiers3': FqName@54) = null
-    packageFragments('illegal_modifiers.IllegalModifiers4': FqName@55) = null
-    packageFragments('illegal_modifiers.IllegalModifiers5': FqName@56) = null
-    packageFragments('illegal_modifiers.IllegalModifiers6': FqName@57) = null
-    packageFragments('illegal_modifiers.Int': FqName@58) = null
-    packageFragments('illegal_modifiers.LegalModifier': FqName@59) = null
-    packageFragments('illegal_modifiers.String': FqName@60) = null
-    packageFragments('illegal_modifiers.T': FqName@61) = null
-    packageFragments('illegal_modifiers.annotated': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.Exception': FqName@67) = null
-    packageFragments('java.lang.IllegalModifiers6': FqName@68) = null
-    packageFragments('java.lang.Int': FqName@69) = null
-    packageFragments('java.lang.String': FqName@70) = null
-    packageFragments('java.lang.annotated': FqName@71) = null
-    packageFragments('kotlin': FqName@72) = null
-    packageFragments('kotlin.Exception': FqName@73) = null
-    packageFragments('kotlin.IllegalModifiers6': FqName@74) = null
-    packageFragments('kotlin.Int': FqName@75) = null
-    packageFragments('kotlin.String': FqName@76) = null
-    packageFragments('kotlin.annotated': FqName@77) = null
-    packageFragments('kotlin.io': FqName@78) = null
-    packageFragments('kotlin.jvm': FqName@79) = null
-    topLevelClasses(JavaClassImpl@80['Exception']) = LazyJavaClassDescriptor@30['Exception']
-}
-
-LazyJavaPackageFragment@64['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@66['lang'] {
-    classes('Exception': Name@87) = LazyJavaClassDescriptor@30['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('i': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-null {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@85[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/IncDec.lazy.log b/compiler/testData/diagnostics/tests/IncDec.lazy.log
deleted file mode 100644
index bab7ccca78e..00000000000
--- a/compiler/testData/diagnostics/tests/IncDec.lazy.log
+++ /dev/null
@@ -1,320 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('IncDec': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('UnitIncDec': FqName@6) = null
-    packageFragments('WrongIncDec': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.IncDec': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.IncDec': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Unit': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('IncDec': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Unit': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('UnitIncDec': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('WrongIncDec': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('IncDec': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('UnitIncDec': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('WrongIncDec': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('IncDec': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('UnitIncDec': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('WrongIncDec': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('IncDec': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('UnitIncDec': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('WrongIncDec': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-null {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.lazy.log b/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/IncorrectCharacterLiterals.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
deleted file mode 100644
index 04e80f0dd9a..00000000000
--- a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = StringValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('ff': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('ff': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('ff': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('ff': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/IsExpressions.lazy.log b/compiler/testData/diagnostics/tests/IsExpressions.lazy.log
deleted file mode 100644
index 57c39c40e0b..00000000000
--- a/compiler/testData/diagnostics/tests/IsExpressions.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Boolean': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Boolean': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log b/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
deleted file mode 100644
index 54407a258ca..00000000000
--- a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
+++ /dev/null
@@ -1,1721 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Ab': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('C': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Ab': FqName@17) = null
-    packageFragments('java.lang.Array': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.String': FqName@22) = null
-    packageFragments('java.lang.Unit': FqName@23) = null
-    packageFragments('java.lang.z': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Ab': FqName@26) = null
-    packageFragments('kotlin.Array': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.C': FqName@29) = null
-    packageFragments('kotlin.Int': FqName@30) = null
-    packageFragments('kotlin.String': FqName@31) = null
-    packageFragments('kotlin.Unit': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('kotlin.z': FqName@35) = null
-    packageFragments('lvalue_assignment': FqName@36) = null
-    packageFragments('lvalue_assignment.A': FqName@37) = null
-    packageFragments('lvalue_assignment.Ab': FqName@38) = null
-    packageFragments('lvalue_assignment.Array': FqName@39) = null
-    packageFragments('lvalue_assignment.B': FqName@40) = null
-    packageFragments('lvalue_assignment.C': FqName@41) = null
-    packageFragments('lvalue_assignment.D': FqName@42) = null
-    packageFragments('lvalue_assignment.Int': FqName@43) = null
-    packageFragments('lvalue_assignment.String': FqName@44) = null
-    packageFragments('lvalue_assignment.Test': FqName@45) = null
-    packageFragments('lvalue_assignment.Unit': FqName@46) = null
-    packageFragments('lvalue_assignment.z': FqName@47) = null
-    packageFragments('z': FqName@48) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('A': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('D': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('getInt': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('plusAssign': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('set': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('z': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('A': Name@55) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('D': Name@57) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('foo': Name@58) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('getInt': Name@59) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('inc': Name@60) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('plusAssign': Name@61) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('set': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('z': Name@64) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[8] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[8] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[8] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[8] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[8] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[8] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[8] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[8] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[8] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[8] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[8] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[8] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[8] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-null {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@533[8] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-    <name not found> = ArrayList@534[8] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-    <name not found> = ArrayList@535[8] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-    <name not found> = ArrayList@536[8] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
-    <name not found> = ArrayList@537[8] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
-    <name not found> = ArrayList@538[8] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
-    <name not found> = ArrayList@539[8] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
-    <name not found> = ArrayList@540[8] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-    <name not found> = ArrayList@541[8] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-    <name not found> = ArrayList@542[8] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-    <name not found> = ArrayList@543[8] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-    <name not found> = ArrayList@544[8] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
-    <name not found> = ArrayList@545[8] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
-    <name not found> = ArrayList@546[8] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
-    <name not found> = ArrayList@547[8] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-    <name not found> = ArrayList@548[8] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log b/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
deleted file mode 100644
index 8061295fc83..00000000000
--- a/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
+++ /dev/null
@@ -1,180 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['Exception']
-}
-
-LazyJavaClassDescriptor@6['NullPointerException'] {
-    constructors = ArrayList@7[2] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['NullPointerException']
-}
-
-LazyJavaClassDescriptor@13['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Class'] {
-    parameters = ArrayList@15[1] { LazyJavaTypeParameterDescriptor@16['T'] }
-}
-
-LazyJavaClassTypeConstructor@5['Exception'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@12['NullPointerException'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@14['RuntimeException'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Exception'] }
-}
-
-LazyJavaClassifierType@25['Exception'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@5['Exception']
-}
-
-LazyJavaClassifierType@22['RuntimeException'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@14['RuntimeException']
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@19['Throwable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('Array': FqName@44) = null
-    packageFragments('Int': FqName@45) = null
-    packageFragments('T': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.Array': FqName@49) = null
-    packageFragments('java.Int': FqName@50) = null
-    packageFragments('java.T': FqName@51) = null
-    packageFragments('java.c': FqName@52) = null
-    packageFragments('java.lang': FqName@53) = LazyJavaPackageFragment@54['lang']
-    packageFragments('java.lang.Array': FqName@55) = null
-    packageFragments('java.lang.Class': FqName@56) = null
-    packageFragments('java.lang.Int': FqName@57) = null
-    packageFragments('java.lang.T': FqName@58) = null
-    packageFragments('java.length': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Array': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.T': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@27['Exception']) = LazyJavaClassDescriptor@4['Exception']
-    topLevelClasses(JavaClassImpl@67['NullPointerException']) = LazyJavaClassDescriptor@6['NullPointerException']
-    topLevelClasses(JavaClassImpl@29['RuntimeException']) = LazyJavaClassDescriptor@13['RuntimeException']
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('Array': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('NullPointerException': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('equals': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('NullPointerException': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('equals': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@76) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@54['lang'] {
-    classes('Class': Name@78) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('NullPointerException': Name@71) = LazyJavaClassDescriptor@6['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('equals': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('NullPointerException': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('equals': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaTypeParameterDescriptor@16['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
-    upperBounds = LinkedHashSet@83[1] { NullableType@84 }
-    upperBoundsAsType = NullableType@84
-}
-
-LazyJavaTypeParameterResolver@85 {
-    resolve(JavaTypeParameterImpl@86['T']) = LazyJavaTypeParameterDescriptor@16['T']
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@106[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@97, ResolutionCandidate@98 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log b/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
deleted file mode 100644
index 56aa8c2d3ba..00000000000
--- a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
+++ /dev/null
@@ -1,280 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-    <name not found> = StringValue@2
-    <name not found> = StringValue@3
-    <name not found> = StringValue@4
-    <name not found> = StringValue@5
-    <name not found> = StringValue@6
-    <name not found> = StringValue@7
-    <name not found> = StringValue@8
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('String': FqName@12) = null
-    packageFragments('a': FqName@13) = null
-    packageFragments('b': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.a': FqName@20) = null
-    packageFragments('java.lang.b': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.a': FqName@24) = null
-    packageFragments('kotlin.b': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('a': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('b': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('a': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('b': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log b/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
deleted file mode 100644
index 50ef8bce1ed..00000000000
--- a/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
+++ /dev/null
@@ -1,454 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Unit']
-    <name not found> = JetTypeImpl@3['Unit']
-    <name not found> = JetTypeImpl@4['Unit']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('B': FqName@9) = null
-    packageFragments('Bar': FqName@10) = null
-    packageFragments('C': FqName@11) = null
-    packageFragments('Double': FqName@12) = null
-    packageFragments('Foo': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('Jet87': FqName@15) = null
-    packageFragments('Jet87.A': FqName@16) = null
-    packageFragments('Jet87.B': FqName@17) = null
-    packageFragments('Jet87.Bar': FqName@18) = null
-    packageFragments('Jet87.Buzz': FqName@19) = null
-    packageFragments('Jet87.C': FqName@20) = null
-    packageFragments('Jet87.D': FqName@21) = null
-    packageFragments('Jet87.Double': FqName@22) = null
-    packageFragments('Jet87.Foo': FqName@23) = null
-    packageFragments('Jet87.G': FqName@24) = null
-    packageFragments('Jet87.Int': FqName@25) = null
-    packageFragments('Jet87.T': FqName@26) = null
-    packageFragments('Jet87.Test': FqName@27) = null
-    packageFragments('Jet87.Test1': FqName@28) = null
-    packageFragments('Jet87.X': FqName@29) = null
-    packageFragments('Jet87.Y': FqName@30) = null
-    packageFragments('Jet87.nioho': FqName@31) = null
-    packageFragments('Jet87.t1': FqName@32) = null
-    packageFragments('Jet87.t2': FqName@33) = null
-    packageFragments('Jet87.t3': FqName@34) = null
-    packageFragments('Jet87.x': FqName@35) = null
-    packageFragments('T': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.A': FqName@41) = null
-    packageFragments('java.lang.B': FqName@42) = null
-    packageFragments('java.lang.Bar': FqName@43) = null
-    packageFragments('java.lang.C': FqName@44) = null
-    packageFragments('java.lang.Double': FqName@45) = null
-    packageFragments('java.lang.Foo': FqName@46) = null
-    packageFragments('java.lang.Int': FqName@47) = null
-    packageFragments('java.lang.T': FqName@48) = null
-    packageFragments('java.lang.nioho': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.A': FqName@51) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.Bar': FqName@53) = null
-    packageFragments('kotlin.C': FqName@54) = null
-    packageFragments('kotlin.Double': FqName@55) = null
-    packageFragments('kotlin.Foo': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.T': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    packageFragments('kotlin.nioho': FqName@61) = null
-    packageFragments('nioho': FqName@62) = null
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@40['lang'] {
-    classes('A': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('C': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Test1': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('nioho': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('test2': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('A': Name@69) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('C': Name@71) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Test1': Name@72) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('test2': Name@74) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-null {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Nullability.lazy.log b/compiler/testData/diagnostics/tests/Nullability.lazy.log
deleted file mode 100644
index b8a4b425540..00000000000
--- a/compiler/testData/diagnostics/tests/Nullability.lazy.log
+++ /dev/null
@@ -1,2725 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Appendable'] {
-    defaultType = JetTypeImpl@3['Appendable']
-    functions('equals': Name@4) = ArrayList@5[1] { DeserializedSimpleFunctionDescriptor@6['equals'] } // through LazyJavaClassMemberScope@7
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@7
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
-}
-
-LazyJavaClassDescriptor@13['AutoCloseable'] {
-    functions('equals': Name@4) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['equals'] } // through LazyJavaClassMemberScope@16
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@16
-    functions('read': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@16
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@16
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@16
-    properties('read': Name@19) = EmptyList@9[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@21['Closeable'] {
-    defaultType = JetTypeImpl@22['Closeable']
-    functions('equals': Name@4) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['equals'] } // through LazyJavaClassMemberScope@25
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    functions('read': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@25
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    properties('read': Name@19) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassDescriptor@28['FilterOutputStream'] {
-    defaultType = JetTypeImpl@29['FilterOutputStream']
-    functions('equals': Name@4) = ArrayList@30[1] { DeserializedSimpleFunctionDescriptor@31['equals'] } // through LazyJavaClassMemberScope@32
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@32
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@35['InputStream'] {
-    defaultType = JetTypeImpl@36['InputStream']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@38
-    functions('equals': Name@4) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@38
-    functions('read': Name@41) = ArrayList@42[3] { JavaMethodDescriptor@43['read'], JavaMethodDescriptor@44['read'], JavaMethodDescriptor@45['read'] } // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@38
-    nestedClassIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@38
-    nestedClasses('equals': Name@4) = null // through LazyJavaClassMemberScope@38
-    nestedClasses('read': Name@41) = null // through LazyJavaClassMemberScope@38
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    properties('read': Name@19) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@49['InputStream']
-}
-
-LazyJavaClassDescriptor@50['OutputStream'] {
-    functions('equals': Name@4) = ArrayList@51[1] { DeserializedSimpleFunctionDescriptor@52['equals'] } // through LazyJavaClassMemberScope@53
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
-}
-
-LazyJavaClassDescriptor@56['PrintStream'] {
-    defaultType = JetTypeImpl@57['PrintStream']
-    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
-    functions('equals': Name@4) = ArrayList@60[1] { DeserializedSimpleFunctionDescriptor@61['equals'] } // through LazyJavaClassMemberScope@59
-    functions('println': Name@62) = ArrayList@63[10] { JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], JavaMethodDescriptor@66['println'], ... } // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@67 // through LazyJavaClassMemberScope@59
-    nestedClassIndex = LinkedHashMap@68 // through LazyJavaClassMemberScope@59
-    nestedClasses('equals': Name@4) = null // through LazyJavaClassMemberScope@59
-    nestedClasses('println': Name@62) = null // through LazyJavaClassMemberScope@59
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@59
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@59
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@69['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@70['PrintStream']
-}
-
-LazyJavaClassTypeConstructor@12['Appendable'] {
-    parameters = ArrayList@71[empty]
-    supertypes = ArrayList@72[1] { JetTypeImpl@73['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['AutoCloseable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { JetTypeImpl@73['Any'] }
-}
-
-LazyJavaClassTypeConstructor@27['Closeable'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[1] { LazyJavaClassifierType@78['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@34['FilterOutputStream'] {
-    parameters = ArrayList@79[empty]
-    supertypes = ArrayList@80[1] { LazyJavaClassifierType@81['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@49['InputStream'] {
-    parameters = ArrayList@82[empty]
-    supertypes = ArrayList@83[1] { LazyJavaClassifierType@84['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@55['OutputStream'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@70['PrintStream'] {
-    parameters = ArrayList@88[empty]
-    supertypes = ArrayList@89[3] { LazyJavaClassifierType@90['FilterOutputStream'], LazyJavaClassifierType@91['Appendable'], LazyJavaClassifierType@92['Closeable'] }
-}
-
-LazyJavaClassifierType@91['Appendable'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['Appendable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
-}
-
-LazyJavaClassifierType@78['AutoCloseable'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@16
-    nullable = 'false': Boolean@97
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
-}
-
-LazyJavaClassifierType@87['Closeable'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['Closeable']
-    memberScope = LazyJavaClassMemberScope@25
-    nullable = 'false': Boolean@97
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@84['Closeable'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['Closeable']
-    memberScope = LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@92['Closeable'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['Closeable']
-    memberScope = LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@90['FilterOutputStream'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['FilterOutputStream']
-}
-
-LazyJavaClassifierType@106['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@107
-}
-
-LazyJavaClassifierType@108['Object'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['Object']
-    nullable = 'false': Boolean@97
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@112['Object'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@110['Object']
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@115['Object'] {
-    classifier = JavaClassImpl@116['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@117['Object'] {
-    classifier = JavaClassImpl@118['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@119['Object'] {
-    classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@121['Object'] {
-    classifier = JavaClassImpl@122['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@81['OutputStream'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@124['OutputStream']
-    memberScope = LazyJavaClassMemberScope@53
-    nullable = 'false': Boolean@97
-    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
-}
-
-LazyJavaClassifierType@125['String'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'false': Boolean@97
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@129['String'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaPackageFragmentProvider@131 {
-    packageFragments('<root>': FqName@132) = LazyJavaPackageFragment@133['<root>']
-    packageFragments('Int': FqName@134) = null
-    packageFragments('String': FqName@135) = null
-    packageFragments('java': FqName@136) = LazyJavaPackageFragment@137['java']
-    packageFragments('java.io': FqName@138) = LazyJavaPackageFragment@139['io']
-    packageFragments('java.io.InputStream': FqName@140) = null
-    packageFragments('java.io.PrintStream': FqName@141) = null
-    packageFragments('java.lang': FqName@142) = LazyJavaPackageFragment@143['lang']
-    packageFragments('java.lang.Int': FqName@144) = null
-    packageFragments('java.lang.String': FqName@145) = null
-    packageFragments('kotlin': FqName@146) = null
-    packageFragments('kotlin.Int': FqName@147) = null
-    packageFragments('kotlin.String': FqName@148) = null
-    packageFragments('kotlin.io': FqName@149) = null
-    packageFragments('kotlin.jvm': FqName@150) = null
-    topLevelClasses(JavaClassImpl@94['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@96['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
-    topLevelClasses(JavaClassImpl@103['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
-    topLevelClasses(JavaClassImpl@105['FilterOutputStream']) = LazyJavaClassDescriptor@28['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@151['InputStream']) = LazyJavaClassDescriptor@35['InputStream']
-    topLevelClasses(JavaClassImpl@124['OutputStream']) = LazyJavaClassDescriptor@50['OutputStream']
-    topLevelClasses(JavaClassImpl@152['PrintStream']) = LazyJavaClassDescriptor@56['PrintStream']
-}
-
-LazyJavaPackageFragment@133['<root>'] {
-    classes('Int': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('String': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('Unit': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('get': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('java': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('get': Name@157) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@154
-}
-
-LazyJavaPackageFragment@139['io'] {
-    classes('InputStream': Name@161) = LazyJavaClassDescriptor@35['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('PrintStream': Name@163) = LazyJavaClassDescriptor@56['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@137['java'] {
-    classes('io': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('lang': Name@167) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@165
-}
-
-LazyJavaPackageFragment@143['lang'] {
-    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('get': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('java': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('get': Name@157) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@169
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[10] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[10] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[10] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[10] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[10] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[10] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[10] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[10] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[10] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[10] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[10] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[10] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[10] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[10] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[10] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[10] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[10] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[10] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[10] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[10] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[10] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[10] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[10] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[10] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[10] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[10] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[10] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[16] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@491 {
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@506 {
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@521 {
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@526 {
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@531 {
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-}
-
-ResolutionTaskHolder@651 {
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-}
-
-ResolutionTaskHolder@663 {
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-}
-
-ResolutionTaskHolder@675 {
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
-}
-
-ResolutionTaskHolder@678 {
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
-}
-
-ResolutionTaskHolder@681 {
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-}
-
-ResolutionTaskHolder@687 {
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
-}
-
-ResolutionTaskHolder@690 {
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
-}
-
-ResolutionTaskHolder@693 {
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-}
-
-ResolutionTaskHolder@699 {
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
-}
-
-ResolutionTaskHolder@702 {
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
-}
-
-ResolutionTaskHolder@705 {
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-}
-
-ResolutionTaskHolder@711 {
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
-}
-
-ResolutionTaskHolder@714 {
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
-}
-
-ResolutionTaskHolder@717 {
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
-}
-
-ResolutionTaskHolder@726 {
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
-}
-
-ResolutionTaskHolder@729 {
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-}
-
-ResolutionTaskHolder@735 {
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
-}
-
-ResolutionTaskHolder@738 {
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
-}
-
-ResolutionTaskHolder@741 {
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-}
-
-ResolutionTaskHolder@744 {
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
-}
-
-ResolutionTaskHolder@750 {
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
-}
-
-ResolutionTaskHolder@753 {
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-}
-
-ResolutionTaskHolder@756 {
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
-}
-
-ResolutionTaskHolder@759 {
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
-}
-
-ResolutionTaskHolder@762 {
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
-}
-
-ResolutionTaskHolder@765 {
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-}
-
-ResolutionTaskHolder@768 {
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
-}
-
-ResolutionTaskHolder@771 {
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
-}
-
-ResolutionTaskHolder@774 {
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@776 }
-}
-
-ResolutionTaskHolder@777 {
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
-}
-
-ResolutionTaskHolder@780 {
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
-}
-
-ResolutionTaskHolder@783 {
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@785 }
-}
-
-ResolutionTaskHolder@786 {
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@788 }
-}
-
-ResolutionTaskHolder@789 {
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
-}
-
-ResolutionTaskHolder@792 {
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@794 }
-}
-
-ResolutionTaskHolder@795 {
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@797 }
-}
-
-ResolutionTaskHolder@798 {
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@800 }
-}
-
-ResolutionTaskHolder@801 {
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
-}
-
-ResolutionTaskHolder@804 {
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@806 }
-}
-
-ResolutionTaskHolder@807 {
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@809 }
-}
-
-ResolutionTaskHolder@810 {
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@812 }
-}
-
-ResolutionTaskHolder@813 {
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
-}
-
-ResolutionTaskHolder@816 {
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@818 }
-}
-
-ResolutionTaskHolder@819 {
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@821 }
-}
-
-ResolutionTaskHolder@822 {
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@824 }
-}
-
-ResolutionTaskHolder@825 {
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
-}
-
-ResolutionTaskHolder@828 {
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@830 }
-}
-
-ResolutionTaskHolder@831 {
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@833 }
-}
-
-ResolutionTaskHolder@834 {
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@836 }
-}
-
-ResolutionTaskHolder@837 {
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
-}
-
-ResolutionTaskHolder@840 {
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@842 }
-}
-
-ResolutionTaskHolder@843 {
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@845 }
-}
-
-ResolutionTaskHolder@846 {
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@848 }
-}
-
-ResolutionTaskHolder@849 {
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@851 }
-}
-
-ResolutionTaskHolder@852 {
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@854 }
-}
-
-ResolutionTaskHolder@855 {
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@857 }
-}
-
-ResolutionTaskHolder@858 {
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@860 }
-}
-
-ResolutionTaskHolder@861 {
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@863 }
-}
-
-ResolutionTaskHolder@864 {
-    <name not found> = ArrayList@865[1] { ResolutionCandidate@866 }
-}
-
-ResolutionTaskHolder@867 {
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@869 }
-}
-
-ResolutionTaskHolder@870 {
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@872 }
-}
-
-ResolutionTaskHolder@873 {
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@875 }
-}
-
-ResolutionTaskHolder@876 {
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@878 }
-}
-
-ResolutionTaskHolder@879 {
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@881 }
-}
-
-ResolutionTaskHolder@882 {
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@884 }
-}
-
-ResolutionTaskHolder@885 {
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@887 }
-}
-
-ResolutionTaskHolder@888 {
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@890 }
-}
-
-ResolutionTaskHolder@891 {
-    <name not found> = ArrayList@892[1] { ResolutionCandidate@893 }
-}
-
-ResolutionTaskHolder@894 {
-    <name not found> = ArrayList@895[1] { ResolutionCandidate@896 }
-}
-
-ResolutionTaskHolder@897 {
-    <name not found> = ArrayList@898[1] { ResolutionCandidate@899 }
-}
-
-ResolutionTaskHolder@900 {
-    <name not found> = ArrayList@901[1] { ResolutionCandidate@902 }
-}
-
-ResolutionTaskHolder@903 {
-    <name not found> = ArrayList@904[1] { ResolutionCandidate@905 }
-}
-
-ResolutionTaskHolder@906 {
-    <name not found> = ArrayList@907[1] { ResolutionCandidate@908 }
-}
-
-ResolutionTaskHolder@909 {
-    <name not found> = ArrayList@910[1] { ResolutionCandidate@911 }
-}
-
-ResolutionTaskHolder@912 {
-    <name not found> = ArrayList@913[1] { ResolutionCandidate@914 }
-}
-
-ResolutionTaskHolder@915 {
-    <name not found> = ArrayList@916[1] { ResolutionCandidate@917 }
-}
-
-ResolutionTaskHolder@918 {
-    <name not found> = ArrayList@919[1] { ResolutionCandidate@920 }
-}
-
-ResolutionTaskHolder@921 {
-    <name not found> = ArrayList@922[1] { ResolutionCandidate@923 }
-}
-
-ResolutionTaskHolder@924 {
-    <name not found> = ArrayList@925[1] { ResolutionCandidate@926 }
-}
-
-ResolutionTaskHolder@927 {
-    <name not found> = ArrayList@928[1] { ResolutionCandidate@929 }
-}
-
-ResolutionTaskHolder@930 {
-    <name not found> = ArrayList@931[1] { ResolutionCandidate@932 }
-}
-
-ResolutionTaskHolder@933 {
-    <name not found> = ArrayList@934[1] { ResolutionCandidate@935 }
-}
-
-ResolutionTaskHolder@936 {
-    <name not found> = ArrayList@937[1] { ResolutionCandidate@938 }
-}
-
-ResolutionTaskHolder@939 {
-    <name not found> = ArrayList@940[1] { ResolutionCandidate@941 }
-}
-
-ResolutionTaskHolder@942 {
-    <name not found> = ArrayList@943[1] { ResolutionCandidate@944 }
-}
-
-ResolutionTaskHolder@945 {
-    <name not found> = ArrayList@946[1] { ResolutionCandidate@947 }
-}
-
-ResolutionTaskHolder@948 {
-    <name not found> = ArrayList@949[1] { ResolutionCandidate@950 }
-}
-
-ResolutionTaskHolder@951 {
-    <name not found> = ArrayList@952[1] { ResolutionCandidate@953 }
-}
-
-ResolutionTaskHolder@954 {
-    <name not found> = ArrayList@955[1] { ResolutionCandidate@956 }
-}
-
-ResolutionTaskHolder@957 {
-    <name not found> = ArrayList@958[1] { ResolutionCandidate@959 }
-}
-
-ResolutionTaskHolder@960 {
-    <name not found> = ArrayList@961[1] { ResolutionCandidate@962 }
-}
-
-ResolutionTaskHolder@963 {
-    <name not found> = ArrayList@964[1] { ResolutionCandidate@965 }
-}
-
-ResolutionTaskHolder@966 {
-    <name not found> = ArrayList@967[1] { ResolutionCandidate@968 }
-}
-
-ResolutionTaskHolder@969 {
-    <name not found> = ArrayList@970[1] { ResolutionCandidate@971 }
-}
-
-ResolutionTaskHolder@972 {
-    <name not found> = ArrayList@973[1] { ResolutionCandidate@974 }
-}
-
-ResolutionTaskHolder@975 {
-    <name not found> = ArrayList@976[1] { ResolutionCandidate@977 }
-}
-
-ResolutionTaskHolder@978 {
-    <name not found> = ArrayList@979[1] { ResolutionCandidate@980 }
-}
-
-ResolutionTaskHolder@981 {
-    <name not found> = ArrayList@982[1] { ResolutionCandidate@983 }
-}
-
-ResolutionTaskHolder@984 {
-    <name not found> = ArrayList@985[1] { ResolutionCandidate@986 }
-}
-
-ResolutionTaskHolder@987 {
-    <name not found> = ArrayList@988[1] { ResolutionCandidate@989 }
-}
-
-ResolutionTaskHolder@990 {
-    <name not found> = ArrayList@991[1] { ResolutionCandidate@992 }
-}
-
-ResolutionTaskHolder@993 {
-    <name not found> = ArrayList@994[1] { ResolutionCandidate@995 }
-}
-
-ResolutionTaskHolder@996 {
-    <name not found> = ArrayList@997[1] { ResolutionCandidate@998 }
-}
-
-ResolutionTaskHolder@999 {
-    <name not found> = ArrayList@1000[1] { ResolutionCandidate@1001 }
-}
-
-ResolutionTaskHolder@1002 {
-    <name not found> = ArrayList@1003[1] { ResolutionCandidate@1004 }
-}
-
-ResolutionTaskHolder@1005 {
-    <name not found> = ArrayList@1006[1] { ResolutionCandidate@1007 }
-}
-
-ResolutionTaskHolder@1008 {
-    <name not found> = ArrayList@1009[1] { ResolutionCandidate@1010 }
-}
-
-ResolutionTaskHolder@1011 {
-    <name not found> = ArrayList@1012[1] { ResolutionCandidate@1013 }
-}
-
-ResolutionTaskHolder@1014 {
-    <name not found> = ArrayList@1015[1] { ResolutionCandidate@1016 }
-}
-
-ResolutionTaskHolder@1017 {
-    <name not found> = ArrayList@1018[1] { ResolutionCandidate@1019 }
-}
-
-ResolutionTaskHolder@1020 {
-    <name not found> = ArrayList@1021[1] { ResolutionCandidate@1022 }
-}
-
-ResolutionTaskHolder@1023 {
-    <name not found> = ArrayList@1024[1] { ResolutionCandidate@1025 }
-}
-
-ResolutionTaskHolder@1026 {
-    <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
-}
-
-ResolutionTaskHolder@1029 {
-    <name not found> = ArrayList@1030[1] { ResolutionCandidate@1031 }
-}
-
-ResolutionTaskHolder@1032 {
-    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
-}
-
-ResolutionTaskHolder@1035 {
-    <name not found> = ArrayList@1036[1] { ResolutionCandidate@1037 }
-}
-
-ResolutionTaskHolder@1038 {
-    <name not found> = ArrayList@1039[1] { ResolutionCandidate@1040 }
-}
-
-ResolutionTaskHolder@1041 {
-    <name not found> = ArrayList@1042[1] { ResolutionCandidate@1043 }
-}
-
-ResolutionTaskHolder@1044 {
-    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
-}
-
-ResolutionTaskHolder@1047 {
-    <name not found> = ArrayList@1048[1] { ResolutionCandidate@1049 }
-}
-
-ResolutionTaskHolder@1050 {
-    <name not found> = ArrayList@1051[1] { ResolutionCandidate@1052 }
-}
-
-ResolutionTaskHolder@1053 {
-    <name not found> = ArrayList@1054[1] { ResolutionCandidate@1055 }
-}
-
-ResolutionTaskHolder@1056 {
-    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
-}
-
-ResolutionTaskHolder@1059 {
-    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
-}
-
-ResolutionTaskHolder@1062 {
-    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
-}
-
-ResolutionTaskHolder@1065 {
-    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
-}
-
-ResolutionTaskHolder@1068 {
-    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
-}
-
-ResolutionTaskHolder@1071 {
-    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
-}
-
-ResolutionTaskHolder@1074 {
-    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
-}
-
-ResolutionTaskHolder@1077 {
-    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
-}
-
-ResolutionTaskHolder@1080 {
-    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
-}
-
-ResolutionTaskHolder@1083 {
-    <name not found> = ArrayList@1084[1] { ResolutionCandidate@1085 }
-}
-
-ResolutionTaskHolder@1086 {
-    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1088 }
-}
-
-ResolutionTaskHolder@1089 {
-    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1091 }
-}
-
-ResolutionTaskHolder@1092 {
-    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
-}
-
-ResolutionTaskHolder@1095 {
-    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1097 }
-}
-
-ResolutionTaskHolder@1098 {
-    <name not found> = ArrayList@1099[1] { ResolutionCandidate@1100 }
-}
-
-ResolutionTaskHolder@1101 {
-    <name not found> = ArrayList@1102[1] { ResolutionCandidate@1103 }
-}
-
-ResolutionTaskHolder@1104 {
-    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
-}
-
-ResolutionTaskHolder@1107 {
-    <name not found> = ArrayList@1108[1] { ResolutionCandidate@1109 }
-}
-
-ResolutionTaskHolder@1110 {
-    <name not found> = ArrayList@1111[1] { ResolutionCandidate@1112 }
-}
-
-ResolutionTaskHolder@1113 {
-    <name not found> = ArrayList@1114[1] { ResolutionCandidate@1115 }
-}
-
-ResolutionTaskHolder@1116 {
-    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
-}
-
-ResolutionTaskHolder@1119 {
-    <name not found> = ArrayList@1120[1] { ResolutionCandidate@1121 }
-}
-
-ResolutionTaskHolder@1122 {
-    <name not found> = ArrayList@1123[1] { ResolutionCandidate@1124 }
-}
-
-ResolutionTaskHolder@1125 {
-    <name not found> = ArrayList@1126[1] { ResolutionCandidate@1127 }
-}
-
-ResolutionTaskHolder@1128 {
-    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
-}
-
-ResolutionTaskHolder@1131 {
-    <name not found> = ArrayList@1132[1] { ResolutionCandidate@1133 }
-}
-
-ResolutionTaskHolder@1134 {
-    <name not found> = ArrayList@1135[1] { ResolutionCandidate@1136 }
-}
-
-ResolutionTaskHolder@1137 {
-    <name not found> = ArrayList@1138[1] { ResolutionCandidate@1139 }
-}
-
-ResolutionTaskHolder@1140 {
-    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
-}
-
-ResolutionTaskHolder@1143 {
-    <name not found> = ArrayList@1144[1] { ResolutionCandidate@1145 }
-}
-
-ResolutionTaskHolder@1146 {
-    <name not found> = ArrayList@1147[1] { ResolutionCandidate@1148 }
-}
-
-ResolutionTaskHolder@1149 {
-    <name not found> = ArrayList@1150[1] { ResolutionCandidate@1151 }
-}
-
-ResolutionTaskHolder@1152 {
-    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
-}
-
-ResolutionTaskHolder@1155 {
-    <name not found> = ArrayList@1156[1] { ResolutionCandidate@1157 }
-}
-
-ResolutionTaskHolder@1158 {
-    <name not found> = ArrayList@1159[1] { ResolutionCandidate@1160 }
-}
-
-ResolutionTaskHolder@1161 {
-    <name not found> = ArrayList@1162[1] { ResolutionCandidate@1163 }
-}
-
-ResolutionTaskHolder@1164 {
-    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
-}
-
-ResolutionTaskHolder@1167 {
-    <name not found> = ArrayList@1168[1] { ResolutionCandidate@1169 }
-}
-
-ResolutionTaskHolder@1170 {
-    <name not found> = ArrayList@1171[1] { ResolutionCandidate@1172 }
-}
-
-ResolutionTaskHolder@1173 {
-    <name not found> = ArrayList@1174[1] { ResolutionCandidate@1175 }
-}
-
-ResolutionTaskHolder@1176 {
-    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
-}
-
-ResolutionTaskHolder@1179 {
-    <name not found> = ArrayList@1180[1] { ResolutionCandidate@1181 }
-}
-
-ResolutionTaskHolder@1182 {
-    <name not found> = ArrayList@1183[1] { ResolutionCandidate@1184 }
-}
-
-ResolutionTaskHolder@1185 {
-    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
-}
-
-ResolutionTaskHolder@1188 {
-    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
-}
-
-ResolutionTaskHolder@1191 {
-    <name not found> = ArrayList@1192[1] { ResolutionCandidate@1193 }
-}
-
-ResolutionTaskHolder@1194 {
-    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
-}
-
-ResolutionTaskHolder@1197 {
-    <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
-}
-
-ResolutionTaskHolder@1200 {
-    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
-}
-
-ResolutionTaskHolder@1203 {
-    <name not found> = ArrayList@1204[1] { ResolutionCandidate@1205 }
-}
-
-ResolutionTaskHolder@1206 {
-    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1208 }
-}
-
-ResolutionTaskHolder@1209 {
-    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
-}
-
-ResolutionTaskHolder@1212 {
-    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
-}
-
-ResolutionTaskHolder@1215 {
-    <name not found> = ArrayList@1216[1] { ResolutionCandidate@1217 }
-}
-
-ResolutionTaskHolder@1218 {
-    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1220 }
-}
-
-ResolutionTaskHolder@1221 {
-    <name not found> = ArrayList@1222[1] { ResolutionCandidate@1223 }
-}
-
-ResolutionTaskHolder@1224 {
-    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
-}
-
-ResolutionTaskHolder@1227 {
-    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
-}
-
-ResolutionTaskHolder@1230 {
-    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1232 }
-}
-
-ResolutionTaskHolder@1233 {
-    <name not found> = ArrayList@1234[1] { ResolutionCandidate@1235 }
-}
-
-ResolutionTaskHolder@1236 {
-    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
-}
-
-ResolutionTaskHolder@1239 {
-    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
-}
-
-ResolutionTaskHolder@1242 {
-    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
-}
-
-ResolutionTaskHolder@1245 {
-    <name not found> = ArrayList@1246[1] { ResolutionCandidate@1247 }
-}
-
-ResolutionTaskHolder@1248 {
-    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
-}
-
-ResolutionTaskHolder@1251 {
-    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1253 }
-}
-
-ResolutionTaskHolder@1254 {
-    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
-}
-
-ResolutionTaskHolder@1257 {
-    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
-}
-
-ResolutionTaskHolder@1260 {
-    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
-}
-
-ResolutionTaskHolder@1263 {
-    <name not found> = ArrayList@1264[1] { ResolutionCandidate@1265 }
-}
-
-ResolutionTaskHolder@1266 {
-    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1268 }
-}
-
-ResolutionTaskHolder@1269 {
-    <name not found> = ArrayList@1270[1] { ResolutionCandidate@1271 }
-}
-
-ResolutionTaskHolder@1272 {
-    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
-}
-
-ResolutionTaskHolder@1275 {
-    <name not found> = ArrayList@1276[1] { ResolutionCandidate@1277 }
-}
-
-ResolutionTaskHolder@1278 {
-    <name not found> = ArrayList@1279[20] { ResolutionCandidate@1280, ResolutionCandidate@1281, ResolutionCandidate@1282, ... }
-}
-
-ResolutionTaskHolder@1283 {
-    <name not found> = ArrayList@1284[20] { ResolutionCandidate@1285, ResolutionCandidate@1286, ResolutionCandidate@1287, ... }
-}
-
-ResolutionTaskHolder@1288 {
-    <name not found> = ArrayList@1289[20] { ResolutionCandidate@1290, ResolutionCandidate@1291, ResolutionCandidate@1292, ... }
-}
-
-ResolutionTaskHolder@1293 {
-    <name not found> = ArrayList@1294[20] { ResolutionCandidate@1295, ResolutionCandidate@1296, ResolutionCandidate@1297, ... }
-}
-
-ResolutionTaskHolder@1298 {
-    <name not found> = ArrayList@1299[20] { ResolutionCandidate@1300, ResolutionCandidate@1301, ResolutionCandidate@1302, ... }
-}
-
-ResolutionTaskHolder@1303 {
-    <name not found> = ArrayList@1304[20] { ResolutionCandidate@1305, ResolutionCandidate@1306, ResolutionCandidate@1307, ... }
-}
-
-ResolutionTaskHolder@1308 {
-    <name not found> = ArrayList@1309[20] { ResolutionCandidate@1310, ResolutionCandidate@1311, ResolutionCandidate@1312, ... }
-}
-
-ResolutionTaskHolder@1313 {
-    <name not found> = ArrayList@1314[20] { ResolutionCandidate@1315, ResolutionCandidate@1316, ResolutionCandidate@1317, ... }
-}
-
-ResolutionTaskHolder@1318 {
-    <name not found> = ArrayList@1319[20] { ResolutionCandidate@1320, ResolutionCandidate@1321, ResolutionCandidate@1322, ... }
-}
-
-ResolutionTaskHolder@1323 {
-    <name not found> = ArrayList@1324[20] { ResolutionCandidate@1325, ResolutionCandidate@1326, ResolutionCandidate@1327, ... }
-}
-
-ResolutionTaskHolder@1328 {
-    <name not found> = ArrayList@1329[20] { ResolutionCandidate@1330, ResolutionCandidate@1331, ResolutionCandidate@1332, ... }
-}
-
-ResolutionTaskHolder@1333 {
-    <name not found> = ArrayList@1334[20] { ResolutionCandidate@1335, ResolutionCandidate@1336, ResolutionCandidate@1337, ... }
-}
-
-ResolutionTaskHolder@1338 {
-    <name not found> = ArrayList@1339[20] { ResolutionCandidate@1340, ResolutionCandidate@1341, ResolutionCandidate@1342, ... }
-}
-
-ResolutionTaskHolder@1343 {
-    <name not found> = ArrayList@1344[20] { ResolutionCandidate@1345, ResolutionCandidate@1346, ResolutionCandidate@1347, ... }
-}
-
-ResolutionTaskHolder@1348 {
-    <name not found> = ArrayList@1349[20] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
-}
-
-ResolutionTaskHolder@1353 {
-    <name not found> = ArrayList@1354[20] { ResolutionCandidate@1355, ResolutionCandidate@1356, ResolutionCandidate@1357, ... }
-}
-
-ResolutionTaskHolder@1358 {
-    <name not found> = ArrayList@1359[20] { ResolutionCandidate@1360, ResolutionCandidate@1361, ResolutionCandidate@1362, ... }
-}
-
-ResolutionTaskHolder@1363 {
-    <name not found> = ArrayList@1364[20] { ResolutionCandidate@1365, ResolutionCandidate@1366, ResolutionCandidate@1367, ... }
-}
-
-ResolutionTaskHolder@1368 {
-    <name not found> = ArrayList@1369[20] { ResolutionCandidate@1370, ResolutionCandidate@1371, ResolutionCandidate@1372, ... }
-}
-
-ResolutionTaskHolder@1373 {
-    <name not found> = ArrayList@1374[20] { ResolutionCandidate@1375, ResolutionCandidate@1376, ResolutionCandidate@1377, ... }
-}
-
-ResolutionTaskHolder@1378 {
-    <name not found> = ArrayList@1379[20] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
-}
-
-ResolutionTaskHolder@1383 {
-    <name not found> = ArrayList@1384[20] { ResolutionCandidate@1385, ResolutionCandidate@1386, ResolutionCandidate@1387, ... }
-}
-
-ResolutionTaskHolder@1388 {
-    <name not found> = ArrayList@1389[20] { ResolutionCandidate@1390, ResolutionCandidate@1391, ResolutionCandidate@1392, ... }
-}
-
-ResolutionTaskHolder@1393 {
-    <name not found> = ArrayList@1394[20] { ResolutionCandidate@1395, ResolutionCandidate@1396, ResolutionCandidate@1397, ... }
-}
-
-ResolutionTaskHolder@1398 {
-    <name not found> = ArrayList@1399[20] { ResolutionCandidate@1400, ResolutionCandidate@1401, ResolutionCandidate@1402, ... }
-}
-
-ResolutionTaskHolder@1403 {
-    <name not found> = ArrayList@1404[2] { ResolutionCandidate@1405, ResolutionCandidate@1406 }
-}
-
-ResolutionTaskHolder@1407 {
-    <name not found> = ArrayList@1408[2] { ResolutionCandidate@1409, ResolutionCandidate@1410 }
-}
-
-ResolutionTaskHolder@1411 {
-    <name not found> = ArrayList@1412[2] { ResolutionCandidate@1413, ResolutionCandidate@1414 }
-}
-
-ResolutionTaskHolder@1415 {
-    <name not found> = ArrayList@1416[2] { ResolutionCandidate@1417, ResolutionCandidate@1418 }
-}
-
-ResolutionTaskHolder@1419 {
-    <name not found> = ArrayList@1420[2] { ResolutionCandidate@1421, ResolutionCandidate@1422 }
-}
-
-ResolutionTaskHolder@1423 {
-    <name not found> = ArrayList@1424[2] { ResolutionCandidate@1425, ResolutionCandidate@1426 }
-}
-
-ResolutionTaskHolder@1427 {
-    <name not found> = ArrayList@1428[2] { ResolutionCandidate@1429, ResolutionCandidate@1430 }
-}
-
-ResolutionTaskHolder@1431 {
-    <name not found> = ArrayList@1432[2] { ResolutionCandidate@1433, ResolutionCandidate@1434 }
-}
-
-ResolutionTaskHolder@1435 {
-    <name not found> = ArrayList@1436[2] { ResolutionCandidate@1437, ResolutionCandidate@1438 }
-}
-
-ResolutionTaskHolder@1439 {
-    <name not found> = ArrayList@1440[2] { ResolutionCandidate@1441, ResolutionCandidate@1442 }
-}
-
-ResolutionTaskHolder@1443 {
-    <name not found> = ArrayList@1444[2] { ResolutionCandidate@1445, ResolutionCandidate@1446 }
-}
-
-ResolutionTaskHolder@1447 {
-    <name not found> = ArrayList@1448[2] { ResolutionCandidate@1449, ResolutionCandidate@1450 }
-}
-
-ResolutionTaskHolder@1451 {
-    <name not found> = ArrayList@1452[2] { ResolutionCandidate@1453, ResolutionCandidate@1454 }
-}
-
-ResolutionTaskHolder@1455 {
-    <name not found> = ArrayList@1456[2] { ResolutionCandidate@1457, ResolutionCandidate@1458 }
-}
-
-ResolutionTaskHolder@1459 {
-    <name not found> = ArrayList@1460[2] { ResolutionCandidate@1461, ResolutionCandidate@1462 }
-}
-
-ResolutionTaskHolder@1463 {
-    <name not found> = ArrayList@1464[2] { ResolutionCandidate@1465, ResolutionCandidate@1466 }
-}
-
-ResolutionTaskHolder@1467 {
-    <name not found> = ArrayList@1468[2] { ResolutionCandidate@1469, ResolutionCandidate@1470 }
-}
-
-ResolutionTaskHolder@1471 {
-    <name not found> = ArrayList@1472[3] { ResolutionCandidate@1473, ResolutionCandidate@1474, ResolutionCandidate@1475 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@1476 {
-    <name not found> = ArrayList@1477[3] { ResolutionCandidate@1478, ResolutionCandidate@1479, ResolutionCandidate@1480 }
-}
-
-ResolutionTaskHolder@1481 {
-    <name not found> = ArrayList@1482[3] { ResolutionCandidate@1483, ResolutionCandidate@1484, ResolutionCandidate@1485 }
-}
-
-ResolutionTaskHolder@1486 {
-    <name not found> = ArrayList@1487[3] { ResolutionCandidate@1488, ResolutionCandidate@1489, ResolutionCandidate@1490 }
-}
-
-ResolutionTaskHolder@1491 {
-    <name not found> = ArrayList@1492[3] { ResolutionCandidate@1493, ResolutionCandidate@1494, ResolutionCandidate@1495 }
-}
-
-ResolutionTaskHolder@1496 {
-    <name not found> = ArrayList@1497[6] { ResolutionCandidate@1498, ResolutionCandidate@1499, ResolutionCandidate@1500, ... }
-}
-
-ResolutionTaskHolder@1501 {
-    <name not found> = ArrayList@1502[6] { ResolutionCandidate@1503, ResolutionCandidate@1504, ResolutionCandidate@1505, ... }
-}
-
-ResolutionTaskHolder@1506 {
-    <name not found> = ArrayList@1507[6] { ResolutionCandidate@1508, ResolutionCandidate@1509, ResolutionCandidate@1510, ... }
-}
-
-ResolutionTaskHolder@1511 {
-    <name not found> = ArrayList@1512[6] { ResolutionCandidate@1513, ResolutionCandidate@1514, ResolutionCandidate@1515, ... }
-}
-
-ResolutionTaskHolder@1516 {
-    <name not found> = ArrayList@1517[6] { ResolutionCandidate@1518, ResolutionCandidate@1519, ResolutionCandidate@1520, ... }
-}
-
-ResolutionTaskHolder@1521 {
-    <name not found> = ArrayList@1522[6] { ResolutionCandidate@1523, ResolutionCandidate@1524, ResolutionCandidate@1525, ... }
-}
-
-ResolutionTaskHolder@1526 {
-    <name not found> = ArrayList@1527[7] { ResolutionCandidate@1528, ResolutionCandidate@1529, ResolutionCandidate@1530, ... }
-}
-
-ResolutionTaskHolder@1531 {
-    <name not found> = ArrayList@1532[7] { ResolutionCandidate@1533, ResolutionCandidate@1534, ResolutionCandidate@1535, ... }
-}
-
-ResolutionTaskHolder@1536 {
-    <name not found> = ArrayList@1537[7] { ResolutionCandidate@1538, ResolutionCandidate@1539, ResolutionCandidate@1540, ... }
-}
-
-ResolutionTaskHolder@1541 {
-    <name not found> = ArrayList@1542[7] { ResolutionCandidate@1543, ResolutionCandidate@1544, ResolutionCandidate@1545, ... }
-}
-
-ResolutionTaskHolder@1546 {
-    <name not found> = ArrayList@1547[7] { ResolutionCandidate@1548, ResolutionCandidate@1549, ResolutionCandidate@1550, ... }
-}
-
-ResolutionTaskHolder@1551 {
-    <name not found> = ArrayList@1552[7] { ResolutionCandidate@1553, ResolutionCandidate@1554, ResolutionCandidate@1555, ... }
-}
-
-ResolutionTaskHolder@1556 {
-    <name not found> = ArrayList@1557[7] { ResolutionCandidate@1558, ResolutionCandidate@1559, ResolutionCandidate@1560, ... }
-}
-
-ResolutionTaskHolder@1561 {
-    <name not found> = ArrayList@1562[8] { ResolutionCandidate@1563, ResolutionCandidate@1564, ResolutionCandidate@1565, ... }
-}
-
-ResolutionTaskHolder@1566 {
-    <name not found> = ArrayList@1567[8] { ResolutionCandidate@1568, ResolutionCandidate@1569, ResolutionCandidate@1570, ... }
-}
-
-ResolutionTaskHolder@1571 {
-    <name not found> = ArrayList@1572[8] { ResolutionCandidate@1573, ResolutionCandidate@1574, ResolutionCandidate@1575, ... }
-}
-
-ResolutionTaskHolder@1576 {
-    <name not found> = ArrayList@1577[8] { ResolutionCandidate@1578, ResolutionCandidate@1579, ResolutionCandidate@1580, ... }
-}
-
-ResolutionTaskHolder@1581 {
-    <name not found> = ArrayList@1582[8] { ResolutionCandidate@1583, ResolutionCandidate@1584, ResolutionCandidate@1585, ... }
-}
-
-null {
-    <name not found> = ArrayList@1586[10] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = ArrayList@1587[10] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
-    <name not found> = ArrayList@1588[10] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
-    <name not found> = ArrayList@1589[10] { ResolutionCandidate@268, ResolutionCandidate@269, ResolutionCandidate@270, ... }
-    <name not found> = ArrayList@1590[10] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@1591[10] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = ArrayList@1592[10] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275, ... }
-    <name not found> = ArrayList@1593[10] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = ArrayList@1594[10] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@1595[10] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = ArrayList@1596[10] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@1597[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@1598[10] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@1599[10] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-    <name not found> = ArrayList@1600[10] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@1601[10] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@1602[10] { ResolutionCandidate@283, ResolutionCandidate@284, ResolutionCandidate@285, ... }
-    <name not found> = ArrayList@1603[10] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@1604[10] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
-    <name not found> = ArrayList@1605[10] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@1606[10] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-    <name not found> = ArrayList@1607[10] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@1608[10] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-    <name not found> = ArrayList@1609[10] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@1610[10] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
-    <name not found> = ArrayList@1611[10] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = ArrayList@1612[10] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = ArrayList@1613[10] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@1614[16] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
-    <name not found> = ArrayList@1615[1] { ResolutionCandidate@1166 }
-    <name not found> = ArrayList@1616[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@1617[1] { ResolutionCandidate@520 }
-    <name not found> = ArrayList@1618[1] { ResolutionCandidate@956 }
-    <name not found> = ArrayList@1619[1] { ResolutionCandidate@689 }
-    <name not found> = ArrayList@1620[1] { ResolutionCandidate@1172 }
-    <name not found> = ArrayList@1621[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@1622[1] { ResolutionCandidate@896 }
-    <name not found> = ArrayList@1623[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@1624[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@1625[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@1626[1] { ResolutionCandidate@1193 }
-    <name not found> = ArrayList@1627[1] { ResolutionCandidate@950 }
-    <name not found> = ArrayList@1628[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@1629[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@1630[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@1631[1] { ResolutionCandidate@821 }
-    <name not found> = ArrayList@1632[1] { ResolutionCandidate@1013 }
-    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1244 }
-    <name not found> = ArrayList@1634[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@1635[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@1636[1] { ResolutionCandidate@836 }
-    <name not found> = ArrayList@1637[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@1638[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@1639[1] { ResolutionCandidate@1046 }
-    <name not found> = ArrayList@1640[1] { ResolutionCandidate@1118 }
-    <name not found> = ArrayList@1641[1] { ResolutionCandidate@632 }
-    <name not found> = ArrayList@1642[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@1643[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@1644[1] { ResolutionCandidate@1136 }
-    <name not found> = ArrayList@1645[1] { ResolutionCandidate@932 }
-    <name not found> = ArrayList@1646[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@1647[1] { ResolutionCandidate@848 }
-    <name not found> = ArrayList@1648[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@1649[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@1650[1] { ResolutionCandidate@1247 }
-    <name not found> = ArrayList@1651[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@1652[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@1653[1] { ResolutionCandidate@1223 }
-    <name not found> = ArrayList@1654[1] { ResolutionCandidate@513 }
-    <name not found> = ArrayList@1655[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@1656[1] { ResolutionCandidate@779 }
-    <name not found> = ArrayList@1657[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@1658[1] { ResolutionCandidate@872 }
-    <name not found> = ArrayList@1659[1] { ResolutionCandidate@968 }
-    <name not found> = ArrayList@1660[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@1661[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@1662[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@1663[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@1664[1] { ResolutionCandidate@980 }
-    <name not found> = ArrayList@1665[1] { ResolutionCandidate@851 }
-    <name not found> = ArrayList@1666[1] { ResolutionCandidate@992 }
-    <name not found> = ArrayList@1667[1] { ResolutionCandidate@1007 }
-    <name not found> = ArrayList@1668[1] { ResolutionCandidate@1154 }
-    <name not found> = ArrayList@1669[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@1670[1] { ResolutionCandidate@528 }
-    <name not found> = ArrayList@1671[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@1672[1] { ResolutionCandidate@1265 }
-    <name not found> = ArrayList@1673[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@1674[1] { ResolutionCandidate@986 }
-    <name not found> = ArrayList@1675[1] { ResolutionCandidate@935 }
-    <name not found> = ArrayList@1676[1] { ResolutionCandidate@824 }
-    <name not found> = ArrayList@1677[1] { ResolutionCandidate@1079 }
-    <name not found> = ArrayList@1678[1] { ResolutionCandidate@1103 }
-    <name not found> = ArrayList@1679[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@1680[1] { ResolutionCandidate@525 }
-    <name not found> = ArrayList@1681[1] { ResolutionCandidate@893 }
-    <name not found> = ArrayList@1682[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@1683[1] { ResolutionCandidate@914 }
-    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1175 }
-    <name not found> = ArrayList@1685[1] { ResolutionCandidate@629 }
-    <name not found> = ArrayList@1686[1] { ResolutionCandidate@902 }
-    <name not found> = ArrayList@1687[1] { ResolutionCandidate@605 }
-    <name not found> = ArrayList@1688[1] { ResolutionCandidate@1127 }
-    <name not found> = ArrayList@1689[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@1690[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@1691[1] { ResolutionCandidate@905 }
-    <name not found> = ArrayList@1692[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@1693[1] { ResolutionCandidate@833 }
-    <name not found> = ArrayList@1694[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@1695[1] { ResolutionCandidate@1256 }
-    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1181 }
-    <name not found> = ArrayList@1697[1] { ResolutionCandidate@887 }
-    <name not found> = ArrayList@1698[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1025 }
-    <name not found> = ArrayList@1700[1] { ResolutionCandidate@1133 }
-    <name not found> = ArrayList@1701[1] { ResolutionCandidate@752 }
-    <name not found> = ArrayList@1702[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@1703[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@1704[1] { ResolutionCandidate@764 }
-    <name not found> = ArrayList@1705[1] { ResolutionCandidate@998 }
-    <name not found> = ArrayList@1706[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@1707[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@1708[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@1709[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@1710[1] { ResolutionCandidate@1268 }
-    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1091 }
-    <name not found> = ArrayList@1712[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@1713[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@1714[1] { ResolutionCandidate@854 }
-    <name not found> = ArrayList@1715[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@1716[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1259 }
-    <name not found> = ArrayList@1718[1] { ResolutionCandidate@959 }
-    <name not found> = ArrayList@1719[1] { ResolutionCandidate@1226 }
-    <name not found> = ArrayList@1720[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@1721[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@1722[1] { ResolutionCandidate@656 }
-    <name not found> = ArrayList@1723[1] { ResolutionCandidate@704 }
-    <name not found> = ArrayList@1724[1] { ResolutionCandidate@1151 }
-    <name not found> = ArrayList@1725[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@1726[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@1727[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@1728[1] { ResolutionCandidate@866 }
-    <name not found> = ArrayList@1729[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@1730[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@1731[1] { ResolutionCandidate@695 }
-    <name not found> = ArrayList@1732[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@1733[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@1734[1] { ResolutionCandidate@965 }
-    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1076 }
-    <name not found> = ArrayList@1736[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@1737[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@1738[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@1739[1] { ResolutionCandidate@827 }
-    <name not found> = ArrayList@1740[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@1741[1] { ResolutionCandidate@791 }
-    <name not found> = ArrayList@1742[1] { ResolutionCandidate@680 }
-    <name not found> = ArrayList@1743[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@1744[1] { ResolutionCandidate@692 }
-    <name not found> = ArrayList@1745[1] { ResolutionCandidate@1196 }
-    <name not found> = ArrayList@1746[1] { ResolutionCandidate@794 }
-    <name not found> = ArrayList@1747[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@1748[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@1749[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@1750[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@1751[1] { ResolutionCandidate@776 }
-    <name not found> = ArrayList@1752[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@1753[1] { ResolutionCandidate@920 }
-    <name not found> = ArrayList@1754[1] { ResolutionCandidate@875 }
-    <name not found> = ArrayList@1755[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1250 }
-    <name not found> = ArrayList@1757[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@1758[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@1759[1] { ResolutionCandidate@962 }
-    <name not found> = ArrayList@1760[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@1761[1] { ResolutionCandidate@911 }
-    <name not found> = ArrayList@1762[1] { ResolutionCandidate@1277 }
-    <name not found> = ArrayList@1763[1] { ResolutionCandidate@926 }
-    <name not found> = ArrayList@1764[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@1765[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@1766[1] { ResolutionCandidate@863 }
-    <name not found> = ArrayList@1767[1] { ResolutionCandidate@746 }
-    <name not found> = ArrayList@1768[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@1769[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@1770[1] { ResolutionCandidate@938 }
-    <name not found> = ArrayList@1771[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@1772[1] { ResolutionCandidate@899 }
-    <name not found> = ArrayList@1773[1] { ResolutionCandidate@830 }
-    <name not found> = ArrayList@1774[1] { ResolutionCandidate@1055 }
-    <name not found> = ArrayList@1775[1] { ResolutionCandidate@881 }
-    <name not found> = ArrayList@1776[1] { ResolutionCandidate@1094 }
-    <name not found> = ArrayList@1777[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@1778[1] { ResolutionCandidate@1088 }
-    <name not found> = ArrayList@1779[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@1780[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@1781[1] { ResolutionCandidate@1235 }
-    <name not found> = ArrayList@1782[1] { ResolutionCandidate@653 }
-    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1028 }
-    <name not found> = ArrayList@1784[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@1785[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@1786[1] { ResolutionCandidate@1073 }
-    <name not found> = ArrayList@1787[1] { ResolutionCandidate@908 }
-    <name not found> = ArrayList@1788[1] { ResolutionCandidate@713 }
-    <name not found> = ArrayList@1789[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@1790[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@1791[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1031 }
-    <name not found> = ArrayList@1793[1] { ResolutionCandidate@617 }
-    <name not found> = ArrayList@1794[1] { ResolutionCandidate@890 }
-    <name not found> = ArrayList@1795[1] { ResolutionCandidate@839 }
-    <name not found> = ArrayList@1796[1] { ResolutionCandidate@785 }
-    <name not found> = ArrayList@1797[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@1798[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@1799[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@1800[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@1801[1] { ResolutionCandidate@977 }
-    <name not found> = ArrayList@1802[1] { ResolutionCandidate@941 }
-    <name not found> = ArrayList@1803[1] { ResolutionCandidate@749 }
-    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1124 }
-    <name not found> = ArrayList@1805[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@1806[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1163 }
-    <name not found> = ArrayList@1808[1] { ResolutionCandidate@797 }
-    <name not found> = ArrayList@1809[1] { ResolutionCandidate@683 }
-    <name not found> = ArrayList@1810[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@1811[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@1812[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@1813[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@1814[1] { ResolutionCandidate@1139 }
-    <name not found> = ArrayList@1815[1] { ResolutionCandidate@668 }
-    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1202 }
-    <name not found> = ArrayList@1817[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@1818[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@1819[1] { ResolutionCandidate@806 }
-    <name not found> = ArrayList@1820[1] { ResolutionCandidate@812 }
-    <name not found> = ArrayList@1821[1] { ResolutionCandidate@701 }
-    <name not found> = ArrayList@1822[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@1823[1] { ResolutionCandidate@1049 }
-    <name not found> = ArrayList@1824[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@1825[1] { ResolutionCandidate@465 }
-    <name not found> = ArrayList@1826[1] { ResolutionCandidate@1019 }
-    <name not found> = ArrayList@1827[1] { ResolutionCandidate@770 }
-    <name not found> = ArrayList@1828[1] { ResolutionCandidate@974 }
-    <name not found> = ArrayList@1829[1] { ResolutionCandidate@971 }
-    <name not found> = ArrayList@1830[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@1831[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@1832[1] { ResolutionCandidate@1205 }
-    <name not found> = ArrayList@1833[1] { ResolutionCandidate@1184 }
-    <name not found> = ArrayList@1834[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@1835[1] { ResolutionCandidate@707 }
-    <name not found> = ArrayList@1836[1] { ResolutionCandidate@842 }
-    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1010 }
-    <name not found> = ArrayList@1838[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@1839[1] { ResolutionCandidate@540 }
-    <name not found> = ArrayList@1840[1] { ResolutionCandidate@782 }
-    <name not found> = ArrayList@1841[1] { ResolutionCandidate@1106 }
-    <name not found> = ArrayList@1842[1] { ResolutionCandidate@1022 }
-    <name not found> = ArrayList@1843[1] { ResolutionCandidate@809 }
-    <name not found> = ArrayList@1844[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@1845[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@1846[1] { ResolutionCandidate@1208 }
-    <name not found> = ArrayList@1847[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@1848[1] { ResolutionCandidate@983 }
-    <name not found> = ArrayList@1849[1] { ResolutionCandidate@1190 }
-    <name not found> = ArrayList@1850[1] { ResolutionCandidate@878 }
-    <name not found> = ArrayList@1851[1] { ResolutionCandidate@1157 }
-    <name not found> = ArrayList@1852[1] { ResolutionCandidate@1160 }
-    <name not found> = ArrayList@1853[1] { ResolutionCandidate@869 }
-    <name not found> = ArrayList@1854[1] { ResolutionCandidate@1187 }
-    <name not found> = ArrayList@1855[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@1856[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@1857[1] { ResolutionCandidate@1097 }
-    <name not found> = ArrayList@1858[1] { ResolutionCandidate@1001 }
-    <name not found> = ArrayList@1859[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@1860[1] { ResolutionCandidate@1109 }
-    <name not found> = ArrayList@1861[1] { ResolutionCandidate@731 }
-    <name not found> = ArrayList@1862[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@1863[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@1864[1] { ResolutionCandidate@1211 }
-    <name not found> = ArrayList@1865[1] { ResolutionCandidate@1220 }
-    <name not found> = ArrayList@1866[1] { ResolutionCandidate@884 }
-    <name not found> = ArrayList@1867[1] { ResolutionCandidate@728 }
-    <name not found> = ArrayList@1868[1] { ResolutionCandidate@493 }
-    <name not found> = ArrayList@1869[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@1870[1] { ResolutionCandidate@740 }
-    <name not found> = ArrayList@1871[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@1872[1] { ResolutionCandidate@1100 }
-    <name not found> = ArrayList@1873[1] { ResolutionCandidate@716 }
-    <name not found> = ArrayList@1874[1] { ResolutionCandidate@1229 }
-    <name not found> = ArrayList@1875[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@1876[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@1877[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@1878[1] { ResolutionCandidate@818 }
-    <name not found> = ArrayList@1879[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@1880[1] { ResolutionCandidate@995 }
-    <name not found> = ArrayList@1881[1] { ResolutionCandidate@1262 }
-    <name not found> = ArrayList@1882[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@1883[1] { ResolutionCandidate@1034 }
-    <name not found> = ArrayList@1884[1] { ResolutionCandidate@1085 }
-    <name not found> = ArrayList@1885[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@1886[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@1887[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@1888[1] { ResolutionCandidate@923 }
-    <name not found> = ArrayList@1889[1] { ResolutionCandidate@1142 }
-    <name not found> = ArrayList@1890[1] { ResolutionCandidate@1145 }
-    <name not found> = ArrayList@1891[1] { ResolutionCandidate@758 }
-    <name not found> = ArrayList@1892[1] { ResolutionCandidate@845 }
-    <name not found> = ArrayList@1893[1] { ResolutionCandidate@737 }
-    <name not found> = ArrayList@1894[1] { ResolutionCandidate@929 }
-    <name not found> = ArrayList@1895[1] { ResolutionCandidate@1082 }
-    <name not found> = ArrayList@1896[1] { ResolutionCandidate@815 }
-    <name not found> = ArrayList@1897[1] { ResolutionCandidate@1232 }
-    <name not found> = ArrayList@1898[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@1899[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@1900[1] { ResolutionCandidate@725 }
-    <name not found> = ArrayList@1901[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@1902[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@1903[1] { ResolutionCandidate@953 }
-    <name not found> = ArrayList@1904[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@1905[1] { ResolutionCandidate@1040 }
-    <name not found> = ArrayList@1906[1] { ResolutionCandidate@1178 }
-    <name not found> = ArrayList@1907[1] { ResolutionCandidate@788 }
-    <name not found> = ArrayList@1908[1] { ResolutionCandidate@1148 }
-    <name not found> = ArrayList@1909[1] { ResolutionCandidate@944 }
-    <name not found> = ArrayList@1910[1] { ResolutionCandidate@1112 }
-    <name not found> = ArrayList@1911[1] { ResolutionCandidate@803 }
-    <name not found> = ArrayList@1912[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@1913[1] { ResolutionCandidate@1037 }
-    <name not found> = ArrayList@1914[1] { ResolutionCandidate@989 }
-    <name not found> = ArrayList@1915[1] { ResolutionCandidate@1238 }
-    <name not found> = ArrayList@1916[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@1917[1] { ResolutionCandidate@505 }
-    <name not found> = ArrayList@1918[1] { ResolutionCandidate@947 }
-    <name not found> = ArrayList@1919[1] { ResolutionCandidate@860 }
-    <name not found> = ArrayList@1920[1] { ResolutionCandidate@761 }
-    <name not found> = ArrayList@1921[1] { ResolutionCandidate@1004 }
-    <name not found> = ArrayList@1922[1] { ResolutionCandidate@1274 }
-    <name not found> = ArrayList@1923[1] { ResolutionCandidate@1016 }
-    <name not found> = ArrayList@1924[1] { ResolutionCandidate@677 }
-    <name not found> = ArrayList@1925[1] { ResolutionCandidate@1064 }
-    <name not found> = ArrayList@1926[1] { ResolutionCandidate@1214 }
-    <name not found> = ArrayList@1927[1] { ResolutionCandidate@1241 }
-    <name not found> = ArrayList@1928[1] { ResolutionCandidate@857 }
-    <name not found> = ArrayList@1929[1] { ResolutionCandidate@1058 }
-    <name not found> = ArrayList@1930[1] { ResolutionCandidate@719 }
-    <name not found> = ArrayList@1931[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@1932[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@1933[1] { ResolutionCandidate@1070 }
-    <name not found> = ArrayList@1934[1] { ResolutionCandidate@773 }
-    <name not found> = ArrayList@1935[1] { ResolutionCandidate@1052 }
-    <name not found> = ArrayList@1936[1] { ResolutionCandidate@1253 }
-    <name not found> = ArrayList@1937[1] { ResolutionCandidate@1130 }
-    <name not found> = ArrayList@1938[1] { ResolutionCandidate@1115 }
-    <name not found> = ArrayList@1939[1] { ResolutionCandidate@1061 }
-    <name not found> = ArrayList@1940[1] { ResolutionCandidate@1121 }
-    <name not found> = ArrayList@1941[1] { ResolutionCandidate@1043 }
-    <name not found> = ArrayList@1942[1] { ResolutionCandidate@1169 }
-    <name not found> = ArrayList@1943[1] { ResolutionCandidate@800 }
-    <name not found> = ArrayList@1944[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@1945[1] { ResolutionCandidate@1067 }
-    <name not found> = ArrayList@1946[1] { ResolutionCandidate@917 }
-    <name not found> = ArrayList@1947[1] { ResolutionCandidate@1217 }
-    <name not found> = ArrayList@1948[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@1949[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@1950[1] { ResolutionCandidate@1271 }
-    <name not found> = ArrayList@1951[20] { ResolutionCandidate@1365, ResolutionCandidate@1366, ResolutionCandidate@1367, ... }
-    <name not found> = ArrayList@1952[20] { ResolutionCandidate@1395, ResolutionCandidate@1396, ResolutionCandidate@1397, ... }
-    <name not found> = ArrayList@1953[20] { ResolutionCandidate@1340, ResolutionCandidate@1341, ResolutionCandidate@1342, ... }
-    <name not found> = ArrayList@1954[20] { ResolutionCandidate@1320, ResolutionCandidate@1321, ResolutionCandidate@1322, ... }
-    <name not found> = ArrayList@1955[20] { ResolutionCandidate@1360, ResolutionCandidate@1361, ResolutionCandidate@1362, ... }
-    <name not found> = ArrayList@1956[20] { ResolutionCandidate@1370, ResolutionCandidate@1371, ResolutionCandidate@1372, ... }
-    <name not found> = ArrayList@1957[20] { ResolutionCandidate@1325, ResolutionCandidate@1326, ResolutionCandidate@1327, ... }
-    <name not found> = ArrayList@1958[20] { ResolutionCandidate@1390, ResolutionCandidate@1391, ResolutionCandidate@1392, ... }
-    <name not found> = ArrayList@1959[20] { ResolutionCandidate@1295, ResolutionCandidate@1296, ResolutionCandidate@1297, ... }
-    <name not found> = ArrayList@1960[20] { ResolutionCandidate@1290, ResolutionCandidate@1291, ResolutionCandidate@1292, ... }
-    <name not found> = ArrayList@1961[20] { ResolutionCandidate@1375, ResolutionCandidate@1376, ResolutionCandidate@1377, ... }
-    <name not found> = ArrayList@1962[20] { ResolutionCandidate@1305, ResolutionCandidate@1306, ResolutionCandidate@1307, ... }
-    <name not found> = ArrayList@1963[20] { ResolutionCandidate@1400, ResolutionCandidate@1401, ResolutionCandidate@1402, ... }
-    <name not found> = ArrayList@1964[20] { ResolutionCandidate@1310, ResolutionCandidate@1311, ResolutionCandidate@1312, ... }
-    <name not found> = ArrayList@1965[20] { ResolutionCandidate@1385, ResolutionCandidate@1386, ResolutionCandidate@1387, ... }
-    <name not found> = ArrayList@1966[20] { ResolutionCandidate@1335, ResolutionCandidate@1336, ResolutionCandidate@1337, ... }
-    <name not found> = ArrayList@1967[20] { ResolutionCandidate@1330, ResolutionCandidate@1331, ResolutionCandidate@1332, ... }
-    <name not found> = ArrayList@1968[20] { ResolutionCandidate@1350, ResolutionCandidate@1351, ResolutionCandidate@1352, ... }
-    <name not found> = ArrayList@1969[20] { ResolutionCandidate@1300, ResolutionCandidate@1301, ResolutionCandidate@1302, ... }
-    <name not found> = ArrayList@1970[20] { ResolutionCandidate@1285, ResolutionCandidate@1286, ResolutionCandidate@1287, ... }
-    <name not found> = ArrayList@1971[20] { ResolutionCandidate@1315, ResolutionCandidate@1316, ResolutionCandidate@1317, ... }
-    <name not found> = ArrayList@1972[20] { ResolutionCandidate@1355, ResolutionCandidate@1356, ResolutionCandidate@1357, ... }
-    <name not found> = ArrayList@1973[20] { ResolutionCandidate@1380, ResolutionCandidate@1381, ResolutionCandidate@1382, ... }
-    <name not found> = ArrayList@1974[20] { ResolutionCandidate@1345, ResolutionCandidate@1346, ResolutionCandidate@1347, ... }
-    <name not found> = ArrayList@1975[20] { ResolutionCandidate@1280, ResolutionCandidate@1281, ResolutionCandidate@1282, ... }
-    <name not found> = ArrayList@1976[2] { ResolutionCandidate@1441, ResolutionCandidate@1442 }
-    <name not found> = ArrayList@1977[2] { ResolutionCandidate@1413, ResolutionCandidate@1414 }
-    <name not found> = ArrayList@1978[2] { ResolutionCandidate@1421, ResolutionCandidate@1422 }
-    <name not found> = ArrayList@1979[2] { ResolutionCandidate@1405, ResolutionCandidate@1406 }
-    <name not found> = ArrayList@1980[2] { ResolutionCandidate@1433, ResolutionCandidate@1434 }
-    <name not found> = ArrayList@1981[2] { ResolutionCandidate@1449, ResolutionCandidate@1450 }
-    <name not found> = ArrayList@1982[2] { ResolutionCandidate@1429, ResolutionCandidate@1430 }
-    <name not found> = ArrayList@1983[2] { ResolutionCandidate@1453, ResolutionCandidate@1454 }
-    <name not found> = ArrayList@1984[2] { ResolutionCandidate@1425, ResolutionCandidate@1426 }
-    <name not found> = ArrayList@1985[2] { ResolutionCandidate@1417, ResolutionCandidate@1418 }
-    <name not found> = ArrayList@1986[2] { ResolutionCandidate@1461, ResolutionCandidate@1462 }
-    <name not found> = ArrayList@1987[2] { ResolutionCandidate@1469, ResolutionCandidate@1470 }
-    <name not found> = ArrayList@1988[2] { ResolutionCandidate@1437, ResolutionCandidate@1438 }
-    <name not found> = ArrayList@1989[2] { ResolutionCandidate@1445, ResolutionCandidate@1446 }
-    <name not found> = ArrayList@1990[2] { ResolutionCandidate@1465, ResolutionCandidate@1466 }
-    <name not found> = ArrayList@1991[2] { ResolutionCandidate@1457, ResolutionCandidate@1458 }
-    <name not found> = ArrayList@1992[2] { ResolutionCandidate@1409, ResolutionCandidate@1410 }
-    <name not found> = ArrayList@1993[3] { ResolutionCandidate@1493, ResolutionCandidate@1494, ResolutionCandidate@1495 }
-    <name not found> = ArrayList@1994[3] { ResolutionCandidate@1488, ResolutionCandidate@1489, ResolutionCandidate@1490 }
-    <name not found> = ArrayList@1995[3] { ResolutionCandidate@1473, ResolutionCandidate@1474, ResolutionCandidate@1475 }
-    <name not found> = ArrayList@1996[3] { ResolutionCandidate@1478, ResolutionCandidate@1479, ResolutionCandidate@1480 }
-    <name not found> = ArrayList@1997[3] { ResolutionCandidate@1483, ResolutionCandidate@1484, ResolutionCandidate@1485 }
-    <name not found> = ArrayList@1998[6] { ResolutionCandidate@1508, ResolutionCandidate@1509, ResolutionCandidate@1510, ... }
-    <name not found> = ArrayList@1999[6] { ResolutionCandidate@1503, ResolutionCandidate@1504, ResolutionCandidate@1505, ... }
-    <name not found> = ArrayList@2000[6] { ResolutionCandidate@1518, ResolutionCandidate@1519, ResolutionCandidate@1520, ... }
-    <name not found> = ArrayList@2001[6] { ResolutionCandidate@1513, ResolutionCandidate@1514, ResolutionCandidate@1515, ... }
-    <name not found> = ArrayList@2002[6] { ResolutionCandidate@1523, ResolutionCandidate@1524, ResolutionCandidate@1525, ... }
-    <name not found> = ArrayList@2003[6] { ResolutionCandidate@1498, ResolutionCandidate@1499, ResolutionCandidate@1500, ... }
-    <name not found> = ArrayList@2004[7] { ResolutionCandidate@1533, ResolutionCandidate@1534, ResolutionCandidate@1535, ... }
-    <name not found> = ArrayList@2005[7] { ResolutionCandidate@1528, ResolutionCandidate@1529, ResolutionCandidate@1530, ... }
-    <name not found> = ArrayList@2006[7] { ResolutionCandidate@1553, ResolutionCandidate@1554, ResolutionCandidate@1555, ... }
-    <name not found> = ArrayList@2007[7] { ResolutionCandidate@1548, ResolutionCandidate@1549, ResolutionCandidate@1550, ... }
-    <name not found> = ArrayList@2008[7] { ResolutionCandidate@1558, ResolutionCandidate@1559, ResolutionCandidate@1560, ... }
-    <name not found> = ArrayList@2009[7] { ResolutionCandidate@1538, ResolutionCandidate@1539, ResolutionCandidate@1540, ... }
-    <name not found> = ArrayList@2010[7] { ResolutionCandidate@1543, ResolutionCandidate@1544, ResolutionCandidate@1545, ... }
-    <name not found> = ArrayList@2011[8] { ResolutionCandidate@1583, ResolutionCandidate@1584, ResolutionCandidate@1585, ... }
-    <name not found> = ArrayList@2012[8] { ResolutionCandidate@1568, ResolutionCandidate@1569, ResolutionCandidate@1570, ... }
-    <name not found> = ArrayList@2013[8] { ResolutionCandidate@1578, ResolutionCandidate@1579, ResolutionCandidate@1580, ... }
-    <name not found> = ArrayList@2014[8] { ResolutionCandidate@1573, ResolutionCandidate@1574, ResolutionCandidate@1575, ... }
-    <name not found> = ArrayList@2015[8] { ResolutionCandidate@1563, ResolutionCandidate@1564, ResolutionCandidate@1565, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log b/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
deleted file mode 100644
index c882889d69f..00000000000
--- a/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('C': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('C': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('C': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
deleted file mode 100644
index bfae5101ac5..00000000000
--- a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Aaa': FqName@3) = null
-    packageFragments('Bbb': FqName@4) = null
-    packageFragments('Double': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Aaa': FqName@12) = null
-    packageFragments('java.lang.Double': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('java.lang.Unit': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Aaa': FqName@17) = null
-    packageFragments('kotlin.Double': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.Unit': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Bbb': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Double': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Unit': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Bbb': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Bbb': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('Bbb': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log b/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
deleted file mode 100644
index 28606cb3e68..00000000000
--- a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Val': FqName@6) = null
-    packageFragments('Var': FqName@7) = null
-    packageFragments('Var2': FqName@8) = null
-    packageFragments('VarT': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Var': FqName@15) = null
-    packageFragments('java.lang.VarT': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Var': FqName@19) = null
-    packageFragments('kotlin.VarT': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log b/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
deleted file mode 100644
index 3bd852c01de..00000000000
--- a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('root': FqName@13) = null
-    packageFragments('root.a': FqName@14) = null
-    packageFragments('root.x': FqName@15) = null
-    packageFragments('root.y2': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('a': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
deleted file mode 100644
index 18aa7532012..00000000000
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
+++ /dev/null
@@ -1,460 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = ErrorTypeImpl@4
-    <name not found> = ErrorTypeImpl@5
-    <name not found> = ErrorTypeImpl@6
-    <name not found> = ErrorTypeImpl@7
-    <name not found> = JetTypeImpl@8['Function0<1>']
-    <name not found> = JetTypeImpl@9['String']
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@10['System'] {
-    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
-    defaultType = JetTypeImpl@14['System']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@15['System']
-}
-
-LazyJavaClassTypeConstructor@15['System'] {
-    parameters = ArrayList@16[empty]
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
-    packageFragments('Array': FqName@20) = null
-    packageFragments('Int': FqName@21) = null
-    packageFragments('String': FqName@22) = null
-    packageFragments('System': FqName@23) = null
-    packageFragments('X': FqName@24) = null
-    packageFragments('foo': FqName@25) = null
-    packageFragments('foo.Array': FqName@26) = null
-    packageFragments('foo.Int': FqName@27) = null
-    packageFragments('foo.String': FqName@28) = null
-    packageFragments('foo.System': FqName@29) = null
-    packageFragments('foo.X': FqName@30) = null
-    packageFragments('foo.f': FqName@31) = null
-    packageFragments('foo.foo': FqName@32) = null
-    packageFragments('foo.java': FqName@33) = null
-    packageFragments('foo.s': FqName@34) = null
-    packageFragments('foo.ss': FqName@35) = null
-    packageFragments('foo.sss': FqName@36) = null
-    packageFragments('foo.x': FqName@37) = null
-    packageFragments('foo.xs': FqName@38) = null
-    packageFragments('foo.xss': FqName@39) = null
-    packageFragments('foo.xsss': FqName@40) = null
-    packageFragments('foo.xssss': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.Array': FqName@46) = null
-    packageFragments('java.lang.Int': FqName@47) = null
-    packageFragments('java.lang.String': FqName@48) = null
-    packageFragments('java.lang.System': FqName@49) = null
-    packageFragments('java.lang.X': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.Array': FqName@52) = null
-    packageFragments('kotlin.Int': FqName@53) = null
-    packageFragments('kotlin.String': FqName@54) = null
-    packageFragments('kotlin.System': FqName@55) = null
-    packageFragments('kotlin.X': FqName@56) = null
-    packageFragments('kotlin.io': FqName@57) = null
-    packageFragments('kotlin.jvm': FqName@58) = null
-    topLevelClasses(JavaClassImpl@59['System']) = LazyJavaClassDescriptor@10['System']
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@63) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@45['lang'] {
-    classes('System': Name@66) = LazyJavaClassDescriptor@10['System'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('java': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('System': Name@70) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.lazy.log b/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
deleted file mode 100644
index a327dbd9341..00000000000
--- a/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
+++ /dev/null
@@ -1,389 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = BooleanValue@1
-    <name not found> = JetTypeImpl@2['Boolean']
-    <name not found> = JetTypeImpl@3['O']
-    <name not found> = JetTypeImpl@3['O']
-    <name not found> = NullValue@4
-    <name not found> = NullValue@4
-    <name not found> = NullValue@4
-    <name not found> = NullValue@4
-    <name not found> = NullableType@5
-    <name not found> = NullableType@6
-}
-
-LazyJavaClassDescriptor@7['List'] {
-    typeConstructor = LazyJavaClassTypeConstructor@8['List']
-}
-
-LazyJavaClassTypeConstructor@8['List'] {
-    parameters = ArrayList@9[1] { LazyJavaTypeParameterDescriptor@10['E'] }
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Collection<E>'] }
-}
-
-LazyJavaClassifierType@12['Collection<E>'] {
-    classifier = JavaClassImpl@13['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('Any': FqName@18) = null
-    packageFragments('ArrayList': FqName@19) = null
-    packageFragments('Boolean': FqName@20) = null
-    packageFragments('E': FqName@21) = null
-    packageFragments('I': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('Iterable': FqName@24) = null
-    packageFragments('Iteratee': FqName@25) = null
-    packageFragments('List': FqName@26) = null
-    packageFragments('O': FqName@27) = null
-    packageFragments('T': FqName@28) = null
-    packageFragments('foobar': FqName@29) = null
-    packageFragments('foobar.Any': FqName@30) = null
-    packageFragments('foobar.Boolean': FqName@31) = null
-    packageFragments('foobar.Collection': FqName@32) = null
-    packageFragments('foobar.E': FqName@33) = null
-    packageFragments('foobar.Foo': FqName@34) = null
-    packageFragments('foobar.I': FqName@35) = null
-    packageFragments('foobar.Int': FqName@36) = null
-    packageFragments('foobar.Iterable': FqName@37) = null
-    packageFragments('foobar.Iteratee': FqName@38) = null
-    packageFragments('foobar.O': FqName@39) = null
-    packageFragments('foobar.StrangeIterateeImpl': FqName@40) = null
-    packageFragments('foobar.Sum': FqName@41) = null
-    packageFragments('foobar.T': FqName@42) = null
-    packageFragments('foobar.a': FqName@43) = null
-    packageFragments('foobar.a.ArrayList': FqName@44) = null
-    packageFragments('foobar.a.Int': FqName@45) = null
-    packageFragments('foobar.a.List': FqName@46) = null
-    packageFragments('foobar.a.a': FqName@47) = null
-    packageFragments('foobar.a.a1': FqName@48) = null
-    packageFragments('foobar.a.b': FqName@49) = null
-    packageFragments('foobar.a.b1': FqName@50) = null
-    packageFragments('foobar.a.util': FqName@51) = null
-    packageFragments('foobar.foobar': FqName@52) = null
-    packageFragments('foobar.x1': FqName@53) = null
-    packageFragments('foobar.y1': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.ArrayList': FqName@57) = null
-    packageFragments('java.Int': FqName@58) = null
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.Any': FqName@61) = null
-    packageFragments('java.lang.ArrayList': FqName@62) = null
-    packageFragments('java.lang.Boolean': FqName@63) = null
-    packageFragments('java.lang.E': FqName@64) = null
-    packageFragments('java.lang.I': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Iterable': FqName@67) = null
-    packageFragments('java.lang.Iteratee': FqName@68) = null
-    packageFragments('java.lang.List': FqName@69) = null
-    packageFragments('java.lang.O': FqName@70) = null
-    packageFragments('java.lang.T': FqName@71) = null
-    packageFragments('java.lang.util': FqName@72) = null
-    packageFragments('java.util': FqName@73) = LazyJavaPackageFragment@74['util']
-    packageFragments('java.util.Int': FqName@75) = null
-    packageFragments('java.util.List': FqName@76) = null
-    packageFragments('java.util.util': FqName@77) = null
-    packageFragments('kotlin': FqName@78) = null
-    packageFragments('kotlin.Any': FqName@79) = null
-    packageFragments('kotlin.ArrayList': FqName@80) = null
-    packageFragments('kotlin.Boolean': FqName@81) = null
-    packageFragments('kotlin.E': FqName@82) = null
-    packageFragments('kotlin.I': FqName@83) = null
-    packageFragments('kotlin.Int': FqName@84) = null
-    packageFragments('kotlin.Iterable': FqName@85) = null
-    packageFragments('kotlin.Iteratee': FqName@86) = null
-    packageFragments('kotlin.List': FqName@87) = null
-    packageFragments('kotlin.O': FqName@88) = null
-    packageFragments('kotlin.T': FqName@89) = null
-    packageFragments('kotlin.io': FqName@90) = null
-    packageFragments('kotlin.jvm': FqName@91) = null
-    packageFragments('kotlin.util': FqName@92) = null
-    packageFragments('util': FqName@93) = null
-    topLevelClasses(JavaClassImpl@94['List']) = LazyJavaClassDescriptor@7['List']
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('ArrayList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('util': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@101) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('util': Name@103) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('ArrayList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('StrangeIterateeImpl': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('a': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foobar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('obj': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('util': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('StrangeIterateeImpl': Name@106) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@74['util'] {
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('List': Name@114) = LazyJavaClassDescriptor@7['List'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('a': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('util': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-LazyJavaTypeParameterDescriptor@10['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
-}
-
-LazyJavaTypeParameterResolver@120 {
-    resolve(JavaTypeParameterImpl@121['E']) = LazyJavaTypeParameterDescriptor@10['E']
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-null {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log b/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
deleted file mode 100644
index 1f0f4dec9f6..00000000000
--- a/compiler/testData/diagnostics/tests/PrimaryConstructors.lazy.log
+++ /dev/null
@@ -1,228 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['RuntimeException']
-}
-
-LazyJavaClassDescriptor@6['UnsupportedOperationException'] {
-    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@5['RuntimeException'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@13['UnsupportedOperationException'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['RuntimeException'] }
-}
-
-LazyJavaClassifierType@19['Exception'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@22['RuntimeException'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@5['RuntimeException']
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['String']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@34['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@40['Throwable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@49['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@16['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@52['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('Boolean': FqName@56) = null
-    packageFragments('Int': FqName@57) = null
-    packageFragments('Iterable': FqName@58) = null
-    packageFragments('Iterator': FqName@59) = null
-    packageFragments('MyIterable': FqName@60) = null
-    packageFragments('T': FqName@61) = null
-    packageFragments('X': FqName@62) = null
-    packageFragments('Y': FqName@63) = null
-    packageFragments('Y1': FqName@64) = null
-    packageFragments('Z': FqName@65) = null
-    packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
-    packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
-    packageFragments('java.lang.Boolean': FqName@70) = null
-    packageFragments('java.lang.Int': FqName@71) = null
-    packageFragments('java.lang.Iterable': FqName@72) = null
-    packageFragments('java.lang.Iterator': FqName@73) = null
-    packageFragments('java.lang.T': FqName@74) = null
-    packageFragments('java.lang.Y': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.Boolean': FqName@77) = null
-    packageFragments('kotlin.Int': FqName@78) = null
-    packageFragments('kotlin.Iterable': FqName@79) = null
-    packageFragments('kotlin.Iterator': FqName@80) = null
-    packageFragments('kotlin.T': FqName@81) = null
-    packageFragments('kotlin.Y': FqName@82) = null
-    packageFragments('kotlin.io': FqName@83) = null
-    packageFragments('kotlin.jvm': FqName@84) = null
-    topLevelClasses(JavaClassImpl@24['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@26['RuntimeException']) = LazyJavaClassDescriptor@4['RuntimeException']
-    topLevelClasses(JavaClassImpl@85['UnsupportedOperationException']) = LazyJavaClassDescriptor@6['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@55['<root>'] {
-    classes('Boolean': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Iterable': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Iterator': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('MyIterator': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('UnsupportedOperationException': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('MyIterator': Name@91) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('UnsupportedOperationException': Name@92) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@69['lang'] {
-    classes('MyIterator': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('UnsupportedOperationException': Name@92) = LazyJavaClassDescriptor@6['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('MyIterator': Name@91) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('UnsupportedOperationException': Name@92) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ProcessingEmptyImport.lazy.log b/compiler/testData/diagnostics/tests/ProcessingEmptyImport.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/ProcessingEmptyImport.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
deleted file mode 100644
index 7b38654fc0f..00000000000
--- a/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/ProjectionsInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/ProjectionsInSupertypes.lazy.log
deleted file mode 100644
index 68855cc049a..00000000000
--- a/compiler/testData/diagnostics/tests/ProjectionsInSupertypes.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Test': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.C': FqName@15) = null
-    packageFragments('java.lang.D': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.D': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
diff --git a/compiler/testData/diagnostics/tests/Properties.lazy.log b/compiler/testData/diagnostics/tests/Properties.lazy.log
deleted file mode 100644
index f54669f124a..00000000000
--- a/compiler/testData/diagnostics/tests/Properties.lazy.log
+++ /dev/null
@@ -1,205 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('Test': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Long': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Long': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('p': FqName@21) = null
-    packageFragments('x': FqName@22) = null
-    packageFragments('xx': FqName@23) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Long': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('b': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('x': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('b': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('x': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log b/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
deleted file mode 100644
index fec69421a91..00000000000
--- a/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
+++ /dev/null
@@ -1,167 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.b': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.b': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('b': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('b': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('b': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('b': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log b/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
deleted file mode 100644
index f2807934cb8..00000000000
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
+++ /dev/null
@@ -1,151 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Boolean': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Boolean': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('qualified_expressions': FqName@20) = null
-    packageFragments('qualified_expressions.Boolean': FqName@21) = null
-    packageFragments('qualified_expressions.Int': FqName@22) = null
-    packageFragments('qualified_expressions.String': FqName@23) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('startsWith': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('startsWith': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log b/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
deleted file mode 100644
index 190839068d5..00000000000
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
+++ /dev/null
@@ -1,181 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Int': FqName@10) = null
-    packageFragments('a': FqName@11) = null
-    packageFragments('a.foo': FqName@12) = null
-    packageFragments('b': FqName@13) = null
-    packageFragments('c': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('ok': FqName@24) = null
-    packageFragments('ok.a': FqName@25) = null
-    packageFragments('ok.a.Int': FqName@26) = null
-    packageFragments('ok.a.foo': FqName@27) = null
-    packageFragments('ok.b': FqName@28) = null
-    packageFragments('ok.b.Int': FqName@29) = null
-    packageFragments('ok.c': FqName@30) = null
-    packageFragments('ok.c.Int': FqName@31) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('bazz': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bar': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bazz': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log b/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
deleted file mode 100644
index 81ba1a8bb13..00000000000
--- a/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('bar': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('kotlin.reflect': FqName@17) = null
-    packageFragments('quux': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
deleted file mode 100644
index ee1c9b23dcf..00000000000
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
+++ /dev/null
@@ -1,300 +0,0 @@
-LazyJavaClassDescriptor@0['ArrayList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['ArrayList']
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassDescriptor@4['Collections'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functions('emptyList': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['emptyList'] } // through LazyJavaStaticClassScope@10
-    functions('emptyList': Name@7) = EmptyList@11[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@6
-    nestedClasses('emptyList': Name@7) = null // through LazyJavaClassMemberScope@6
-    properties('emptyList': Name@7) = EmptyList@11[empty] // through LazyJavaClassMemberScope@6
-    properties('emptyList': Name@7) = EmptyList@11[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@15['Collections']
-}
-
-LazyJavaClassDescriptor@16['Comparable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['Comparable']
-}
-
-LazyJavaClassDescriptor@18['RetentionPolicy'] {
-    typeConstructor = LazyJavaClassTypeConstructor@19['RetentionPolicy']
-}
-
-LazyJavaClassTypeConstructor@1['ArrayList'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['E'] }
-}
-
-LazyJavaClassTypeConstructor@3['Class'] {
-    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['T'] }
-}
-
-LazyJavaClassTypeConstructor@15['Collections'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Comparable'] {
-    parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['T'] }
-}
-
-LazyJavaClassTypeConstructor@19['RetentionPolicy'] {
-    parameters = ArrayList@28[empty]
-}
-
-LazyJavaClassifierType@29['List<T>'] {
-    arguments = ArrayList@30[1] { TypeProjectionImpl@31 }
-    classifier = JavaClassImpl@32['List']
-    memberScope = SubstitutingScope@33
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['List<T>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@32['List']
-    memberScope = SubstitutingScope@39
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Object'] {
-    classifier = JavaClassImpl@43['Object']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['T'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@47['T']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaClassifierType@49['T'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaClassifierType@52['T'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaClassifierType@54['T'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@47['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Collection': FqName@59) = null
-    packageFragments('Int': FqName@60) = null
-    packageFragments('String': FqName@61) = null
-    packageFragments('annotation': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.Class': FqName@67) = null
-    packageFragments('java.lang.Collection': FqName@68) = null
-    packageFragments('java.lang.Comparable': FqName@69) = null
-    packageFragments('java.lang.Int': FqName@70) = null
-    packageFragments('java.lang.String': FqName@71) = null
-    packageFragments('java.lang.annotation': FqName@72) = LazyJavaPackageFragment@73['annotation']
-    packageFragments('java.lang.annotation.RetentionPolicy': FqName@74) = null
-    packageFragments('java.util': FqName@75) = LazyJavaPackageFragment@76['util']
-    packageFragments('java.util.ArrayList': FqName@77) = null
-    packageFragments('java.util.Collections': FqName@78) = null
-    packageFragments('kotlin': FqName@79) = null
-    packageFragments('kotlin.Collection': FqName@80) = null
-    packageFragments('kotlin.Int': FqName@81) = null
-    packageFragments('kotlin.String': FqName@82) = null
-    packageFragments('kotlin.annotation': FqName@83) = null
-    packageFragments('kotlin.io': FqName@84) = null
-    packageFragments('kotlin.jvm': FqName@85) = null
-    topLevelClasses(JavaClassImpl@86['ArrayList']) = LazyJavaClassDescriptor@0['ArrayList']
-    topLevelClasses(JavaClassImpl@87['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@88['Collections']) = LazyJavaClassDescriptor@4['Collections']
-    topLevelClasses(JavaClassImpl@89['Comparable']) = LazyJavaClassDescriptor@16['Comparable']
-    topLevelClasses(JavaClassImpl@90['RetentionPolicy']) = LazyJavaClassDescriptor@18['RetentionPolicy']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Collection': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('annotation': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('java': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@73['annotation'] {
-    classes('RetentionPolicy': Name@98) = LazyJavaClassDescriptor@18['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@64['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('util': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@103) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@66['lang'] {
-    classes('Class': Name@105) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Comparable': Name@107) = LazyJavaClassDescriptor@16['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('annotation': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('java': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@76['util'] {
-    classes('ArrayList': Name@108) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Collections': Name@110) = LazyJavaClassDescriptor@4['Collections'] // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@97 // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
-    upperBounds = LinkedHashSet@112[1] { NullableType@113 }
-}
-
-LazyJavaTypeParameterDescriptor@114['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@115[1] { NullableType@116 }
-    upperBoundsAsType = NullableType@116
-}
-
-LazyJavaTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
-}
-
-LazyJavaTypeParameterDescriptor@23['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-    upperBounds = LinkedHashSet@121[1] { NullableType@122 }
-}
-
-LazyJavaTypeParameterResolver@123 {
-    resolve(JavaTypeParameterImpl@124['E']) = LazyJavaTypeParameterDescriptor@21['E']
-}
-
-LazyJavaTypeParameterResolver@125 {
-    resolve(JavaTypeParameterImpl@126['T']) = LazyJavaTypeParameterDescriptor@27['T']
-}
-
-LazyJavaTypeParameterResolver@127 {
-    resolve(JavaTypeParameterImpl@128['T']) = LazyJavaTypeParameterDescriptor@23['T']
-}
-
-LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@114['T']
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-null {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log b/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
deleted file mode 100644
index 23921798cd1..00000000000
--- a/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
+++ /dev/null
@@ -1,1360 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['Appendable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassDescriptor@10['ArrayList'] {
-    constructors = ArrayList@11[3] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@17['ArrayList']
-}
-
-LazyJavaClassDescriptor@18['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@22['Charset'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
-}
-
-LazyJavaClassDescriptor@24['Class'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassDescriptor@25['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
-}
-
-LazyJavaClassDescriptor@29['Collections'] {
-    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@31
-    functions('emptyList': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['emptyList'] } // through LazyJavaStaticClassScope@35
-    functions('emptyList': Name@32) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    functions('singleton': Name@36) = ArrayList@37[1] { JavaMethodDescriptor@38['singleton'] } // through LazyJavaStaticClassScope@35
-    functions('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaStaticClassScope@35
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@31
-    nestedClasses('emptyList': Name@42) = null // through LazyJavaClassMemberScope@31
-    nestedClasses('singleton': Name@36) = null // through LazyJavaClassMemberScope@31
-    properties('emptyList': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    properties('emptyList': Name@42) = EmptyList@6[empty] // through LazyJavaStaticClassScope@35
-    properties('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    properties('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaStaticClassScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@43['Collections']
-}
-
-LazyJavaClassDescriptor@44['Comparable'] {
-    allDescriptors = ArrayList@45[4] { DeserializedSimpleFunctionDescriptor@46['hashCode'], DeserializedSimpleFunctionDescriptor@47['toString'], DeserializedSimpleFunctionDescriptor@48['equals'], ... } // through LazyJavaClassMemberScope@49
-    annotations = LazyJavaAnnotations@50
-    defaultType = JetTypeImpl@51['Comparable<1>']
-    enumEntryIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@49
-    functionTypeForSamInterface = JetTypeImpl@53['Function1<2>']
-    functions('clone': Name@54) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    functions('compareTo': Name@55) = ArrayList@56[1] { JavaMethodDescriptor@57['compareTo'] } // through LazyJavaClassMemberScope@49
-    functions('equals': Name@58) = ArrayList@59[1] { DeserializedSimpleFunctionDescriptor@48['equals'] } // through LazyJavaClassMemberScope@49
-    functions('finalize': Name@60) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    functions('getClass': Name@61) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    functions('hashCode': Name@62) = ArrayList@63[1] { DeserializedSimpleFunctionDescriptor@46['hashCode'] } // through LazyJavaClassMemberScope@49
-    functions('notify': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    functions('notifyAll': Name@65) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    functions('toString': Name@66) = ArrayList@67[1] { DeserializedSimpleFunctionDescriptor@47['toString'] } // through LazyJavaClassMemberScope@49
-    functions('wait': Name@68) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@69 // through LazyJavaClassMemberScope@49
-    nestedClassIndex = LinkedHashMap@70 // through LazyJavaClassMemberScope@49
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@71['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@72['Comparable']
-}
-
-LazyJavaClassDescriptor@73['Exception'] {
-    enumEntryIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@75
-    functions('getMessage': Name@76) = ArrayList@77[1] { DeserializedSimpleFunctionDescriptor@78['getMessage'] } // through LazyJavaClassMemberScope@75
-    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@75
-    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@75
-    nestedClasses('getMessage': Name@76) = null // through LazyJavaClassMemberScope@75
-    typeConstructor = LazyJavaClassTypeConstructor@81['Exception']
-}
-
-LazyJavaClassDescriptor@82['File'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@83['File']
-}
-
-LazyJavaClassDescriptor@84['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@85
-    memberIndex = computeMemberIndex$1@86 // through LazyJavaClassMemberScope@85
-    typeConstructor = LazyJavaClassTypeConstructor@87['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@88['List'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@89['List']
-}
-
-LazyJavaClassDescriptor@90['Object'] {
-    typeConstructor = LazyJavaClassTypeConstructor@91['Object']
-}
-
-LazyJavaClassDescriptor@92['OutputStream'] {
-    functionTypeForSamInterface = null
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@93
-    memberIndex = computeMemberIndex$1@94 // through LazyJavaClassMemberScope@93
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassDescriptor@96['PrintStream'] {
-    constructors = ArrayList@97[10] { JavaConstructorDescriptor@98['<init>'], JavaConstructorDescriptor@99['<init>'], JavaConstructorDescriptor@100['<init>'], ... } // through LazyJavaClassMemberScope@101
-    defaultType = JetTypeImpl@102['PrintStream']
-    enumEntryIndex = LinkedHashMap@103 // through LazyJavaClassMemberScope@101
-    functionTypeForSamInterface = null
-    functions('println': Name@104) = ArrayList@105[10] { JavaMethodDescriptor@106['println'], JavaMethodDescriptor@107['println'], JavaMethodDescriptor@108['println'], ... } // through LazyJavaClassMemberScope@101
-    memberIndex = computeMemberIndex$1@109 // through LazyJavaClassMemberScope@101
-    nestedClassIndex = LinkedHashMap@110 // through LazyJavaClassMemberScope@101
-    nestedClasses('println': Name@104) = null // through LazyJavaClassMemberScope@101
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@111['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@112['PrintStream']
-}
-
-LazyJavaClassDescriptor@113['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@114['RandomAccess']
-}
-
-LazyJavaClassDescriptor@115['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@116['Serializable']
-}
-
-LazyJavaClassDescriptor@117['System'] {
-    enumEntryIndex = LinkedHashMap@118 // through LazyJavaClassMemberScope@119
-    memberIndex = computeMemberIndex$1@120 // through LazyJavaClassMemberScope@119
-    memberIndex = computeMemberIndex$1@121 // through LazyJavaStaticClassScope@122
-    nestedClassIndex = LinkedHashMap@123 // through LazyJavaClassMemberScope@119
-    nestedClasses('out': Name@124) = null // through LazyJavaClassMemberScope@119
-    properties('out': Name@124) = ArrayList@125[1] { JavaPropertyDescriptor@126['out'] } // through LazyJavaStaticClassScope@122
-    properties('out': Name@124) = EmptyList@6[empty] // through LazyJavaClassMemberScope@119
-    typeConstructor = LazyJavaClassTypeConstructor@127['System']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@128[1] { LazyJavaClassifierType@129['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@130[1] { LazyJavaTypeParameterDescriptor@131['E'] }
-    supertypes = ArrayList@132[2] { LazyJavaClassifierType@133['AbstractCollection<E>'], LazyJavaClassifierType@134['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    parameters = ArrayList@135[empty]
-    supertypes = ArrayList@136[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['ArrayList'] {
-    parameters = ArrayList@138[1] { LazyJavaTypeParameterDescriptor@139['E'] }
-    supertypes = ArrayList@140[5] { LazyJavaClassifierType@141['AbstractList<E>'], LazyJavaClassifierType@142['List<E>'], LazyJavaClassifierType@143['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@21['AutoCloseable'] {
-    parameters = ArrayList@144[empty]
-    supertypes = ArrayList@145[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Charset'] {
-    parameters = ArrayList@146[empty]
-}
-
-LazyJavaClassTypeConstructor@28['Closeable'] {
-    parameters = ArrayList@147[empty]
-    supertypes = ArrayList@148[1] { LazyJavaClassifierType@149['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@43['Collections'] {
-    supertypes = ArrayList@150[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassTypeConstructor@72['Comparable'] {
-    parameters = ArrayList@151[1] { LazyJavaTypeParameterDescriptor@152['T'] }
-    supertypes = ArrayList@153[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassTypeConstructor@81['Exception'] {
-    parameters = ArrayList@154[empty]
-    supertypes = ArrayList@155[1] { LazyJavaClassifierType@156['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@83['File'] {
-    parameters = ArrayList@157[empty]
-}
-
-LazyJavaClassTypeConstructor@87['FilterOutputStream'] {
-    parameters = ArrayList@158[empty]
-    supertypes = ArrayList@159[1] { LazyJavaClassifierType@160['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@89['List'] {
-    parameters = ArrayList@161[1] { LazyJavaTypeParameterDescriptor@162['E'] }
-}
-
-LazyJavaClassTypeConstructor@91['Object'] {
-    parameters = ArrayList@163[empty]
-    supertypes = ArrayList@164[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassTypeConstructor@95['OutputStream'] {
-    parameters = ArrayList@165[empty]
-    supertypes = ArrayList@166[1] { LazyJavaClassifierType@167['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@112['PrintStream'] {
-    parameters = ArrayList@168[empty]
-    supertypes = ArrayList@169[3] { LazyJavaClassifierType@170['FilterOutputStream'], LazyJavaClassifierType@171['Appendable'], LazyJavaClassifierType@172['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@127['System'] {
-    supertypes = ArrayList@173[1] { JetTypeImpl@137['Any'] }
-}
-
-LazyJavaClassifierType@133['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@174['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@141['AbstractList<E>'] {
-    arguments = ArrayList@175[1] { TypeProjectionImpl@176 }
-    classifier = JavaClassImpl@177['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@171['Appendable'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaClassImpl@179['Appendable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassifierType@149['AutoCloseable'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaClassImpl@181['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
-}
-
-LazyJavaClassifierType@182['Charset'] {
-    arguments = ArrayList@183[empty]
-    classifier = JavaClassImpl@184['Charset']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
-}
-
-LazyJavaClassifierType@186['Charset'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaClassImpl@188['Charset']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
-}
-
-LazyJavaClassifierType@189['Charset'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@188['Charset']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
-}
-
-LazyJavaClassifierType@192['Charset'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@184['Charset']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
-}
-
-LazyJavaClassifierType@194['Cloneable'] {
-    classifier = JavaClassImpl@195['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@196
-}
-
-LazyJavaClassifierType@167['Closeable'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@198['Closeable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
-}
-
-LazyJavaClassifierType@172['Closeable'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@200['Closeable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
-}
-
-LazyJavaClassifierType@201['Collection<? extends E>'] {
-    arguments = ArrayList@202[1] { TypeProjectionImpl@203 }
-    classifier = JavaClassImpl@204['Collection']
-    memberScope = SubstitutingScope@205
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@206
-}
-
-LazyJavaClassifierType@207['Collection<? extends E>'] {
-    arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
-    classifier = JavaClassImpl@204['Collection']
-    memberScope = SubstitutingScope@210
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@211
-}
-
-LazyJavaClassifierType@129['Collection<E>'] {
-    classifier = JavaClassImpl@212['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@206
-}
-
-LazyJavaClassifierType@213['E'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@215['E']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@217['E'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@219['E']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
-}
-
-LazyJavaClassifierType@221['E'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@223['E']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@224['E'] {
-    arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@226['E']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@227['E'] {
-    arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@215['E']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@229['E'] {
-    arguments = ArrayList@230[empty]
-    classifier = JavaTypeParameterImpl@219['E']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
-}
-
-LazyJavaClassifierType@231['E'] {
-    arguments = ArrayList@232[empty]
-    classifier = JavaTypeParameterImpl@226['E']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@233['E'] {
-    arguments = ArrayList@234[empty]
-    classifier = JavaTypeParameterImpl@223['E']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-}
-
-LazyJavaClassifierType@235['File'] {
-    arguments = ArrayList@236[empty]
-    classifier = JavaClassImpl@237['File']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@83['File']
-}
-
-LazyJavaClassifierType@238['File'] {
-    arguments = ArrayList@239[empty]
-    classifier = JavaClassImpl@240['File']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@83['File']
-}
-
-LazyJavaClassifierType@241['File'] {
-    arguments = ArrayList@242[empty]
-    classifier = JavaClassImpl@240['File']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@83['File']
-}
-
-LazyJavaClassifierType@243['File'] {
-    arguments = ArrayList@244[empty]
-    classifier = JavaClassImpl@237['File']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@83['File']
-}
-
-LazyJavaClassifierType@170['FilterOutputStream'] {
-    arguments = ArrayList@245[empty]
-    classifier = JavaClassImpl@246['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@85
-    typeConstructor = LazyJavaClassTypeConstructor@87['FilterOutputStream']
-}
-
-LazyJavaClassifierType@247['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@248
-}
-
-LazyJavaClassifierType@134['List<E>'] {
-    arguments = ArrayList@249[1] { TypeProjectionImpl@250 }
-    classifier = JavaClassImpl@251['List']
-    memberScope = SubstitutingScope@252
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@253
-}
-
-LazyJavaClassifierType@142['List<E>'] {
-    classifier = JavaClassImpl@254['List']
-    typeConstructor = DeserializedClassTypeConstructor@253
-}
-
-LazyJavaClassifierType@255['List<T>'] {
-    arguments = ArrayList@256[1] { TypeProjectionImpl@257 }
-    classifier = JavaClassImpl@258['List']
-    memberScope = SubstitutingScope@259
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@253
-}
-
-LazyJavaClassifierType@260['List<T>'] {
-    arguments = ArrayList@261[1] { TypeProjectionImpl@262 }
-    classifier = JavaClassImpl@258['List']
-    memberScope = SubstitutingScope@263
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@264
-}
-
-LazyJavaClassifierType@265['Object'] {
-    arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@267['Object']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@269['Object'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@267['Object']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@271['Object'] {
-    classifier = JavaClassImpl@272['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@273['Object'] {
-    classifier = JavaClassImpl@274['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@275['Object'] {
-    classifier = JavaClassImpl@276['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@277['Object'] {
-    classifier = JavaClassImpl@278['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@279['Object'] {
-    classifier = JavaClassImpl@280['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@281['Object'] {
-    classifier = JavaClassImpl@282['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@283['Object'] {
-    classifier = JavaClassImpl@284['Object']
-    typeConstructor = DeserializedClassTypeConstructor@268
-}
-
-LazyJavaClassifierType@160['OutputStream'] {
-    arguments = ArrayList@285[empty]
-    classifier = JavaClassImpl@286['OutputStream']
-    memberScope = LazyJavaClassMemberScope@93
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@287['OutputStream'] {
-    arguments = ArrayList@288[empty]
-    classifier = JavaClassImpl@289['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@290['OutputStream'] {
-    arguments = ArrayList@291[empty]
-    classifier = JavaClassImpl@292['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@293['OutputStream'] {
-    arguments = ArrayList@294[empty]
-    classifier = JavaClassImpl@295['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@296['OutputStream'] {
-    arguments = ArrayList@297[empty]
-    classifier = JavaClassImpl@298['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@299['OutputStream'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaClassImpl@301['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@302['OutputStream'] {
-    arguments = ArrayList@303[empty]
-    classifier = JavaClassImpl@304['OutputStream']
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@305['OutputStream'] {
-    arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@298['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@307['OutputStream'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@292['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@309['OutputStream'] {
-    arguments = ArrayList@310[empty]
-    classifier = JavaClassImpl@289['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@311['OutputStream'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@301['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@313['OutputStream'] {
-    arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@304['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@315['OutputStream'] {
-    arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@295['OutputStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
-}
-
-LazyJavaClassifierType@317['PrintStream'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@319['PrintStream']
-    memberScope = LazyJavaClassMemberScope@101
-    nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@112['PrintStream']
-}
-
-LazyJavaClassifierType@320['PrintStream'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@319['PrintStream']
-    nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@112['PrintStream']
-}
-
-LazyJavaClassifierType@143['RandomAccess'] {
-    classifier = JavaClassImpl@322['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@114['RandomAccess']
-}
-
-LazyJavaClassifierType@323['Serializable'] {
-    classifier = JavaClassImpl@324['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@116['Serializable']
-}
-
-LazyJavaClassifierType@325['Set<T>'] {
-    arguments = ArrayList@326[1] { TypeProjectionImpl@327 }
-    classifier = JavaClassImpl@328['Set']
-    memberScope = SubstitutingScope@329
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@330
-}
-
-LazyJavaClassifierType@331['Set<T>'] {
-    arguments = ArrayList@332[1] { TypeProjectionImpl@333 }
-    classifier = JavaClassImpl@328['Set']
-    memberScope = SubstitutingScope@334
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@335
-}
-
-LazyJavaClassifierType@336['String'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@338['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@340['String'] {
-    arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@342['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@343['String'] {
-    arguments = ArrayList@344[empty]
-    classifier = JavaClassImpl@345['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@346['String'] {
-    arguments = ArrayList@347[empty]
-    classifier = JavaClassImpl@348['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@349['String'] {
-    arguments = ArrayList@350[empty]
-    classifier = JavaClassImpl@351['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@352['String'] {
-    arguments = ArrayList@353[empty]
-    classifier = JavaClassImpl@354['String']
-    nullable = 'false': Boolean@185
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@355['String'] {
-    arguments = ArrayList@356[empty]
-    classifier = JavaClassImpl@345['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@357['String'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@338['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@359['String'] {
-    arguments = ArrayList@360[empty]
-    classifier = JavaClassImpl@351['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@361['String'] {
-    arguments = ArrayList@362[empty]
-    classifier = JavaClassImpl@348['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@363['String'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@342['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@365['String'] {
-    arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@354['String']
-    nullable = 'true': Boolean@191
-    typeConstructor = DeserializedClassTypeConstructor@339
-}
-
-LazyJavaClassifierType@367['T'] {
-    arguments = ArrayList@368[empty]
-    classifier = JavaTypeParameterImpl@369['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@371['T'] {
-    arguments = ArrayList@372[empty]
-    classifier = JavaTypeParameterImpl@373['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
-}
-
-LazyJavaClassifierType@375['T'] {
-    arguments = ArrayList@376[empty]
-    classifier = JavaTypeParameterImpl@377['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@378['T'] {
-    arguments = ArrayList@379[empty]
-    classifier = JavaTypeParameterImpl@380['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
-}
-
-LazyJavaClassifierType@381['T'] {
-    arguments = ArrayList@382[empty]
-    classifier = JavaTypeParameterImpl@383['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
-}
-
-LazyJavaClassifierType@385['T'] {
-    arguments = ArrayList@386[empty]
-    classifier = JavaTypeParameterImpl@387['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@388['T'] {
-    arguments = ArrayList@389[empty]
-    classifier = JavaTypeParameterImpl@390['T']
-    nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
-}
-
-LazyJavaClassifierType@391['T'] {
-    arguments = ArrayList@392[empty]
-    classifier = JavaTypeParameterImpl@373['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
-}
-
-LazyJavaClassifierType@393['T'] {
-    arguments = ArrayList@394[empty]
-    classifier = JavaTypeParameterImpl@390['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
-}
-
-LazyJavaClassifierType@395['T'] {
-    arguments = ArrayList@396[empty]
-    classifier = JavaTypeParameterImpl@383['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
-}
-
-LazyJavaClassifierType@397['T'] {
-    arguments = ArrayList@398[empty]
-    classifier = JavaTypeParameterImpl@387['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@399['T'] {
-    arguments = ArrayList@400[empty]
-    classifier = JavaTypeParameterImpl@369['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@401['T'] {
-    arguments = ArrayList@402[empty]
-    classifier = JavaTypeParameterImpl@380['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
-}
-
-LazyJavaClassifierType@403['T'] {
-    arguments = ArrayList@404[empty]
-    classifier = JavaTypeParameterImpl@377['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
-LazyJavaClassifierType@156['Throwable'] {
-    arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@406['Throwable']
-    memberScope = DeserializedClassMemberScope@407
-    typeConstructor = DeserializedClassTypeConstructor@408
-}
-
-LazyJavaPackageFragmentProvider@409 {
-    packageFragments('<root>': FqName@410) = LazyJavaPackageFragment@411['<root>']
-    packageFragments('Collections': FqName@412) = null
-    packageFragments('Com': FqName@413) = null
-    packageFragments('Exception': FqName@414) = null
-    packageFragments('Int': FqName@415) = null
-    packageFragments('MutableList': FqName@416) = null
-    packageFragments('Object': FqName@417) = null
-    packageFragments('Set': FqName@418) = null
-    packageFragments('System': FqName@419) = null
-    packageFragments('java': FqName@420) = LazyJavaPackageFragment@421['java']
-    packageFragments('java.Collections': FqName@422) = null
-    packageFragments('java.Com': FqName@423) = null
-    packageFragments('java.Exception': FqName@424) = null
-    packageFragments('java.Int': FqName@425) = null
-    packageFragments('java.List': FqName@426) = null
-    packageFragments('java.MutableList': FqName@427) = null
-    packageFragments('java.Object': FqName@428) = null
-    packageFragments('java.Set': FqName@429) = null
-    packageFragments('java.System': FqName@430) = null
-    packageFragments('java.io': FqName@431) = LazyJavaPackageFragment@432['io']
-    packageFragments('java.io.File': FqName@433) = null
-    packageFragments('java.io.PrintStream': FqName@434) = null
-    packageFragments('java.lang': FqName@435) = LazyJavaPackageFragment@436['lang']
-    packageFragments('java.lang.Class': FqName@437) = null
-    packageFragments('java.lang.Collections': FqName@438) = null
-    packageFragments('java.lang.Com': FqName@439) = null
-    packageFragments('java.lang.Comparable': FqName@440) = null
-    packageFragments('java.lang.Exception': FqName@441) = null
-    packageFragments('java.lang.Int': FqName@442) = null
-    packageFragments('java.lang.MutableList': FqName@443) = null
-    packageFragments('java.lang.Object': FqName@444) = null
-    packageFragments('java.lang.Set': FqName@445) = null
-    packageFragments('java.lang.System': FqName@446) = null
-    packageFragments('java.nio.charset': FqName@447) = LazyJavaPackageFragment@448['charset']
-    packageFragments('java.util': FqName@449) = LazyJavaPackageFragment@450['util']
-    packageFragments('java.util.Collections': FqName@451) = null
-    packageFragments('java.util.Com': FqName@452) = null
-    packageFragments('java.util.Exception': FqName@453) = null
-    packageFragments('java.util.Int': FqName@454) = null
-    packageFragments('java.util.List': FqName@455) = null
-    packageFragments('java.util.MutableList': FqName@456) = null
-    packageFragments('java.util.Object': FqName@457) = null
-    packageFragments('java.util.Set': FqName@458) = null
-    packageFragments('java.util.System': FqName@459) = null
-    packageFragments('java.util.util': FqName@460) = null
-    packageFragments('java.utils': FqName@461) = null
-    packageFragments('kotlin': FqName@462) = null
-    packageFragments('kotlin.Collections': FqName@463) = null
-    packageFragments('kotlin.Com': FqName@464) = null
-    packageFragments('kotlin.Exception': FqName@465) = null
-    packageFragments('kotlin.Int': FqName@466) = null
-    packageFragments('kotlin.MutableList': FqName@467) = null
-    packageFragments('kotlin.Object': FqName@468) = null
-    packageFragments('kotlin.Set': FqName@469) = null
-    packageFragments('kotlin.System': FqName@470) = null
-    packageFragments('kotlin.io': FqName@471) = null
-    packageFragments('kotlin.jvm': FqName@472) = null
-    packageFragments('l': FqName@473) = null
-    packageFragments('util': FqName@474) = null
-    packageFragments('utils': FqName@475) = null
-    packageFragments('xxx': FqName@476) = null
-    packageFragments('xxx.Class': FqName@477) = null
-    topLevelClasses(JavaClassImpl@174['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@177['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@179['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@478['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
-    topLevelClasses(JavaClassImpl@181['AutoCloseable']) = LazyJavaClassDescriptor@18['AutoCloseable']
-    topLevelClasses(JavaClassImpl@188['Charset']) = LazyJavaClassDescriptor@22['Charset']
-    topLevelClasses(JavaClassImpl@479['Class']) = LazyJavaClassDescriptor@24['Class']
-    topLevelClasses(JavaClassImpl@200['Closeable']) = LazyJavaClassDescriptor@25['Closeable']
-    topLevelClasses(JavaClassImpl@480['Collections']) = LazyJavaClassDescriptor@29['Collections']
-    topLevelClasses(JavaClassImpl@481['Comparable']) = LazyJavaClassDescriptor@44['Comparable']
-    topLevelClasses(JavaClassImpl@482['Exception']) = LazyJavaClassDescriptor@73['Exception']
-    topLevelClasses(JavaClassImpl@483['File']) = LazyJavaClassDescriptor@82['File']
-    topLevelClasses(JavaClassImpl@246['FilterOutputStream']) = LazyJavaClassDescriptor@84['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@484['List']) = LazyJavaClassDescriptor@88['List']
-    topLevelClasses(JavaClassImpl@485['Object']) = LazyJavaClassDescriptor@90['Object']
-    topLevelClasses(JavaClassImpl@286['OutputStream']) = LazyJavaClassDescriptor@92['OutputStream']
-    topLevelClasses(JavaClassImpl@486['PrintStream']) = LazyJavaClassDescriptor@96['PrintStream']
-    topLevelClasses(JavaClassImpl@322['RandomAccess']) = LazyJavaClassDescriptor@113['RandomAccess']
-    topLevelClasses(JavaClassImpl@324['Serializable']) = LazyJavaClassDescriptor@115['Serializable']
-    topLevelClasses(JavaClassImpl@487['Set']) = LazyJavaClassDescriptor@488['Set']
-    topLevelClasses(JavaClassImpl@489['System']) = LazyJavaClassDescriptor@117['System']
-}
-
-LazyJavaPackageFragment@411['<root>'] {
-    classes('ArrayList': Name@490) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Collections': Name@492) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Com': Name@493) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Exception': Name@494) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Int': Name@495) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('List': Name@496) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('MutableList': Name@497) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Object': Name@498) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('PrintStream': Name@499) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('Set': Name@500) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('java': Name@502) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('utils': Name@504) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('java': Name@508) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('utils': Name@509) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    memberIndex = computeMemberIndex$1@510 // through LazyPackageFragmentScopeForJavaPackage@491
-}
-
-LazyJavaPackageFragment@432['io'] {
-    classes('File': Name@511) = LazyJavaClassDescriptor@82['File'] // through LazyPackageFragmentScopeForJavaPackage@512
-    classes('PrintStream': Name@513) = LazyJavaClassDescriptor@96['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@512
-    deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@512
-    functions('PrintStream': Name@514) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@512
-    memberIndex = computeMemberIndex$1@515 // through LazyPackageFragmentScopeForJavaPackage@512
-}
-
-LazyJavaPackageFragment@421['java'] {
-    classes('ArrayList': Name@490) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('Exception': Name@494) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('Int': Name@495) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('List': Name@517) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('MutableList': Name@497) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('Object': Name@498) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('Set': Name@500) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('io': Name@518) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('lang': Name@520) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('util': Name@521) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('utils': Name@522) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('io': Name@523) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('lang': Name@524) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('util': Name@525) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    memberIndex = computeMemberIndex$1@526 // through LazyPackageFragmentScopeForJavaPackage@516
-}
-
-LazyJavaPackageFragment@436['lang'] {
-    classes('ArrayList': Name@490) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Class': Name@528) = LazyJavaClassDescriptor@24['Class'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Comparable': Name@529) = LazyJavaClassDescriptor@44['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Exception': Name@494) = LazyJavaClassDescriptor@73['Exception'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('List': Name@496) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Object': Name@530) = LazyJavaClassDescriptor@90['Object'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('System': Name@501) = LazyJavaClassDescriptor@117['System'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('Class': Name@531) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('Comparable': Name@532) = ArrayList@533[1] { SamConstructorDescriptor@534['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    memberIndex = computeMemberIndex$1@535 // through LazyPackageFragmentScopeForJavaPackage@527
-}
-
-LazyJavaPackageFragment@450['util'] {
-    classes('ArrayList': Name@490) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Collections': Name@492) = LazyJavaClassDescriptor@29['Collections'] // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Exception': Name@494) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Int': Name@495) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('List': Name@537) = LazyJavaClassDescriptor@88['List'] // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('MutableList': Name@497) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Object': Name@498) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Set': Name@500) = LazyJavaClassDescriptor@488['Set'] // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@536
-    functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
-    functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
-    functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
-    memberIndex = computeMemberIndex$1@538 // through LazyPackageFragmentScopeForJavaPackage@536
-}
-
-LazyJavaTypeParameterDescriptor@139['E'] {
-    defaultType = JetTypeImpl@539['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
-    upperBounds = LinkedHashSet@540[1] { NullableType@541 }
-}
-
-LazyJavaTypeParameterDescriptor@162['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-    upperBounds = LinkedHashSet@543[1] { NullableType@544 }
-}
-
-LazyJavaTypeParameterDescriptor@131['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
-}
-
-LazyJavaTypeParameterDescriptor@152['T'] {
-    defaultType = JetTypeImpl@545['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
-    upperBounds = LinkedHashSet@546[1] { NullableType@547 }
-}
-
-LazyJavaTypeParameterDescriptor@548['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
-    upperBounds = LinkedHashSet@549[1] { NullableType@550 }
-    upperBoundsAsType = NullableType@550
-}
-
-LazyJavaTypeParameterDescriptor@551['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-    upperBounds = LinkedHashSet@552[1] { NullableType@553 }
-    upperBoundsAsType = NullableType@553
-}
-
-LazyJavaTypeParameterResolver@554 {
-    resolve(JavaTypeParameterImpl@555['E']) = LazyJavaTypeParameterDescriptor@131['E']
-}
-
-LazyJavaTypeParameterResolver@556 {
-    resolve(JavaTypeParameterImpl@557['E']) = LazyJavaTypeParameterDescriptor@162['E']
-}
-
-LazyJavaTypeParameterResolver@558 {
-    resolve(JavaTypeParameterImpl@559['E']) = LazyJavaTypeParameterDescriptor@139['E']
-}
-
-LazyJavaTypeParameterResolver@560 {
-    resolve(JavaTypeParameterImpl@561['T']) = LazyJavaTypeParameterDescriptor@548['T']
-}
-
-LazyJavaTypeParameterResolver@562 {
-    resolve(JavaTypeParameterImpl@390['T']) = LazyJavaTypeParameterDescriptor@152['T']
-}
-
-LazyJavaTypeParameterResolver@563 {
-    resolve(JavaTypeParameterImpl@564['T']) = LazyJavaTypeParameterDescriptor@551['T']
-}
-
-LazyJavaTypeParameterResolver@565 {
-    resolve(JavaTypeParameterImpl@390['T']) = null
-}
-
-LazyJavaTypeParameterResolver@566 {
-    resolve(JavaTypeParameterImpl@383['T']) = null
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[10] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
-}
-
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@575 {
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@578 {
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@593 {
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-}
-
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-}
-
-ResolutionTaskHolder@599 {
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@601 }
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[3] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@607 {
-    <name not found> = ArrayList@608[7] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@613 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@614 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@616 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@617 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@619 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@622 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@623 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@624[10] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
-    <name not found> = ArrayList@625[10] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@580 }
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@577 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@589 }
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@601 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@639[3] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Return.lazy.log b/compiler/testData/diagnostics/tests/Return.lazy.log
deleted file mode 100644
index 49e294229c4..00000000000
--- a/compiler/testData/diagnostics/tests/Return.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-ResolutionTaskHolder@17 {
-    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[7] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@19 }
-    <name not found> = ArrayList@40[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = ArrayList@41[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
deleted file mode 100644
index 0077ecc2002..00000000000
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[8] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@32[8] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
deleted file mode 100644
index bfc1cb8daa7..00000000000
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = NullableType@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('gg': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('gg': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('gg': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('gg': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
deleted file mode 100644
index 85cdbf5c208..00000000000
--- a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
+++ /dev/null
@@ -1,366 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-    <name not found> = StringValue@2
-    <name not found> = StringValue@3
-}
-
-LazyJavaClassDescriptor@4['Appendable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassDescriptor@10['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@14['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassDescriptor@18['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@22['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
-}
-
-LazyJavaClassDescriptor@26['PrintStream'] {
-    defaultType = JetTypeImpl@27['PrintStream']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
-    functions('println': Name@30) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
-    nestedClasses('println': Name@30) = null // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassDescriptor@39['System'] {
-    enumEntryIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaStaticClassScope@44
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@41
-    nestedClasses('out': Name@46) = null // through LazyJavaClassMemberScope@41
-    properties('out': Name@46) = ArrayList@47[1] { JavaPropertyDescriptor@48['out'] } // through LazyJavaStaticClassScope@44
-    properties('out': Name@46) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@49['System']
-}
-
-LazyJavaClassDescriptor@50['Test'] {
-    <name not found> = StringValue@51 // through LazyJavaStaticClassScope@52
-    enumEntryIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaStaticClassScope@52
-    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@54
-    nestedClasses('FOO': Name@58) = null // through LazyJavaClassMemberScope@54
-    properties('FOO': Name@58) = ArrayList@59[1] { JavaPropertyDescriptor@60['FOO'] } // through LazyJavaStaticClassScope@52
-    properties('FOO': Name@58) = EmptyList@6[empty] // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@61['Test']
-}
-
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Closeable'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@25['OutputStream'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@38['PrintStream'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['FilterOutputStream'], LazyJavaClassifierType@79['Appendable'], LazyJavaClassifierType@80['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@49['System'] {
-    supertypes = ArrayList@81[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@61['Test'] {
-    supertypes = ArrayList@82[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassifierType@79['Appendable'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@84['Appendable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassifierType@69['AutoCloseable'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassifierType@80['Closeable'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassifierType@75['Closeable'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassifierType@78['FilterOutputStream'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
-}
-
-LazyJavaClassifierType@93['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@94
-}
-
-LazyJavaClassifierType@95['Object'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['Object']
-    nullable = 'false': Boolean@98
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@100['Object'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@97['Object']
-    nullable = 'true': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@103['Object'] {
-    classifier = JavaClassImpl@104['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@105['Object'] {
-    classifier = JavaClassImpl@106['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@107['Object'] {
-    classifier = JavaClassImpl@108['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@109['Object'] {
-    classifier = JavaClassImpl@110['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@111['Object'] {
-    classifier = JavaClassImpl@112['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@72['OutputStream'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@114['OutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
-}
-
-LazyJavaClassifierType@115['PrintStream'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@117['PrintStream']
-    memberScope = LazyJavaClassMemberScope@29
-    nullable = 'false': Boolean@98
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassifierType@118['PrintStream'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@117['PrintStream']
-    nullable = 'true': Boolean@102
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassifierType@120['String'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['String']
-    memberScope = DeserializedClassMemberScope@123
-    typeConstructor = DeserializedClassTypeConstructor@124
-}
-
-LazyJavaClassifierType@125['String'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'false': Boolean@98
-    typeConstructor = DeserializedClassTypeConstructor@124
-}
-
-LazyJavaClassifierType@128['String'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'true': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@124
-}
-
-LazyJavaPackageFragmentProvider@130 {
-    packageFragments('<root>': FqName@131) = LazyJavaPackageFragment@132['<root>']
-    packageFragments('String': FqName@133) = null
-    packageFragments('System': FqName@134) = null
-    packageFragments('Test': FqName@135) = null
-    packageFragments('foo': FqName@136) = null
-    packageFragments('foo.String': FqName@137) = null
-    packageFragments('foo.s': FqName@138) = null
-    packageFragments('java': FqName@139) = LazyJavaPackageFragment@140['java']
-    packageFragments('java.io': FqName@141) = LazyJavaPackageFragment@142['io']
-    packageFragments('java.lang': FqName@143) = LazyJavaPackageFragment@144['lang']
-    packageFragments('java.lang.String': FqName@145) = null
-    packageFragments('java.lang.System': FqName@146) = null
-    packageFragments('java.lang.Test': FqName@147) = null
-    packageFragments('kotlin': FqName@148) = null
-    packageFragments('kotlin.String': FqName@149) = null
-    packageFragments('kotlin.System': FqName@150) = null
-    packageFragments('kotlin.Test': FqName@151) = null
-    packageFragments('kotlin.io': FqName@152) = null
-    packageFragments('kotlin.jvm': FqName@153) = null
-    topLevelClasses(JavaClassImpl@84['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@86['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
-    topLevelClasses(JavaClassImpl@88['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
-    topLevelClasses(JavaClassImpl@92['FilterOutputStream']) = LazyJavaClassDescriptor@18['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@114['OutputStream']) = LazyJavaClassDescriptor@22['OutputStream']
-    topLevelClasses(JavaClassImpl@117['PrintStream']) = LazyJavaClassDescriptor@26['PrintStream']
-    topLevelClasses(JavaClassImpl@154['System']) = LazyJavaClassDescriptor@39['System']
-    topLevelClasses(JavaClassImpl@155['Test']) = LazyJavaClassDescriptor@50['Test']
-}
-
-LazyJavaPackageFragment@132['<root>'] {
-    classes('System': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('Test': Name@158) = LazyJavaClassDescriptor@50['Test'] // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@157
-}
-
-LazyJavaPackageFragment@140['java'] {
-    classes('lang': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('lang': Name@163) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@144['lang'] {
-    classes('System': Name@156) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@165
-}
-
-LazyJavaTypeAttributes@166 {
-    howThisTypeIsUsedAccordingToAnnotations$delegate = TypeUsage@167
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@194[10] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.lazy.log b/compiler/testData/diagnostics/tests/ShiftFunctionTypes.lazy.log
deleted file mode 100644
index 72f0c77dfed..00000000000
--- a/compiler/testData/diagnostics/tests/ShiftFunctionTypes.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('XXX': FqName@7) = null
-    packageFragments('YYY': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('n': FqName@20) = null
-    packageFragments('n.B': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('n': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('n': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
deleted file mode 100644
index 499bb076ebc..00000000000
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
+++ /dev/null
@@ -1,133 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('getT': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('getTT': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('getTTT': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('ggetT': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('getT': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('getTT': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('getTTT': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('ggetT': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('getT': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('getTT': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('getTTT': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('ggetT': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('foo': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('getT': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('getTT': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('getTTT': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('ggetT': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/StringTemplates.lazy.log b/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
deleted file mode 100644
index 7d89f956600..00000000000
--- a/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = StringValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Any': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.xxx': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.xxx': FqName@23) = null
-    packageFragments('xxx': FqName@24) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('buzz': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('map': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('xxx': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('buzz': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('map': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('xxx': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('buzz': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('map': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('xxx': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('buzz': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('map': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('xxx': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@124[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@125[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@126[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@127[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log b/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
deleted file mode 100644
index 1c5adff084d..00000000000
--- a/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C1': FqName@3) = null
-    packageFragments('C2': FqName@4) = null
-    packageFragments('C3': FqName@5) = null
-    packageFragments('CTest1': FqName@6) = null
-    packageFragments('CTest2': FqName@7) = null
-    packageFragments('CTest3': FqName@8) = null
-    packageFragments('CTest4': FqName@9) = null
-    packageFragments('CTest5': FqName@10) = null
-    packageFragments('CTest6': FqName@11) = null
-    packageFragments('OC1': FqName@12) = null
-    packageFragments('T1': FqName@13) = null
-    packageFragments('T2': FqName@14) = null
-    packageFragments('Test': FqName@15) = null
-    packageFragments('Test1': FqName@16) = null
-    packageFragments('Test2': FqName@17) = null
-    packageFragments('Test3': FqName@18) = null
-    packageFragments('Test4': FqName@19) = null
-    packageFragments('Test5': FqName@20) = null
-    packageFragments('Test6': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.C1': FqName@26) = null
-    packageFragments('java.lang.C2': FqName@27) = null
-    packageFragments('java.lang.C3': FqName@28) = null
-    packageFragments('java.lang.OC1': FqName@29) = null
-    packageFragments('java.lang.T1': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.C1': FqName@32) = null
-    packageFragments('kotlin.C2': FqName@33) = null
-    packageFragments('kotlin.C3': FqName@34) = null
-    packageFragments('kotlin.OC1': FqName@35) = null
-    packageFragments('kotlin.T1': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-}
diff --git a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
deleted file mode 100644
index af5bcfd8ae3..00000000000
--- a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
-
-ResolutionTaskHolder@16 {
-    <name not found> = ArrayList@17[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
-}
-
-null {
-    <name not found> = ArrayList@21[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.lazy.log b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlightingEof.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log b/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
deleted file mode 100644
index 0c22f6feb37..00000000000
--- a/compiler/testData/diagnostics/tests/TraitOverrideObjectMethods.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-LazyJavaClassDescriptor@0['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassDescriptor@2['Object'] {
-    allDescriptors = ArrayList@3[11] { JavaMethodDescriptor@4['notifyAll'], JavaMethodDescriptor@5['notify'], JavaMethodDescriptor@6['hashCode'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Object']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@7
-    functions('clone': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['clone'] } // through LazyJavaClassMemberScope@7
-    functions('equals': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['equals'] } // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['finalize'] } // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@19) = ArrayList@20[1] { JavaMethodDescriptor@21['getClass'] } // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@22) = ArrayList@23[1] { JavaMethodDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('notify': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@5['notify'] } // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@4['notifyAll'] } // through LazyJavaClassMemberScope@7
-    functions('toString': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@31) = ArrayList@32[3] { JavaMethodDescriptor@33['wait'], JavaMethodDescriptor@34['wait'], JavaMethodDescriptor@35['wait'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Object']
-}
-
-LazyJavaClassTypeConstructor@1['Class'] {
-    parameters = ArrayList@40[1] { LazyJavaTypeParameterDescriptor@41['T'] }
-}
-
-LazyJavaClassTypeConstructor@39['Object'] {
-    parameters = ArrayList@42[empty]
-    supertypes = ArrayList@43[1] { JetTypeImpl@44['Any'] }
-}
-
-LazyJavaClassifierType@45['Class<?>'] {
-    arguments = ArrayList@46[1] { LazyStarProjection@47 }
-    classifier = JavaClassImpl@48['Class']
-    nullable = 'false': Boolean@49
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassifierType@50['Class<?>'] {
-    arguments = ArrayList@51[1] { LazyStarProjection@52 }
-    classifier = JavaClassImpl@48['Class']
-    nullable = 'true': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassifierType@54['Object'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaClassImpl@56['Object']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@58['Object'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaClassImpl@60['Object']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@61['Object'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@60['Object']
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@63['Object'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@56['Object']
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@65['String'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['String']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@69['String'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@67['String']
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaPackageFragmentProvider@71 {
-    packageFragments('<root>': FqName@72) = LazyJavaPackageFragment@73['<root>']
-    packageFragments('MyTrait': FqName@74) = null
-    packageFragments('Object': FqName@75) = null
-    packageFragments('String': FqName@76) = null
-    packageFragments('java': FqName@77) = LazyJavaPackageFragment@78['java']
-    packageFragments('java.lang': FqName@79) = LazyJavaPackageFragment@80['lang']
-    packageFragments('java.lang.Object': FqName@81) = null
-    packageFragments('java.lang.String': FqName@82) = null
-    packageFragments('kotlin': FqName@83) = null
-    packageFragments('kotlin.Object': FqName@84) = null
-    packageFragments('kotlin.String': FqName@85) = null
-    packageFragments('kotlin.io': FqName@86) = null
-    packageFragments('kotlin.jvm': FqName@87) = null
-    topLevelClasses(JavaClassImpl@48['Class']) = LazyJavaClassDescriptor@0['Class']
-    topLevelClasses(JavaClassImpl@88['Object']) = LazyJavaClassDescriptor@2['Object']
-}
-
-LazyJavaPackageFragment@73['<root>'] {
-    classes('Object': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('String': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@78['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@95) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@80['lang'] {
-    classes('Object': Name@89) = LazyJavaClassDescriptor@2['Object'] // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaTypeParameterDescriptor@41['T'] {
-    upperBounds = LinkedHashSet@99[1] { NullableType@100 }
-    upperBoundsAsType = NullableType@100
-}
-
-LazyJavaTypeParameterResolver@101 {
-    resolve(JavaTypeParameterImpl@102['T']) = LazyJavaTypeParameterDescriptor@41['T']
-}
diff --git a/compiler/testData/diagnostics/tests/TypeInference.lazy.log b/compiler/testData/diagnostics/tests/TypeInference.lazy.log
deleted file mode 100644
index 0aa4a876339..00000000000
--- a/compiler/testData/diagnostics/tests/TypeInference.lazy.log
+++ /dev/null
@@ -1,126 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('C': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('C': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('C': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('bar': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log b/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
deleted file mode 100644
index 56ffa0a1c86..00000000000
--- a/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log b/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
deleted file mode 100644
index 286f38ddd93..00000000000
--- a/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Unit': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Unit': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Unit': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/UnitValue.lazy.log b/compiler/testData/diagnostics/tests/UnitValue.lazy.log
deleted file mode 100644
index 042f13879e8..00000000000
--- a/compiler/testData/diagnostics/tests/UnitValue.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Unit': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Unit': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Unit': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Unresolved.lazy.log b/compiler/testData/diagnostics/tests/Unresolved.lazy.log
deleted file mode 100644
index add6114e11d..00000000000
--- a/compiler/testData/diagnostics/tests/Unresolved.lazy.log
+++ /dev/null
@@ -1,584 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Pair': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('collection': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('i': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Pair': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.a': FqName@21) = null
-    packageFragments('java.lang.collection': FqName@22) = null
-    packageFragments('java.lang.foo': FqName@23) = null
-    packageFragments('java.lang.i': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.B': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.Pair': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.a': FqName@31) = null
-    packageFragments('kotlin.collection': FqName@32) = null
-    packageFragments('kotlin.foo': FqName@33) = null
-    packageFragments('kotlin.i': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-    packageFragments('unresolved': FqName@37) = null
-    packageFragments('unresolved.A': FqName@38) = null
-    packageFragments('unresolved.B': FqName@39) = null
-    packageFragments('unresolved.Int': FqName@40) = null
-    packageFragments('unresolved.Pair': FqName@41) = null
-    packageFragments('unresolved.String': FqName@42) = null
-    packageFragments('unresolved.a': FqName@43) = null
-    packageFragments('unresolved.collection': FqName@44) = null
-    packageFragments('unresolved.foo': FqName@45) = null
-    packageFragments('unresolved.i': FqName@46) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('Pair': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('a': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('collection': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('i': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('plusAssign': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Pair': Name@53) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('a': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('collection': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@57) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo1': Name@58) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('i': Name@63) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('plusAssign': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-null {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@129[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log b/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
deleted file mode 100644
index 5d2146749c2..00000000000
--- a/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
+++ /dev/null
@@ -1,509 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Any': FqName@7) = null
-    packageFragments('IncDec': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('Trait': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.IncDec': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.Trait': FqName@21) = null
-    packageFragments('java.lang.Unit': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.IncDec': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.String': FqName@27) = null
-    packageFragments('kotlin.Trait': FqName@28) = null
-    packageFragments('kotlin.Unit': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('unused_variables': FqName@32) = null
-    packageFragments('unused_variables.Any': FqName@33) = null
-    packageFragments('unused_variables.IncDec': FqName@34) = null
-    packageFragments('unused_variables.Int': FqName@35) = null
-    packageFragments('unused_variables.MyTest': FqName@36) = null
-    packageFragments('unused_variables.String': FqName@37) = null
-    packageFragments('unused_variables.Trait': FqName@38) = null
-    packageFragments('unused_variables.Unit': FqName@39) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('IncDec': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('a': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('doSmth': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('x': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('IncDec': Name@46) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('doSmth': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('equals': Name@50) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[2] { ResolutionCandidate@262, ResolutionCandidate@263 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[2] { ResolutionCandidate@270, ResolutionCandidate@271 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[7] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[7] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[7] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286, ... }
-}
-
-null {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@355[2] { ResolutionCandidate@270, ResolutionCandidate@271 }
-    <name not found> = ArrayList@356[2] { ResolutionCandidate@266, ResolutionCandidate@267 }
-    <name not found> = ArrayList@357[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
-    <name not found> = ArrayList@358[2] { ResolutionCandidate@262, ResolutionCandidate@263 }
-    <name not found> = ArrayList@359[7] { ResolutionCandidate@279, ResolutionCandidate@280, ResolutionCandidate@281, ... }
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = ArrayList@361[7] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286, ... }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
deleted file mode 100644
index cf901abfb14..00000000000
--- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
+++ /dev/null
@@ -1,1933 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    defaultType = JetTypeImpl@3['AbstractCollection<1>']
-    functions('Itr': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('ListItr': Name@7) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('SubList': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('add': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['add'] } // through LazyJavaClassMemberScope@6
-    functions('addAll': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['addAll'] } // through LazyJavaClassMemberScope@6
-    functions('batchRemove': Name@15) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('clear': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['clear'] } // through LazyJavaClassMemberScope@6
-    functions('clone': Name@19) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('contains': Name@20) = ArrayList@21[1] { JavaMethodDescriptor@22['contains'] } // through LazyJavaClassMemberScope@6
-    functions('containsAll': Name@23) = ArrayList@24[1] { JavaMethodDescriptor@25['containsAll'] } // through LazyJavaClassMemberScope@6
-    functions('elementData': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('ensureCapacity': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('ensureCapacityInternal': Name@28) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('equals': Name@29) = ArrayList@30[1] { DeserializedSimpleFunctionDescriptor@31['equals'] } // through LazyJavaClassMemberScope@6
-    functions('fastRemove': Name@32) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('finalize': Name@33) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('get': Name@34) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('getClass': Name@35) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('grow': Name@36) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('hashCode': Name@37) = ArrayList@38[1] { DeserializedSimpleFunctionDescriptor@39['hashCode'] } // through LazyJavaClassMemberScope@6
-    functions('indexOf': Name@40) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('isEmpty': Name@41) = ArrayList@42[1] { JavaMethodDescriptor@43['isEmpty'] } // through LazyJavaClassMemberScope@6
-    functions('iterator': Name@44) = ArrayList@45[1] { JavaMethodDescriptor@46['iterator'] } // through LazyJavaClassMemberScope@6
-    functions('lastIndexOf': Name@47) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('listIterator': Name@48) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('notify': Name@49) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('notifyAll': Name@50) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('outOfBoundsMsg': Name@51) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('rangeCheck': Name@52) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('rangeCheckForAdd': Name@53) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('readObject': Name@54) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('remove': Name@55) = ArrayList@56[1] { JavaMethodDescriptor@57['remove'] } // through LazyJavaClassMemberScope@6
-    functions('removeAll': Name@58) = ArrayList@59[1] { JavaMethodDescriptor@60['removeAll'] } // through LazyJavaClassMemberScope@6
-    functions('removeRange': Name@61) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('retainAll': Name@62) = ArrayList@63[1] { JavaMethodDescriptor@64['retainAll'] } // through LazyJavaClassMemberScope@6
-    functions('set': Name@65) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('size': Name@66) = ArrayList@67[1] { JavaMethodDescriptor@68['size'] } // through LazyJavaClassMemberScope@6
-    functions('subList': Name@69) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('toArray': Name@70) = ArrayList@71[2] { JavaMethodDescriptor@72['toArray'], JavaMethodDescriptor@73['toArray'] } // through LazyJavaClassMemberScope@6
-    functions('toString': Name@74) = ArrayList@75[1] { JavaMethodDescriptor@76['toString'] } // through LazyJavaClassMemberScope@6
-    functions('trimToSize': Name@77) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('wait': Name@78) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    functions('writeObject': Name@79) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@80 // through LazyJavaClassMemberScope@6
-    properties('elementData': Name@81) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    properties('modCount': Name@82) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    properties('size': Name@83) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@84['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@85['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@86['AbstractList'] {
-    defaultType = JetTypeImpl@87['AbstractList<1>']
-    functions('Itr': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('ListItr': Name@7) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('SubList': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('add': Name@89) = ArrayList@90[2] { JavaMethodDescriptor@91['add'], JavaMethodDescriptor@92['add'] } // through LazyJavaClassMemberScope@88
-    functions('addAll': Name@93) = ArrayList@94[2] { JavaMethodDescriptor@95['addAll'], DeserializedSimpleFunctionDescriptor@96['addAll'] } // through LazyJavaClassMemberScope@88
-    functions('batchRemove': Name@15) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('clear': Name@97) = ArrayList@98[1] { JavaMethodDescriptor@99['clear'] } // through LazyJavaClassMemberScope@88
-    functions('clone': Name@19) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('contains': Name@20) = ArrayList@100[1] { DeserializedSimpleFunctionDescriptor@101['contains'] } // through LazyJavaClassMemberScope@88
-    functions('containsAll': Name@23) = ArrayList@102[1] { DeserializedSimpleFunctionDescriptor@103['containsAll'] } // through LazyJavaClassMemberScope@88
-    functions('elementData': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('ensureCapacity': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('ensureCapacityInternal': Name@28) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('equals': Name@104) = ArrayList@105[1] { JavaMethodDescriptor@106['equals'] } // through LazyJavaClassMemberScope@88
-    functions('fastRemove': Name@32) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('finalize': Name@33) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('get': Name@107) = ArrayList@108[1] { JavaMethodDescriptor@109['get'] } // through LazyJavaClassMemberScope@88
-    functions('getClass': Name@35) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('grow': Name@36) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('hashCode': Name@110) = ArrayList@111[1] { JavaMethodDescriptor@112['hashCode'] } // through LazyJavaClassMemberScope@88
-    functions('indexOf': Name@113) = ArrayList@114[1] { JavaMethodDescriptor@115['indexOf'] } // through LazyJavaClassMemberScope@88
-    functions('isEmpty': Name@41) = ArrayList@116[1] { DeserializedSimpleFunctionDescriptor@117['isEmpty'] } // through LazyJavaClassMemberScope@88
-    functions('iterator': Name@118) = ArrayList@119[1] { JavaMethodDescriptor@120['iterator'] } // through LazyJavaClassMemberScope@88
-    functions('lastIndexOf': Name@121) = ArrayList@122[1] { JavaMethodDescriptor@123['lastIndexOf'] } // through LazyJavaClassMemberScope@88
-    functions('listIterator': Name@124) = ArrayList@125[2] { JavaMethodDescriptor@126['listIterator'], JavaMethodDescriptor@127['listIterator'] } // through LazyJavaClassMemberScope@88
-    functions('notify': Name@49) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('notifyAll': Name@50) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('outOfBoundsMsg': Name@128) = ArrayList@129[1] { JavaMethodDescriptor@130['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@88
-    functions('rangeCheck': Name@52) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('rangeCheckForAdd': Name@131) = ArrayList@132[1] { JavaMethodDescriptor@133['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@88
-    functions('readObject': Name@54) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('remove': Name@134) = ArrayList@135[2] { JavaMethodDescriptor@136['remove'], DeserializedSimpleFunctionDescriptor@137['remove'] } // through LazyJavaClassMemberScope@88
-    functions('removeAll': Name@58) = ArrayList@138[1] { DeserializedSimpleFunctionDescriptor@139['removeAll'] } // through LazyJavaClassMemberScope@88
-    functions('removeRange': Name@140) = ArrayList@141[1] { JavaMethodDescriptor@142['removeRange'] } // through LazyJavaClassMemberScope@88
-    functions('retainAll': Name@62) = ArrayList@143[1] { DeserializedSimpleFunctionDescriptor@144['retainAll'] } // through LazyJavaClassMemberScope@88
-    functions('set': Name@145) = ArrayList@146[1] { JavaMethodDescriptor@147['set'] } // through LazyJavaClassMemberScope@88
-    functions('size': Name@66) = ArrayList@148[1] { DeserializedSimpleFunctionDescriptor@149['size'] } // through LazyJavaClassMemberScope@88
-    functions('subList': Name@150) = ArrayList@151[1] { JavaMethodDescriptor@152['subList'] } // through LazyJavaClassMemberScope@88
-    functions('toArray': Name@70) = ArrayList@153[2] { JavaMethodDescriptor@154['toArray'], JavaMethodDescriptor@155['toArray'] } // through LazyJavaClassMemberScope@88
-    functions('toString': Name@74) = ArrayList@156[1] { DeserializedSimpleFunctionDescriptor@157['toString'] } // through LazyJavaClassMemberScope@88
-    functions('trimToSize': Name@77) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('wait': Name@78) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    functions('writeObject': Name@79) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    memberIndex = computeMemberIndex$1@158 // through LazyJavaClassMemberScope@88
-    properties('elementData': Name@81) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    properties('modCount': Name@82) = ArrayList@159[1] { JavaPropertyDescriptor@160['modCount'] } // through LazyJavaClassMemberScope@88
-    properties('size': Name@83) = EmptyList@5[empty] // through LazyJavaClassMemberScope@88
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@161['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@162['AbstractList']
-}
-
-LazyJavaClassDescriptor@163['ArrayList'] {
-    allDescriptors = ArrayList@164[46] { LazyJavaClassDescriptor@165['SubList'], LazyJavaClassDescriptor@166['ListItr'], LazyJavaClassDescriptor@167['Itr'], ... } // through LazyJavaClassMemberScope@168
-    constructors = ArrayList@169[3] { JavaConstructorDescriptor@170['<init>'], JavaConstructorDescriptor@171['<init>'], JavaConstructorDescriptor@172['<init>'] } // through LazyJavaClassMemberScope@168
-    defaultType = JetTypeImpl@173['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@174 // through LazyJavaClassMemberScope@168
-    functions('Itr': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('ListItr': Name@7) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('SubList': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('add': Name@175) = ArrayList@176[2] { JavaMethodDescriptor@177['add'], JavaMethodDescriptor@178['add'] } // through LazyJavaClassMemberScope@168
-    functions('addAll': Name@179) = ArrayList@180[2] { JavaMethodDescriptor@181['addAll'], JavaMethodDescriptor@182['addAll'] } // through LazyJavaClassMemberScope@168
-    functions('batchRemove': Name@183) = ArrayList@184[1] { JavaMethodDescriptor@185['batchRemove'] } // through LazyJavaClassMemberScope@168
-    functions('clear': Name@186) = ArrayList@187[1] { JavaMethodDescriptor@188['clear'] } // through LazyJavaClassMemberScope@168
-    functions('clone': Name@189) = ArrayList@190[1] { JavaMethodDescriptor@191['clone'] } // through LazyJavaClassMemberScope@168
-    functions('contains': Name@192) = ArrayList@193[1] { JavaMethodDescriptor@194['contains'] } // through LazyJavaClassMemberScope@168
-    functions('containsAll': Name@23) = ArrayList@195[1] { DeserializedSimpleFunctionDescriptor@196['containsAll'] } // through LazyJavaClassMemberScope@168
-    functions('elementData': Name@197) = ArrayList@198[1] { JavaMethodDescriptor@199['elementData'] } // through LazyJavaClassMemberScope@168
-    functions('ensureCapacity': Name@200) = ArrayList@201[1] { JavaMethodDescriptor@202['ensureCapacity'] } // through LazyJavaClassMemberScope@168
-    functions('ensureCapacityInternal': Name@203) = ArrayList@204[1] { JavaMethodDescriptor@205['ensureCapacityInternal'] } // through LazyJavaClassMemberScope@168
-    functions('equals': Name@104) = ArrayList@206[1] { DeserializedSimpleFunctionDescriptor@207['equals'] } // through LazyJavaClassMemberScope@168
-    functions('fastRemove': Name@208) = ArrayList@209[1] { JavaMethodDescriptor@210['fastRemove'] } // through LazyJavaClassMemberScope@168
-    functions('finalize': Name@33) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('get': Name@211) = ArrayList@212[1] { JavaMethodDescriptor@213['get'] } // through LazyJavaClassMemberScope@168
-    functions('getClass': Name@35) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('grow': Name@214) = ArrayList@215[1] { JavaMethodDescriptor@216['grow'] } // through LazyJavaClassMemberScope@168
-    functions('hashCode': Name@110) = ArrayList@217[1] { DeserializedSimpleFunctionDescriptor@218['hashCode'] } // through LazyJavaClassMemberScope@168
-    functions('indexOf': Name@219) = ArrayList@220[1] { JavaMethodDescriptor@221['indexOf'] } // through LazyJavaClassMemberScope@168
-    functions('isEmpty': Name@222) = ArrayList@223[1] { JavaMethodDescriptor@224['isEmpty'] } // through LazyJavaClassMemberScope@168
-    functions('iterator': Name@225) = ArrayList@226[1] { JavaMethodDescriptor@227['iterator'] } // through LazyJavaClassMemberScope@168
-    functions('lastIndexOf': Name@228) = ArrayList@229[1] { JavaMethodDescriptor@230['lastIndexOf'] } // through LazyJavaClassMemberScope@168
-    functions('listIterator': Name@231) = ArrayList@232[2] { JavaMethodDescriptor@233['listIterator'], JavaMethodDescriptor@234['listIterator'] } // through LazyJavaClassMemberScope@168
-    functions('notify': Name@49) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('notifyAll': Name@50) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('outOfBoundsMsg': Name@235) = ArrayList@236[1] { JavaMethodDescriptor@237['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@168
-    functions('rangeCheck': Name@238) = ArrayList@239[1] { JavaMethodDescriptor@240['rangeCheck'] } // through LazyJavaClassMemberScope@168
-    functions('rangeCheckForAdd': Name@241) = ArrayList@242[1] { JavaMethodDescriptor@243['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@168
-    functions('readObject': Name@244) = ArrayList@245[1] { JavaMethodDescriptor@246['readObject'] } // through LazyJavaClassMemberScope@168
-    functions('remove': Name@247) = ArrayList@248[2] { JavaMethodDescriptor@249['remove'], JavaMethodDescriptor@250['remove'] } // through LazyJavaClassMemberScope@168
-    functions('removeAll': Name@251) = ArrayList@252[1] { JavaMethodDescriptor@253['removeAll'] } // through LazyJavaClassMemberScope@168
-    functions('removeRange': Name@254) = ArrayList@255[1] { JavaMethodDescriptor@256['removeRange'] } // through LazyJavaClassMemberScope@168
-    functions('retainAll': Name@257) = ArrayList@258[1] { JavaMethodDescriptor@259['retainAll'] } // through LazyJavaClassMemberScope@168
-    functions('set': Name@260) = ArrayList@261[1] { JavaMethodDescriptor@262['set'] } // through LazyJavaClassMemberScope@168
-    functions('size': Name@263) = ArrayList@264[1] { JavaMethodDescriptor@265['size'] } // through LazyJavaClassMemberScope@168
-    functions('subList': Name@266) = ArrayList@267[1] { JavaMethodDescriptor@268['subList'] } // through LazyJavaClassMemberScope@168
-    functions('toArray': Name@269) = ArrayList@270[2] { JavaMethodDescriptor@271['toArray'], JavaMethodDescriptor@272['toArray'] } // through LazyJavaClassMemberScope@168
-    functions('toString': Name@74) = ArrayList@273[1] { DeserializedSimpleFunctionDescriptor@274['toString'] } // through LazyJavaClassMemberScope@168
-    functions('trimToSize': Name@275) = ArrayList@276[1] { JavaMethodDescriptor@277['trimToSize'] } // through LazyJavaClassMemberScope@168
-    functions('wait': Name@78) = EmptyList@5[empty] // through LazyJavaClassMemberScope@168
-    functions('writeObject': Name@278) = ArrayList@279[1] { JavaMethodDescriptor@280['writeObject'] } // through LazyJavaClassMemberScope@168
-    memberIndex = computeMemberIndex$1@281 // through LazyJavaClassMemberScope@168
-    nestedClassIndex = LinkedHashMap@282 // through LazyJavaClassMemberScope@168
-    nestedClasses('Itr': Name@4) = LazyJavaClassDescriptor@167['Itr'] // through LazyJavaClassMemberScope@168
-    nestedClasses('ListItr': Name@7) = LazyJavaClassDescriptor@166['ListItr'] // through LazyJavaClassMemberScope@168
-    nestedClasses('SubList': Name@8) = LazyJavaClassDescriptor@165['SubList'] // through LazyJavaClassMemberScope@168
-    properties('elementData': Name@81) = ArrayList@283[1] { JavaPropertyDescriptor@284['elementData'] } // through LazyJavaClassMemberScope@168
-    properties('modCount': Name@82) = ArrayList@285[1] { PropertyDescriptorImpl@286['modCount'] } // through LazyJavaClassMemberScope@168
-    properties('size': Name@83) = ArrayList@287[1] { JavaPropertyDescriptor@288['size'] } // through LazyJavaClassMemberScope@168
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@289['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@290['ArrayList']
-}
-
-LazyJavaClassDescriptor@291['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@293['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@294['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@295['RandomAccess'] {
-    defaultType = JetTypeImpl@296['RandomAccess']
-    functions('Itr': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('ListItr': Name@7) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('SubList': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('add': Name@89) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('addAll': Name@93) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('batchRemove': Name@15) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('clear': Name@97) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('clone': Name@19) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('contains': Name@20) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('containsAll': Name@23) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('elementData': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('ensureCapacity': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('ensureCapacityInternal': Name@28) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('equals': Name@104) = ArrayList@298[1] { DeserializedSimpleFunctionDescriptor@299['equals'] } // through LazyJavaClassMemberScope@297
-    functions('fastRemove': Name@32) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('finalize': Name@33) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('get': Name@107) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('getClass': Name@35) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('grow': Name@36) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('hashCode': Name@110) = ArrayList@300[1] { DeserializedSimpleFunctionDescriptor@301['hashCode'] } // through LazyJavaClassMemberScope@297
-    functions('indexOf': Name@113) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('isEmpty': Name@41) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('iterator': Name@118) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('lastIndexOf': Name@121) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('listIterator': Name@124) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('notify': Name@49) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('notifyAll': Name@50) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('outOfBoundsMsg': Name@128) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('rangeCheck': Name@52) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('rangeCheckForAdd': Name@131) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('readObject': Name@54) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('remove': Name@134) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('removeAll': Name@58) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('removeRange': Name@140) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('retainAll': Name@62) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('set': Name@145) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('size': Name@66) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('subList': Name@150) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('toArray': Name@70) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('toString': Name@74) = ArrayList@302[1] { DeserializedSimpleFunctionDescriptor@303['toString'] } // through LazyJavaClassMemberScope@297
-    functions('trimToSize': Name@77) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('wait': Name@78) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    functions('writeObject': Name@79) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    memberIndex = computeMemberIndex$1@304 // through LazyJavaClassMemberScope@297
-    properties('elementData': Name@81) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    properties('modCount': Name@82) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    properties('size': Name@83) = EmptyList@5[empty] // through LazyJavaClassMemberScope@297
-    typeConstructor = LazyJavaClassTypeConstructor@305['RandomAccess']
-}
-
-LazyJavaClassDescriptor@306['Serializable'] {
-    defaultType = JetTypeImpl@307['Serializable']
-    functions('Itr': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('ListItr': Name@7) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('SubList': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('add': Name@89) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('addAll': Name@93) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('batchRemove': Name@15) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('clear': Name@97) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('clone': Name@19) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('contains': Name@20) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('containsAll': Name@23) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('elementData': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('ensureCapacity': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('ensureCapacityInternal': Name@28) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('equals': Name@104) = ArrayList@309[1] { DeserializedSimpleFunctionDescriptor@310['equals'] } // through LazyJavaClassMemberScope@308
-    functions('fastRemove': Name@32) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('finalize': Name@33) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('get': Name@107) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('getClass': Name@35) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('grow': Name@36) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('hashCode': Name@110) = ArrayList@311[1] { DeserializedSimpleFunctionDescriptor@312['hashCode'] } // through LazyJavaClassMemberScope@308
-    functions('indexOf': Name@113) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('isEmpty': Name@41) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('iterator': Name@118) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('lastIndexOf': Name@121) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('listIterator': Name@124) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('notify': Name@49) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('notifyAll': Name@50) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('outOfBoundsMsg': Name@128) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('rangeCheck': Name@52) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('rangeCheckForAdd': Name@131) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('readObject': Name@54) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('remove': Name@134) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('removeAll': Name@58) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('removeRange': Name@140) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('retainAll': Name@62) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('set': Name@145) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('size': Name@66) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('subList': Name@150) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('toArray': Name@70) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('toString': Name@74) = ArrayList@313[1] { DeserializedSimpleFunctionDescriptor@314['toString'] } // through LazyJavaClassMemberScope@308
-    functions('trimToSize': Name@77) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('wait': Name@78) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    functions('writeObject': Name@79) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    memberIndex = computeMemberIndex$1@315 // through LazyJavaClassMemberScope@308
-    properties('elementData': Name@81) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    properties('modCount': Name@82) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    properties('size': Name@83) = EmptyList@5[empty] // through LazyJavaClassMemberScope@308
-    typeConstructor = LazyJavaClassTypeConstructor@316['Serializable']
-}
-
-LazyJavaClassTypeConstructor@85['AbstractCollection'] {
-    parameters = ArrayList@317[1] { LazyJavaTypeParameterDescriptor@318['E'] }
-    supertypes = ArrayList@319[1] { LazyJavaClassifierType@320['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@162['AbstractList'] {
-    parameters = ArrayList@321[1] { LazyJavaTypeParameterDescriptor@322['E'] }
-    supertypes = ArrayList@323[2] { LazyJavaClassifierType@324['AbstractCollection<E>'], LazyJavaClassifierType@325['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@290['ArrayList'] {
-    parameters = ArrayList@326[1] { LazyJavaTypeParameterDescriptor@327['E'] }
-    supertypes = ArrayList@328[5] { LazyJavaClassifierType@329['AbstractList<E>'], LazyJavaClassifierType@330['List<E>'], LazyJavaClassifierType@331['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@292['ObjectInputStream'] {
-    parameters = ArrayList@332[empty]
-}
-
-LazyJavaClassTypeConstructor@294['ObjectOutputStream'] {
-    parameters = ArrayList@333[empty]
-}
-
-LazyJavaClassTypeConstructor@305['RandomAccess'] {
-    parameters = ArrayList@334[empty]
-    supertypes = ArrayList@335[1] { JetTypeImpl@336['Any'] }
-}
-
-LazyJavaClassTypeConstructor@316['Serializable'] {
-    parameters = ArrayList@337[empty]
-    supertypes = ArrayList@338[1] { JetTypeImpl@336['Any'] }
-}
-
-LazyJavaClassifierType@324['AbstractCollection<E>'] {
-    arguments = ArrayList@339[1] { TypeProjectionImpl@340 }
-    classifier = JavaClassImpl@341['AbstractCollection']
-    memberScope = SubstitutingScope@342
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@85['AbstractCollection']
-}
-
-LazyJavaClassifierType@329['AbstractList<E>'] {
-    arguments = ArrayList@344[1] { TypeProjectionImpl@345 }
-    classifier = JavaClassImpl@346['AbstractList']
-    memberScope = SubstitutingScope@347
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@162['AbstractList']
-}
-
-LazyJavaClassifierType@348['Cloneable'] {
-    arguments = ArrayList@349[empty]
-    classifier = JavaClassImpl@350['Cloneable']
-    memberScope = DeserializedClassMemberScope@351
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@352
-}
-
-LazyJavaClassifierType@353['Collection<? extends E>'] {
-    arguments = ArrayList@354[1] { TypeProjectionImpl@355 }
-    classifier = JavaClassImpl@356['Collection']
-    memberScope = SubstitutingScope@357
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@359['Collection<? extends E>'] {
-    arguments = ArrayList@360[1] { TypeProjectionImpl@361 }
-    classifier = JavaClassImpl@362['Collection']
-    memberScope = SubstitutingScope@363
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@364['Collection<? extends E>'] {
-    arguments = ArrayList@365[1] { TypeProjectionImpl@366 }
-    classifier = JavaClassImpl@367['Collection']
-    memberScope = SubstitutingScope@368
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@369['Collection<? extends E>'] {
-    arguments = ArrayList@370[1] { TypeProjectionImpl@371 }
-    classifier = JavaClassImpl@372['Collection']
-    memberScope = SubstitutingScope@373
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@374['Collection<? extends E>'] {
-    arguments = ArrayList@375[1] { TypeProjectionImpl@376 }
-    classifier = JavaClassImpl@377['Collection']
-    memberScope = SubstitutingScope@378
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@379['Collection<? extends E>'] {
-    arguments = ArrayList@380[1] { TypeProjectionImpl@381 }
-    classifier = JavaClassImpl@356['Collection']
-    memberScope = SubstitutingScope@382
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@385['Collection<? extends E>'] {
-    arguments = ArrayList@386[1] { TypeProjectionImpl@387 }
-    classifier = JavaClassImpl@362['Collection']
-    memberScope = SubstitutingScope@388
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@389['Collection<? extends E>'] {
-    arguments = ArrayList@390[1] { TypeProjectionImpl@391 }
-    classifier = JavaClassImpl@372['Collection']
-    memberScope = SubstitutingScope@392
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@393['Collection<? extends E>'] {
-    arguments = ArrayList@394[1] { TypeProjectionImpl@395 }
-    classifier = JavaClassImpl@377['Collection']
-    memberScope = SubstitutingScope@396
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@397['Collection<? extends E>'] {
-    arguments = ArrayList@398[1] { TypeProjectionImpl@399 }
-    classifier = JavaClassImpl@367['Collection']
-    memberScope = SubstitutingScope@400
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@401['Collection<?>'] {
-    arguments = ArrayList@402[1] { LazyStarProjection@403 }
-    classifier = JavaClassImpl@404['Collection']
-    memberScope = SubstitutingScope@405
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@406['Collection<?>'] {
-    arguments = ArrayList@407[1] { LazyStarProjection@408 }
-    classifier = JavaClassImpl@409['Collection']
-    memberScope = SubstitutingScope@410
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@411['Collection<?>'] {
-    arguments = ArrayList@412[1] { LazyStarProjection@413 }
-    classifier = JavaClassImpl@414['Collection']
-    memberScope = SubstitutingScope@415
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@416['Collection<?>'] {
-    arguments = ArrayList@417[1] { LazyStarProjection@418 }
-    classifier = JavaClassImpl@419['Collection']
-    memberScope = SubstitutingScope@420
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@421['Collection<?>'] {
-    arguments = ArrayList@422[1] { LazyStarProjection@423 }
-    classifier = JavaClassImpl@424['Collection']
-    memberScope = SubstitutingScope@425
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@426['Collection<?>'] {
-    arguments = ArrayList@427[1] { LazyStarProjection@428 }
-    classifier = JavaClassImpl@429['Collection']
-    memberScope = SubstitutingScope@430
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@431['Collection<?>'] {
-    arguments = ArrayList@432[1] { LazyStarProjection@433 }
-    classifier = JavaClassImpl@419['Collection']
-    memberScope = SubstitutingScope@434
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@435['Collection<?>'] {
-    arguments = ArrayList@436[1] { LazyStarProjection@437 }
-    classifier = JavaClassImpl@424['Collection']
-    memberScope = SubstitutingScope@438
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@439['Collection<?>'] {
-    arguments = ArrayList@440[1] { LazyStarProjection@441 }
-    classifier = JavaClassImpl@409['Collection']
-    memberScope = SubstitutingScope@442
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@443['Collection<?>'] {
-    arguments = ArrayList@444[1] { LazyStarProjection@445 }
-    classifier = JavaClassImpl@404['Collection']
-    memberScope = SubstitutingScope@446
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@447['Collection<?>'] {
-    arguments = ArrayList@448[1] { LazyStarProjection@449 }
-    classifier = JavaClassImpl@414['Collection']
-    memberScope = SubstitutingScope@450
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@451['Collection<?>'] {
-    arguments = ArrayList@452[1] { LazyStarProjection@453 }
-    classifier = JavaClassImpl@429['Collection']
-    memberScope = SubstitutingScope@454
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@384
-}
-
-LazyJavaClassifierType@320['Collection<E>'] {
-    arguments = ArrayList@455[1] { TypeProjectionImpl@456 }
-    classifier = JavaClassImpl@457['Collection']
-    memberScope = SubstitutingScope@458
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@358
-}
-
-LazyJavaClassifierType@459['E'] {
-    arguments = ArrayList@460[empty]
-    classifier = JavaTypeParameterImpl@461['E']
-    memberScope = LazyScopeAdapter@462
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@464['E'] {
-    arguments = ArrayList@465[empty]
-    classifier = JavaTypeParameterImpl@466['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@467['E'] {
-    arguments = ArrayList@468[empty]
-    classifier = JavaTypeParameterImpl@469['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@471['E'] {
-    arguments = ArrayList@472[empty]
-    classifier = JavaTypeParameterImpl@473['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@475['E'] {
-    arguments = ArrayList@476[empty]
-    classifier = JavaTypeParameterImpl@477['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@478['E'] {
-    arguments = ArrayList@479[empty]
-    classifier = JavaTypeParameterImpl@480['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@481['E'] {
-    arguments = ArrayList@482[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@484['E'] {
-    arguments = ArrayList@485[empty]
-    classifier = JavaTypeParameterImpl@486['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@487['E'] {
-    arguments = ArrayList@488[empty]
-    classifier = JavaTypeParameterImpl@489['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@490['E'] {
-    arguments = ArrayList@491[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@493['E'] {
-    arguments = ArrayList@494[empty]
-    classifier = JavaTypeParameterImpl@495['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@496['E'] {
-    arguments = ArrayList@497[empty]
-    classifier = JavaTypeParameterImpl@498['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@499['E'] {
-    arguments = ArrayList@500[empty]
-    classifier = JavaTypeParameterImpl@501['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@502['E'] {
-    arguments = ArrayList@503[empty]
-    classifier = JavaTypeParameterImpl@504['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@505['E'] {
-    arguments = ArrayList@506[empty]
-    classifier = JavaTypeParameterImpl@507['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@508['E'] {
-    arguments = ArrayList@509[empty]
-    classifier = JavaTypeParameterImpl@510['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@511['E'] {
-    arguments = ArrayList@512[empty]
-    classifier = JavaTypeParameterImpl@513['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@514['E'] {
-    arguments = ArrayList@515[empty]
-    classifier = JavaTypeParameterImpl@516['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@517['E'] {
-    arguments = ArrayList@518[empty]
-    classifier = JavaTypeParameterImpl@519['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@520['E'] {
-    arguments = ArrayList@521[empty]
-    classifier = JavaTypeParameterImpl@522['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@523['E'] {
-    arguments = ArrayList@524[empty]
-    classifier = JavaTypeParameterImpl@525['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@526['E'] {
-    arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@528['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@529['E'] {
-    arguments = ArrayList@530[empty]
-    classifier = JavaTypeParameterImpl@531['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@532['E'] {
-    arguments = ArrayList@533[empty]
-    classifier = JavaTypeParameterImpl@534['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@535['E'] {
-    arguments = ArrayList@536[empty]
-    classifier = JavaTypeParameterImpl@537['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@538['E'] {
-    arguments = ArrayList@539[empty]
-    classifier = JavaTypeParameterImpl@540['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@541['E'] {
-    arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@543['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@544['E'] {
-    arguments = ArrayList@545[empty]
-    classifier = JavaTypeParameterImpl@546['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@547['E'] {
-    arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@549['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@550['E'] {
-    arguments = ArrayList@551[empty]
-    classifier = JavaTypeParameterImpl@552['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@553['E'] {
-    arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@555['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@556['E'] {
-    arguments = ArrayList@557[empty]
-    classifier = JavaTypeParameterImpl@558['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@559['E'] {
-    arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@561['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@562['E'] {
-    arguments = ArrayList@563[empty]
-    classifier = JavaTypeParameterImpl@564['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@565['E'] {
-    arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@567['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@568['E'] {
-    arguments = ArrayList@569[empty]
-    classifier = JavaTypeParameterImpl@570['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@571['E'] {
-    arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@573['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@574['E'] {
-    arguments = ArrayList@575[empty]
-    classifier = JavaTypeParameterImpl@576['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@577['E'] {
-    arguments = ArrayList@578[empty]
-    classifier = JavaTypeParameterImpl@579['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@580['E'] {
-    arguments = ArrayList@581[empty]
-    classifier = JavaTypeParameterImpl@582['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@583['E'] {
-    arguments = ArrayList@584[empty]
-    classifier = JavaTypeParameterImpl@585['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@586['E'] {
-    arguments = ArrayList@587[empty]
-    classifier = JavaTypeParameterImpl@588['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@589['E'] {
-    arguments = ArrayList@590[empty]
-    classifier = JavaTypeParameterImpl@591['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@592['E'] {
-    arguments = ArrayList@593[empty]
-    classifier = JavaTypeParameterImpl@594['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@595['E'] {
-    arguments = ArrayList@596[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@598['E'] {
-    arguments = ArrayList@599[empty]
-    classifier = JavaTypeParameterImpl@600['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@601['E'] {
-    arguments = ArrayList@602[empty]
-    classifier = JavaTypeParameterImpl@603['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@604['E'] {
-    arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@489['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@606['E'] {
-    arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@525['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@608['E'] {
-    arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@594['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@610['E'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@507['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@612['E'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@546['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@614['E'] {
-    arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@480['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@616['E'] {
-    arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@549['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@618['E'] {
-    arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@522['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@620['E'] {
-    arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@600['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@622['E'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@567['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@624['E'] {
-    arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@501['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@626['E'] {
-    arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@555['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@628['E'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@588['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@630['E'] {
-    arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@585['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@632['E'] {
-    arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@634['E'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@543['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@636['E'] {
-    arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@591['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@638['E'] {
-    arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@486['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@640['E'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@469['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@642['E'] {
-    arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@564['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@644['E'] {
-    arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@570['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@646['E'] {
-    arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@504['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@648['E'] {
-    arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@534['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@650['E'] {
-    arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@561['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@652['E'] {
-    arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@558['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@654['E'] {
-    arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@582['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@656['E'] {
-    arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@576['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@658['E'] {
-    arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@552['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@660['E'] {
-    arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@466['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@662['E'] {
-    arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-}
-
-LazyJavaClassifierType@664['E'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@540['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@666['E'] {
-    arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@513['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@668['E'] {
-    arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@603['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@670['E'] {
-    arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@473['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@672['E'] {
-    arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@579['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@674['E'] {
-    arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@461['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@676['E'] {
-    arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@510['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@678['E'] {
-    arguments = ArrayList@679[empty]
-    classifier = JavaTypeParameterImpl@573['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@680['E'] {
-    arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@516['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@682['E'] {
-    arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@528['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@684['E'] {
-    arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@537['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@686['E'] {
-    arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@495['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@688['E'] {
-    arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@531['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@690['E'] {
-    arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@519['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@692['E'] {
-    arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@694['E'] {
-    arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@477['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-}
-
-LazyJavaClassifierType@696['E'] {
-    arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@498['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-}
-
-LazyJavaClassifierType@698['Iterator<E>'] {
-    arguments = ArrayList@699[1] { TypeProjectionImpl@700 }
-    classifier = JavaClassImpl@701['Iterator']
-    memberScope = SubstitutingScope@702
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@703
-}
-
-LazyJavaClassifierType@704['Iterator<E>'] {
-    arguments = ArrayList@705[1] { TypeProjectionImpl@706 }
-    classifier = JavaClassImpl@707['Iterator']
-    memberScope = SubstitutingScope@708
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@703
-}
-
-LazyJavaClassifierType@709['Iterator<E>'] {
-    arguments = ArrayList@710[1] { TypeProjectionImpl@711 }
-    classifier = JavaClassImpl@712['Iterator']
-    memberScope = SubstitutingScope@713
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@703
-}
-
-LazyJavaClassifierType@714['Iterator<E>'] {
-    arguments = ArrayList@715[1] { TypeProjectionImpl@716 }
-    classifier = JavaClassImpl@712['Iterator']
-    memberScope = SubstitutingScope@717
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@718
-}
-
-LazyJavaClassifierType@719['Iterator<E>'] {
-    arguments = ArrayList@720[1] { TypeProjectionImpl@721 }
-    classifier = JavaClassImpl@701['Iterator']
-    memberScope = SubstitutingScope@722
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@718
-}
-
-LazyJavaClassifierType@723['Iterator<E>'] {
-    arguments = ArrayList@724[1] { TypeProjectionImpl@725 }
-    classifier = JavaClassImpl@707['Iterator']
-    memberScope = SubstitutingScope@726
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@718
-}
-
-LazyJavaClassifierType@330['List<E>'] {
-    arguments = ArrayList@727[1] { TypeProjectionImpl@728 }
-    classifier = JavaClassImpl@729['List']
-    memberScope = SubstitutingScope@730
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@731
-}
-
-LazyJavaClassifierType@325['List<E>'] {
-    arguments = ArrayList@732[1] { TypeProjectionImpl@733 }
-    classifier = JavaClassImpl@734['List']
-    memberScope = SubstitutingScope@735
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@731
-}
-
-LazyJavaClassifierType@736['List<E>'] {
-    arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
-    classifier = JavaClassImpl@739['List']
-    memberScope = SubstitutingScope@740
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@731
-}
-
-LazyJavaClassifierType@741['List<E>'] {
-    arguments = ArrayList@742[1] { TypeProjectionImpl@743 }
-    classifier = JavaClassImpl@744['List']
-    memberScope = SubstitutingScope@745
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@731
-}
-
-LazyJavaClassifierType@746['List<E>'] {
-    arguments = ArrayList@747[1] { TypeProjectionImpl@748 }
-    classifier = JavaClassImpl@744['List']
-    memberScope = SubstitutingScope@749
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@750
-}
-
-LazyJavaClassifierType@751['List<E>'] {
-    arguments = ArrayList@752[1] { TypeProjectionImpl@753 }
-    classifier = JavaClassImpl@739['List']
-    memberScope = SubstitutingScope@754
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@750
-}
-
-LazyJavaClassifierType@755['ListIterator<E>'] {
-    arguments = ArrayList@756[1] { TypeProjectionImpl@757 }
-    classifier = JavaClassImpl@758['ListIterator']
-    memberScope = SubstitutingScope@759
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@760
-}
-
-LazyJavaClassifierType@761['ListIterator<E>'] {
-    arguments = ArrayList@762[1] { TypeProjectionImpl@763 }
-    classifier = JavaClassImpl@764['ListIterator']
-    memberScope = SubstitutingScope@765
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@760
-}
-
-LazyJavaClassifierType@766['ListIterator<E>'] {
-    arguments = ArrayList@767[1] { TypeProjectionImpl@768 }
-    classifier = JavaClassImpl@769['ListIterator']
-    memberScope = SubstitutingScope@770
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@760
-}
-
-LazyJavaClassifierType@771['ListIterator<E>'] {
-    arguments = ArrayList@772[1] { TypeProjectionImpl@773 }
-    classifier = JavaClassImpl@774['ListIterator']
-    memberScope = SubstitutingScope@775
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@760
-}
-
-LazyJavaClassifierType@776['ListIterator<E>'] {
-    arguments = ArrayList@777[1] { TypeProjectionImpl@778 }
-    classifier = JavaClassImpl@764['ListIterator']
-    memberScope = SubstitutingScope@779
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@780
-}
-
-LazyJavaClassifierType@781['ListIterator<E>'] {
-    arguments = ArrayList@782[1] { TypeProjectionImpl@783 }
-    classifier = JavaClassImpl@774['ListIterator']
-    memberScope = SubstitutingScope@784
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@780
-}
-
-LazyJavaClassifierType@785['ListIterator<E>'] {
-    arguments = ArrayList@786[1] { TypeProjectionImpl@787 }
-    classifier = JavaClassImpl@769['ListIterator']
-    memberScope = SubstitutingScope@788
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@780
-}
-
-LazyJavaClassifierType@789['ListIterator<E>'] {
-    arguments = ArrayList@790[1] { TypeProjectionImpl@791 }
-    classifier = JavaClassImpl@758['ListIterator']
-    memberScope = SubstitutingScope@792
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@780
-}
-
-LazyJavaClassifierType@793['Object'] {
-    arguments = ArrayList@794[empty]
-    classifier = JavaClassImpl@795['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@798['Object'] {
-    arguments = ArrayList@799[empty]
-    classifier = JavaClassImpl@800['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@801['Object'] {
-    arguments = ArrayList@802[empty]
-    classifier = JavaClassImpl@803['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@804['Object'] {
-    arguments = ArrayList@805[empty]
-    classifier = JavaClassImpl@806['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@807['Object'] {
-    arguments = ArrayList@808[empty]
-    classifier = JavaClassImpl@809['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@810['Object'] {
-    arguments = ArrayList@811[empty]
-    classifier = JavaClassImpl@812['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@813['Object'] {
-    arguments = ArrayList@814[empty]
-    classifier = JavaClassImpl@815['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@816['Object'] {
-    arguments = ArrayList@817[empty]
-    classifier = JavaClassImpl@818['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@819['Object'] {
-    arguments = ArrayList@820[empty]
-    classifier = JavaClassImpl@821['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@822['Object'] {
-    arguments = ArrayList@823[empty]
-    classifier = JavaClassImpl@824['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@825['Object'] {
-    arguments = ArrayList@826[empty]
-    classifier = JavaClassImpl@827['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@828['Object'] {
-    arguments = ArrayList@829[empty]
-    classifier = JavaClassImpl@830['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@831['Object'] {
-    arguments = ArrayList@832[empty]
-    classifier = JavaClassImpl@833['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@834['Object'] {
-    arguments = ArrayList@835[empty]
-    classifier = JavaClassImpl@809['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@836['Object'] {
-    arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@830['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@838['Object'] {
-    arguments = ArrayList@839[empty]
-    classifier = JavaClassImpl@821['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@840['Object'] {
-    arguments = ArrayList@841[empty]
-    classifier = JavaClassImpl@818['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@842['Object'] {
-    arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@800['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@844['Object'] {
-    arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@795['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@846['Object'] {
-    arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@827['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@848['Object'] {
-    arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@824['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@850['Object'] {
-    arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@812['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@852['Object'] {
-    arguments = ArrayList@853[empty]
-    classifier = JavaClassImpl@803['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@854['Object'] {
-    arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@815['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@856['Object'] {
-    arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@806['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@858['Object'] {
-    arguments = ArrayList@859[empty]
-    classifier = JavaClassImpl@833['Object']
-    memberScope = DeserializedClassMemberScope@796
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@860['Object'] {
-    classifier = JavaClassImpl@861['Object']
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@862['Object'] {
-    classifier = JavaClassImpl@863['Object']
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@864['Object'] {
-    classifier = JavaClassImpl@865['Object']
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@866['ObjectInputStream'] {
-    arguments = ArrayList@867[empty]
-    classifier = JavaClassImpl@868['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@869
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectInputStream']
-}
-
-LazyJavaClassifierType@870['ObjectInputStream'] {
-    arguments = ArrayList@871[empty]
-    classifier = JavaClassImpl@868['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@869
-    nullable = 'true': Boolean@383
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectInputStream']
-}
-
-LazyJavaClassifierType@872['ObjectOutputStream'] {
-    arguments = ArrayList@873[empty]
-    classifier = JavaClassImpl@874['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@875
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@294['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@876['ObjectOutputStream'] {
-    arguments = ArrayList@877[empty]
-    classifier = JavaClassImpl@874['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@875
-    nullable = 'true': Boolean@383
-    typeConstructor = LazyJavaClassTypeConstructor@294['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@331['RandomAccess'] {
-    arguments = ArrayList@878[empty]
-    classifier = JavaClassImpl@879['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@297
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@305['RandomAccess']
-}
-
-LazyJavaClassifierType@880['Serializable'] {
-    arguments = ArrayList@881[empty]
-    classifier = JavaClassImpl@882['Serializable']
-    memberScope = LazyJavaClassMemberScope@308
-    nullable = 'false': Boolean@343
-    typeConstructor = LazyJavaClassTypeConstructor@316['Serializable']
-}
-
-LazyJavaClassifierType@883['String'] {
-    arguments = ArrayList@884[empty]
-    classifier = JavaClassImpl@885['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@888['String'] {
-    arguments = ArrayList@889[empty]
-    classifier = JavaClassImpl@890['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@891['String'] {
-    arguments = ArrayList@892[empty]
-    classifier = JavaClassImpl@893['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@894['String'] {
-    arguments = ArrayList@895[empty]
-    classifier = JavaClassImpl@890['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@896['String'] {
-    arguments = ArrayList@897[empty]
-    classifier = JavaClassImpl@893['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@898['String'] {
-    arguments = ArrayList@899[empty]
-    classifier = JavaClassImpl@885['String']
-    memberScope = DeserializedClassMemberScope@886
-    nullable = 'true': Boolean@383
-    typeConstructor = DeserializedClassTypeConstructor@887
-}
-
-LazyJavaClassifierType@900['T'] {
-    arguments = ArrayList@901[empty]
-    classifier = JavaTypeParameterImpl@902['T']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
-}
-
-LazyJavaClassifierType@904['T'] {
-    arguments = ArrayList@905[empty]
-    classifier = JavaTypeParameterImpl@906['T']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
-}
-
-LazyJavaClassifierType@908['T'] {
-    arguments = ArrayList@909[empty]
-    classifier = JavaTypeParameterImpl@910['T']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
-}
-
-LazyJavaClassifierType@911['T'] {
-    arguments = ArrayList@912[empty]
-    classifier = JavaTypeParameterImpl@913['T']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
-}
-
-LazyJavaClassifierType@914['T'] {
-    arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@906['T']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
-}
-
-LazyJavaClassifierType@916['T'] {
-    arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@910['T']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
-}
-
-LazyJavaClassifierType@918['T'] {
-    arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@902['T']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
-}
-
-LazyJavaClassifierType@920['T'] {
-    arguments = ArrayList@921[empty]
-    classifier = JavaTypeParameterImpl@913['T']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
-}
-
-LazyJavaPackageFragmentProvider@922 {
-    packageFragments('<root>': FqName@923) = LazyJavaPackageFragment@924['<root>']
-    packageFragments('Bar': FqName@925) = null
-    packageFragments('Barr': FqName@926) = null
-    packageFragments('Foo1': FqName@927) = null
-    packageFragments('Int': FqName@928) = null
-    packageFragments('java': FqName@929) = LazyJavaPackageFragment@930['java']
-    packageFragments('java.io': FqName@931) = LazyJavaPackageFragment@932['io']
-    packageFragments('java.lang': FqName@933) = LazyJavaPackageFragment@934['lang']
-    packageFragments('java.lang.Bar': FqName@935) = null
-    packageFragments('java.lang.Int': FqName@936) = null
-    packageFragments('java.util': FqName@937) = LazyJavaPackageFragment@938['util']
-    packageFragments('java.util.ArrayList': FqName@939) = null
-    packageFragments('kotlin': FqName@940) = null
-    packageFragments('kotlin.Bar': FqName@941) = null
-    packageFragments('kotlin.Int': FqName@942) = null
-    packageFragments('kotlin.io': FqName@943) = null
-    packageFragments('kotlin.jvm': FqName@944) = null
-    topLevelClasses(JavaClassImpl@341['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@346['AbstractList']) = LazyJavaClassDescriptor@86['AbstractList']
-    topLevelClasses(JavaClassImpl@945['ArrayList']) = LazyJavaClassDescriptor@163['ArrayList']
-    topLevelClasses(JavaClassImpl@868['ObjectInputStream']) = LazyJavaClassDescriptor@291['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@874['ObjectOutputStream']) = LazyJavaClassDescriptor@293['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@879['RandomAccess']) = LazyJavaClassDescriptor@295['RandomAccess']
-    topLevelClasses(JavaClassImpl@882['Serializable']) = LazyJavaClassDescriptor@306['Serializable']
-}
-
-LazyJavaPackageFragment@924['<root>'] {
-    classes('Int': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@947
-    classes('java': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@947
-}
-
-LazyJavaPackageFragment@930['java'] {
-    classes('lang': Name@949) = null // through LazyPackageFragmentScopeForJavaPackage@950
-    classes('util': Name@951) = null // through LazyPackageFragmentScopeForJavaPackage@950
-    deserializedPackageScope = Empty@952 // through LazyPackageFragmentScopeForJavaPackage@950
-    functions('lang': Name@953) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@950
-    memberIndex = computeMemberIndex$1@954 // through LazyPackageFragmentScopeForJavaPackage@950
-}
-
-LazyJavaPackageFragment@934['lang'] {
-    classes('java': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@955
-}
-
-LazyJavaPackageFragment@938['util'] {
-    classes('ArrayList': Name@956) = LazyJavaClassDescriptor@163['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@957
-}
-
-LazyJavaTypeParameterDescriptor@327['E'] {
-    defaultType = JetTypeImpl@958['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
-    upperBounds = LinkedHashSet@959[1] { NullableType@960 }
-    upperBoundsAsType = NullableType@960
-}
-
-LazyJavaTypeParameterDescriptor@322['E'] {
-    defaultType = JetTypeImpl@961['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
-    upperBounds = LinkedHashSet@962[1] { NullableType@963 }
-    upperBoundsAsType = NullableType@963
-}
-
-LazyJavaTypeParameterDescriptor@318['E'] {
-    defaultType = JetTypeImpl@964['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
-    upperBounds = LinkedHashSet@965[1] { NullableType@966 }
-    upperBoundsAsType = NullableType@966
-}
-
-LazyJavaTypeParameterDescriptor@967['T'] {
-    defaultType = JetTypeImpl@968['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
-    upperBounds = LinkedHashSet@969[1] { NullableType@970 }
-    upperBoundsAsType = NullableType@970
-}
-
-LazyJavaTypeParameterDescriptor@971['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
-    upperBounds = LinkedHashSet@972[1] { NullableType@973 }
-    upperBoundsAsType = NullableType@973
-}
-
-LazyJavaTypeParameterResolver@974 {
-    resolve(JavaTypeParameterImpl@975['E']) = LazyJavaTypeParameterDescriptor@318['E']
-}
-
-LazyJavaTypeParameterResolver@976 {
-    resolve(JavaTypeParameterImpl@977['E']) = LazyJavaTypeParameterDescriptor@327['E']
-}
-
-LazyJavaTypeParameterResolver@978 {
-    resolve(JavaTypeParameterImpl@979['E']) = LazyJavaTypeParameterDescriptor@322['E']
-}
-
-LazyJavaTypeParameterResolver@980 {
-    resolve(JavaTypeParameterImpl@549['E']) = null
-}
-
-LazyJavaTypeParameterResolver@981 {
-    resolve(JavaTypeParameterImpl@555['E']) = null
-}
-
-LazyJavaTypeParameterResolver@982 {
-    resolve(JavaTypeParameterImpl@567['E']) = null
-}
-
-LazyJavaTypeParameterResolver@983 {
-    resolve(JavaTypeParameterImpl@504['E']) = null
-}
-
-LazyJavaTypeParameterResolver@984 {
-    resolve(JavaTypeParameterImpl@480['E']) = null
-}
-
-LazyJavaTypeParameterResolver@985 {
-    resolve(JavaTypeParameterImpl@570['E']) = null
-}
-
-LazyJavaTypeParameterResolver@986 {
-    resolve(JavaTypeParameterImpl@516['E']) = null
-}
-
-LazyJavaTypeParameterResolver@987 {
-    resolve(JavaTypeParameterImpl@519['E']) = null
-}
-
-LazyJavaTypeParameterResolver@988 {
-    resolve(JavaTypeParameterImpl@582['E']) = null
-}
-
-LazyJavaTypeParameterResolver@989 {
-    resolve(JavaTypeParameterImpl@507['E']) = null
-}
-
-LazyJavaTypeParameterResolver@990 {
-    resolve(JavaTypeParameterImpl@513['E']) = null
-}
-
-LazyJavaTypeParameterResolver@991 {
-    resolve(JavaTypeParameterImpl@558['E']) = null
-}
-
-LazyJavaTypeParameterResolver@992 {
-    resolve(JavaTypeParameterImpl@585['E']) = null
-}
-
-LazyJavaTypeParameterResolver@993 {
-    resolve(JavaTypeParameterImpl@531['E']) = null
-}
-
-LazyJavaTypeParameterResolver@994 {
-    resolve(JavaTypeParameterImpl@552['E']) = null
-}
-
-LazyJavaTypeParameterResolver@995 {
-    resolve(JavaTypeParameterImpl@510['E']) = null
-}
-
-LazyJavaTypeParameterResolver@996 {
-    resolve(JavaTypeParameterImpl@486['E']) = null
-}
-
-LazyJavaTypeParameterResolver@997 {
-    resolve(JavaTypeParameterImpl@591['E']) = null
-}
-
-LazyJavaTypeParameterResolver@998 {
-    resolve(JavaTypeParameterImpl@466['E']) = null
-}
-
-LazyJavaTypeParameterResolver@999 {
-    resolve(JavaTypeParameterImpl@469['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1000 {
-    resolve(JavaTypeParameterImpl@546['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@501['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@573['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1003 {
-    resolve(JavaTypeParameterImpl@522['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@495['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1005 {
-    resolve(JavaTypeParameterImpl@1006['T']) = LazyJavaTypeParameterDescriptor@971['T']
-}
-
-LazyJavaTypeParameterResolver@1007 {
-    resolve(JavaTypeParameterImpl@1008['T']) = LazyJavaTypeParameterDescriptor@967['T']
-}
-
-ResolutionTaskHolder@1009 {
-    <name not found> = ArrayList@1010[1] { ResolutionCandidate@1011 }
-}
-
-ResolutionTaskHolder@1012 {
-    <name not found> = ArrayList@1013[3] { ResolutionCandidate@1014, ResolutionCandidate@1015, ResolutionCandidate@1016 }
-}
-
-null {
-    <name not found> = ArrayList@1017[1] { ResolutionCandidate@1011 }
-    <name not found> = ArrayList@1018[3] { ResolutionCandidate@1014, ResolutionCandidate@1015, ResolutionCandidate@1016 }
-}
diff --git a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log b/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
deleted file mode 100644
index 67188424ede..00000000000
--- a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
+++ /dev/null
@@ -1,452 +0,0 @@
-LazyJavaClassDescriptor@0['Arrays'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('asList': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['asList'] } // through LazyJavaStaticClassScope@6
-    functions('asList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('asList': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('asList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('asList': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Arrays']
-}
-
-LazyJavaClassTypeConstructor@11['Arrays'] {
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['List<T>'] {
-    arguments = ArrayList@15[1] { TypeProjectionImpl@16 }
-    classifier = JavaClassImpl@17['List']
-    memberScope = SubstitutingScope@18
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['List<T>'] {
-    arguments = ArrayList@22[1] { TypeProjectionImpl@23 }
-    classifier = JavaClassImpl@17['List']
-    memberScope = SubstitutingScope@24
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaClassifierType@27['Object'] {
-    classifier = JavaClassImpl@28['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['T'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'false': Boolean@19
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@34['T'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'false': Boolean@19
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@37['T'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'false': Boolean@19
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@40['T'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'true': Boolean@25
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@42['T'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'true': Boolean@25
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@44['T'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'true': Boolean@25
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@47) = LazyJavaPackageFragment@48['<root>']
-    packageFragments('Array': FqName@49) = null
-    packageFragments('Arrays': FqName@50) = null
-    packageFragments('Boolean': FqName@51) = null
-    packageFragments('BooleanArray': FqName@52) = null
-    packageFragments('Byte': FqName@53) = null
-    packageFragments('ByteArray': FqName@54) = null
-    packageFragments('Char': FqName@55) = null
-    packageFragments('CharArray': FqName@56) = null
-    packageFragments('Double': FqName@57) = null
-    packageFragments('DoubleArray': FqName@58) = null
-    packageFragments('Float': FqName@59) = null
-    packageFragments('FloatArray': FqName@60) = null
-    packageFragments('Int': FqName@61) = null
-    packageFragments('IntArray': FqName@62) = null
-    packageFragments('Long': FqName@63) = null
-    packageFragments('LongArray': FqName@64) = null
-    packageFragments('Short': FqName@65) = null
-    packageFragments('ShortArray': FqName@66) = null
-    packageFragments('String': FqName@67) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.Array': FqName@72) = null
-    packageFragments('java.lang.Arrays': FqName@73) = null
-    packageFragments('java.lang.Boolean': FqName@74) = null
-    packageFragments('java.lang.BooleanArray': FqName@75) = null
-    packageFragments('java.lang.Byte': FqName@76) = null
-    packageFragments('java.lang.ByteArray': FqName@77) = null
-    packageFragments('java.lang.Char': FqName@78) = null
-    packageFragments('java.lang.CharArray': FqName@79) = null
-    packageFragments('java.lang.Double': FqName@80) = null
-    packageFragments('java.lang.DoubleArray': FqName@81) = null
-    packageFragments('java.lang.Float': FqName@82) = null
-    packageFragments('java.lang.FloatArray': FqName@83) = null
-    packageFragments('java.lang.Int': FqName@84) = null
-    packageFragments('java.lang.IntArray': FqName@85) = null
-    packageFragments('java.lang.Long': FqName@86) = null
-    packageFragments('java.lang.LongArray': FqName@87) = null
-    packageFragments('java.lang.Short': FqName@88) = null
-    packageFragments('java.lang.ShortArray': FqName@89) = null
-    packageFragments('java.lang.String': FqName@90) = null
-    packageFragments('java.util': FqName@91) = LazyJavaPackageFragment@92['util']
-    packageFragments('java.util.Array': FqName@93) = null
-    packageFragments('java.util.Arrays': FqName@94) = null
-    packageFragments('java.util.Boolean': FqName@95) = null
-    packageFragments('java.util.BooleanArray': FqName@96) = null
-    packageFragments('java.util.Byte': FqName@97) = null
-    packageFragments('java.util.ByteArray': FqName@98) = null
-    packageFragments('java.util.Char': FqName@99) = null
-    packageFragments('java.util.CharArray': FqName@100) = null
-    packageFragments('java.util.Double': FqName@101) = null
-    packageFragments('java.util.DoubleArray': FqName@102) = null
-    packageFragments('java.util.Float': FqName@103) = null
-    packageFragments('java.util.FloatArray': FqName@104) = null
-    packageFragments('java.util.Int': FqName@105) = null
-    packageFragments('java.util.IntArray': FqName@106) = null
-    packageFragments('java.util.Long': FqName@107) = null
-    packageFragments('java.util.LongArray': FqName@108) = null
-    packageFragments('java.util.Short': FqName@109) = null
-    packageFragments('java.util.ShortArray': FqName@110) = null
-    packageFragments('java.util.String': FqName@111) = null
-    packageFragments('kotlin': FqName@112) = null
-    packageFragments('kotlin.Array': FqName@113) = null
-    packageFragments('kotlin.Arrays': FqName@114) = null
-    packageFragments('kotlin.Boolean': FqName@115) = null
-    packageFragments('kotlin.BooleanArray': FqName@116) = null
-    packageFragments('kotlin.Byte': FqName@117) = null
-    packageFragments('kotlin.ByteArray': FqName@118) = null
-    packageFragments('kotlin.Char': FqName@119) = null
-    packageFragments('kotlin.CharArray': FqName@120) = null
-    packageFragments('kotlin.Double': FqName@121) = null
-    packageFragments('kotlin.DoubleArray': FqName@122) = null
-    packageFragments('kotlin.Float': FqName@123) = null
-    packageFragments('kotlin.FloatArray': FqName@124) = null
-    packageFragments('kotlin.Int': FqName@125) = null
-    packageFragments('kotlin.IntArray': FqName@126) = null
-    packageFragments('kotlin.Long': FqName@127) = null
-    packageFragments('kotlin.LongArray': FqName@128) = null
-    packageFragments('kotlin.Short': FqName@129) = null
-    packageFragments('kotlin.ShortArray': FqName@130) = null
-    packageFragments('kotlin.String': FqName@131) = null
-    packageFragments('kotlin.io': FqName@132) = null
-    packageFragments('kotlin.jvm': FqName@133) = null
-    topLevelClasses(JavaClassImpl@134['Arrays']) = LazyJavaClassDescriptor@0['Arrays']
-}
-
-LazyJavaPackageFragment@48['<root>'] {
-    classes('Array': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Arrays': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Boolean': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('BooleanArray': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Byte': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('ByteArray': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Char': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('CharArray': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Double': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('DoubleArray': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Float': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('FloatArray': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Int': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('IntArray': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Long': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('LongArray': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Short': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('ShortArray': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('java': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('java': Name@164) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@136
-}
-
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('util': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('lang': Name@169) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('util': Name@170) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@167
-}
-
-LazyJavaPackageFragment@71['lang'] {
-    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@173 // through LazyPackageFragmentScopeForJavaPackage@172
-}
-
-LazyJavaPackageFragment@92['util'] {
-    classes('Array': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Arrays': Name@137) = LazyJavaClassDescriptor@0['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Boolean': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('BooleanArray': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Byte': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('ByteArray': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Char': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('CharArray': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Double': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('DoubleArray': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Float': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('FloatArray': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Int': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('IntArray': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Long': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('LongArray': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Short': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('ShortArray': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('String': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@174
-}
-
-LazyJavaTypeParameterDescriptor@176['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@177[1] { NullableType@178 }
-    upperBoundsAsType = NullableType@178
-}
-
-LazyJavaTypeParameterResolver@179 {
-    resolve(JavaTypeParameterImpl@180['T']) = LazyJavaTypeParameterDescriptor@176['T']
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[2] { ResolutionCandidate@244, ResolutionCandidate@245 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@267[2] { ResolutionCandidate@244, ResolutionCandidate@245 }
-    <name not found> = ArrayList@268[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Varargs.lazy.log b/compiler/testData/diagnostics/tests/Varargs.lazy.log
deleted file mode 100644
index e5a432168f2..00000000000
--- a/compiler/testData/diagnostics/tests/Varargs.lazy.log
+++ /dev/null
@@ -1,198 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Long': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Long': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.Long': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Long': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('v': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('v1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('v': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('v1': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('v': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('v1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('v': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('v1': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/Variance.lazy.log b/compiler/testData/diagnostics/tests/Variance.lazy.log
deleted file mode 100644
index 406e8a5b6d8..00000000000
--- a/compiler/testData/diagnostics/tests/Variance.lazy.log
+++ /dev/null
@@ -1,225 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Consumer': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Number': FqName@7) = null
-    packageFragments('Producer': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('Usual': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.Consumer': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Number': FqName@19) = null
-    packageFragments('java.lang.Producer': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('java.lang.Usual': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.Array': FqName@25) = null
-    packageFragments('kotlin.Consumer': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.Number': FqName@28) = null
-    packageFragments('kotlin.Producer': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.Usual': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('variance': FqName@34) = null
-    packageFragments('variance.Any': FqName@35) = null
-    packageFragments('variance.Array': FqName@36) = null
-    packageFragments('variance.Consumer': FqName@37) = null
-    packageFragments('variance.Int': FqName@38) = null
-    packageFragments('variance.Number': FqName@39) = null
-    packageFragments('variance.Producer': FqName@40) = null
-    packageFragments('variance.T': FqName@41) = null
-    packageFragments('variance.Usual': FqName@42) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('copy1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('copy2': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('copy3': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('copy4': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('t': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('copy1': Name@49) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('copy2': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('copy3': Name@52) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('copy4': Name@53) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-null {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
deleted file mode 100644
index 1bc3ae3f739..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
+++ /dev/null
@@ -1,246 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = ErrorTypeImpl@2
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['ArrayList<1>']
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['Deprecated']
-}
-
-LazyJavaClassDescriptor@9['ArrayList'] {
-    constructors = ArrayList@10[3] { JavaConstructorDescriptor@11['<init>'], JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'] } // through LazyJavaClassMemberScope@14
-    defaultType = JetTypeImpl@15['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@16['ArrayList']
-}
-
-LazyJavaClassDescriptor@17['Deprecated'] {
-    constructors = ArrayList@18[1] { JavaConstructorDescriptor@19['<init>'] } // through LazyJavaClassMemberScope@20
-    defaultType = JetTypeImpl@21['Deprecated']
-    typeConstructor = LazyJavaClassTypeConstructor@22['Deprecated']
-}
-
-LazyJavaClassTypeConstructor@16['ArrayList'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-}
-
-LazyJavaClassTypeConstructor@22['Deprecated'] {
-    parameters = ArrayList@25[empty]
-}
-
-LazyJavaClassifierType@26['Collection<? extends E>'] {
-    arguments = ArrayList@27[1] { TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['Collection']
-    memberScope = SubstitutingScope@30
-    nullable = 'false': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Collection<? extends E>'] {
-    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
-    classifier = JavaClassImpl@29['Collection']
-    memberScope = SubstitutingScope@36
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@38
-}
-
-LazyJavaClassifierType@39['E'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@41['E']
-    nullable = 'false': Boolean@31
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-LazyJavaClassifierType@43['E'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaTypeParameterImpl@45['E']
-    nullable = 'false': Boolean@31
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-LazyJavaClassifierType@46['E'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaTypeParameterImpl@45['E']
-    nullable = 'true': Boolean@37
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-LazyJavaClassifierType@48['E'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@41['E']
-    nullable = 'true': Boolean@37
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('ArrayList': FqName@53) = null
-    packageFragments('Deprecated': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('Xoo': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.ArrayList': FqName@61) = null
-    packageFragments('java.lang.Deprecated': FqName@62) = null
-    packageFragments('java.lang.Int': FqName@63) = null
-    packageFragments('java.lang.Xoo': FqName@64) = null
-    packageFragments('java.lang.x': FqName@65) = null
-    packageFragments('java.util': FqName@66) = LazyJavaPackageFragment@67['util']
-    packageFragments('java.util.ArrayList': FqName@68) = null
-    packageFragments('kotlin': FqName@69) = null
-    packageFragments('kotlin.ArrayList': FqName@70) = null
-    packageFragments('kotlin.Deprecated': FqName@71) = null
-    packageFragments('kotlin.Int': FqName@72) = null
-    packageFragments('kotlin.Xoo': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    packageFragments('kotlin.x': FqName@76) = null
-    packageFragments('x': FqName@77) = null
-    topLevelClasses(JavaClassImpl@78['ArrayList']) = LazyJavaClassDescriptor@9['ArrayList']
-    topLevelClasses(JavaClassImpl@79['Deprecated']) = LazyJavaClassDescriptor@17['Deprecated']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('ArrayList': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Deprecated': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Xoo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('java': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('x': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('java': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('x': Name@90) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('util': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('util': Name@96) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Deprecated': Name@82) = LazyJavaClassDescriptor@17['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('Xoo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('x': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('x': Name@90) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@67['util'] {
-    classes('ArrayList': Name@100) = LazyJavaClassDescriptor@9['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('ArrayList': Name@102) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@104['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-    upperBounds = LinkedHashSet@105[1] { NullableType@106 }
-}
-
-LazyJavaTypeParameterResolver@107 {
-    resolve(JavaTypeParameterImpl@108['E']) = LazyJavaTypeParameterDescriptor@24['E']
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-null {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@122[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
deleted file mode 100644
index 8299439485e..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
+++ /dev/null
@@ -1,383 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['Deprecated']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['Deprecated']
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['Deprecated']
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['SuppressWarnings']
-    valueArguments(ValueParameterDescriptorImpl@14['value']) = ArrayValue@15
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['SuppressWarnings']
-    valueArguments(ValueParameterDescriptorImpl@14['value']) = ArrayValue@19
-}
-
-LazyAnnotationDescriptor@20 {
-    resolutionResults = OverloadResolutionResultsImpl@21
-    type = JetTypeImpl@22['SuppressWarnings']
-    valueArguments(ValueParameterDescriptorImpl@14['value']) = ArrayValue@23
-}
-
-LazyJavaClassDescriptor@24['Appendable'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassDescriptor@30['AutoCloseable'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@33['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@34['Closeable'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
-}
-
-LazyJavaClassDescriptor@38['Deprecated'] {
-    constructors = ArrayList@39[1] { JavaConstructorDescriptor@40['<init>'] } // through LazyJavaClassMemberScope@41
-    defaultType = JetTypeImpl@42['Deprecated']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@43['Deprecated']
-}
-
-LazyJavaClassDescriptor@44['FilterOutputStream'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@47['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@48['OutputStream'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['OutputStream']
-}
-
-LazyJavaClassDescriptor@52['PrintStream'] {
-    defaultType = JetTypeImpl@53['PrintStream']
-    enumEntryIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@55
-    functions('println': Name@56) = ArrayList@57[10] { JavaMethodDescriptor@58['println'], JavaMethodDescriptor@59['println'], JavaMethodDescriptor@60['println'], ... } // through LazyJavaClassMemberScope@55
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@55
-    nestedClassIndex = LinkedHashMap@62 // through LazyJavaClassMemberScope@55
-    nestedClasses('println': Name@56) = null // through LazyJavaClassMemberScope@55
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@63['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@64['PrintStream']
-}
-
-LazyJavaClassDescriptor@65['SuppressWarnings'] {
-    constructors = ArrayList@66[1] { JavaConstructorDescriptor@67['<init>'] } // through LazyJavaClassMemberScope@68
-    defaultType = JetTypeImpl@69['SuppressWarnings']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@70['SuppressWarnings']
-}
-
-LazyJavaClassDescriptor@71['System'] {
-    enumEntryIndex = LinkedHashMap@72 // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@74 // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@75 // through LazyJavaStaticClassScope@76
-    nestedClassIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@73
-    nestedClasses('out': Name@78) = null // through LazyJavaClassMemberScope@73
-    properties('out': Name@78) = ArrayList@79[1] { JavaPropertyDescriptor@80['out'] } // through LazyJavaStaticClassScope@76
-    properties('out': Name@78) = EmptyList@26[empty] // through LazyJavaClassMemberScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@81['System']
-}
-
-LazyJavaClassTypeConstructor@29['Appendable'] {
-    parameters = ArrayList@82[empty]
-    supertypes = ArrayList@83[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassTypeConstructor@33['AutoCloseable'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassTypeConstructor@37['Closeable'] {
-    parameters = ArrayList@87[empty]
-    supertypes = ArrayList@88[1] { LazyJavaClassifierType@89['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@43['Deprecated'] {
-    parameters = ArrayList@90[empty]
-}
-
-LazyJavaClassTypeConstructor@47['FilterOutputStream'] {
-    parameters = ArrayList@91[empty]
-    supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@51['OutputStream'] {
-    parameters = ArrayList@94[empty]
-    supertypes = ArrayList@95[1] { LazyJavaClassifierType@96['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@64['PrintStream'] {
-    parameters = ArrayList@97[empty]
-    supertypes = ArrayList@98[3] { LazyJavaClassifierType@99['FilterOutputStream'], LazyJavaClassifierType@100['Appendable'], LazyJavaClassifierType@101['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@70['SuppressWarnings'] {
-    parameters = ArrayList@102[empty]
-}
-
-LazyJavaClassTypeConstructor@81['System'] {
-    supertypes = ArrayList@103[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassifierType@100['Appendable'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['Appendable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@89['AutoCloseable'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@33['AutoCloseable']
-}
-
-LazyJavaClassifierType@96['Closeable'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['Closeable']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
-}
-
-LazyJavaClassifierType@101['Closeable'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@111['Closeable']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
-}
-
-LazyJavaClassifierType@99['FilterOutputStream'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@47['FilterOutputStream']
-}
-
-LazyJavaClassifierType@114['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@115
-}
-
-LazyJavaClassifierType@116['Object'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['Object']
-    nullable = 'false': Boolean@119
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@121['Object'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@118['Object']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@124['Object'] {
-    classifier = JavaClassImpl@125['Object']
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@126['Object'] {
-    classifier = JavaClassImpl@127['Object']
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@128['Object'] {
-    classifier = JavaClassImpl@129['Object']
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@130['Object'] {
-    classifier = JavaClassImpl@131['Object']
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@93['OutputStream'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@133['OutputStream']
-    memberScope = LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['OutputStream']
-}
-
-LazyJavaClassifierType@134['PrintStream'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@136['PrintStream']
-    memberScope = LazyJavaClassMemberScope@55
-    nullable = 'false': Boolean@119
-    typeConstructor = LazyJavaClassTypeConstructor@64['PrintStream']
-}
-
-LazyJavaClassifierType@137['PrintStream'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@136['PrintStream']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@64['PrintStream']
-}
-
-LazyJavaClassifierType@139['String'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@141['String']
-    nullable = 'false': Boolean@119
-    typeConstructor = DeserializedClassTypeConstructor@142
-}
-
-LazyJavaClassifierType@143['String'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@141['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@142
-}
-
-LazyJavaClassifierType@145['String'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@147['String']
-    typeConstructor = DeserializedClassTypeConstructor@142
-}
-
-LazyJavaPackageFragmentProvider@148 {
-    packageFragments('<root>': FqName@149) = LazyJavaPackageFragment@150['<root>']
-    packageFragments('Array': FqName@151) = null
-    packageFragments('Int': FqName@152) = null
-    packageFragments('String': FqName@153) = null
-    packageFragments('System': FqName@154) = null
-    packageFragments('a': FqName@155) = null
-    packageFragments('a.Array': FqName@156) = null
-    packageFragments('a.Int': FqName@157) = null
-    packageFragments('a.String': FqName@158) = null
-    packageFragments('a.System': FqName@159) = null
-    packageFragments('a.Test': FqName@160) = null
-    packageFragments('a.deprecated': FqName@161) = null
-    packageFragments('a.s': FqName@162) = null
-    packageFragments('a.suppresswarnings': FqName@163) = null
-    packageFragments('deprecated': FqName@164) = null
-    packageFragments('java': FqName@165) = LazyJavaPackageFragment@166['java']
-    packageFragments('java.io': FqName@167) = LazyJavaPackageFragment@168['io']
-    packageFragments('java.lang': FqName@169) = LazyJavaPackageFragment@170['lang']
-    packageFragments('java.lang.Array': FqName@171) = null
-    packageFragments('java.lang.Deprecated': FqName@172) = null
-    packageFragments('java.lang.Int': FqName@173) = null
-    packageFragments('java.lang.String': FqName@174) = null
-    packageFragments('java.lang.SuppressWarnings': FqName@175) = null
-    packageFragments('java.lang.System': FqName@176) = null
-    packageFragments('java.lang.deprecated': FqName@177) = null
-    packageFragments('java.lang.suppresswarnings': FqName@178) = null
-    packageFragments('kotlin': FqName@179) = null
-    packageFragments('kotlin.Array': FqName@180) = null
-    packageFragments('kotlin.Int': FqName@181) = null
-    packageFragments('kotlin.String': FqName@182) = null
-    packageFragments('kotlin.System': FqName@183) = null
-    packageFragments('kotlin.deprecated': FqName@184) = null
-    packageFragments('kotlin.io': FqName@185) = null
-    packageFragments('kotlin.jvm': FqName@186) = null
-    packageFragments('kotlin.suppresswarnings': FqName@187) = null
-    packageFragments('suppresswarnings': FqName@188) = null
-    topLevelClasses(JavaClassImpl@105['Appendable']) = LazyJavaClassDescriptor@24['Appendable']
-    topLevelClasses(JavaClassImpl@107['AutoCloseable']) = LazyJavaClassDescriptor@30['AutoCloseable']
-    topLevelClasses(JavaClassImpl@111['Closeable']) = LazyJavaClassDescriptor@34['Closeable']
-    topLevelClasses(JavaClassImpl@189['Deprecated']) = LazyJavaClassDescriptor@38['Deprecated']
-    topLevelClasses(JavaClassImpl@113['FilterOutputStream']) = LazyJavaClassDescriptor@44['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@133['OutputStream']) = LazyJavaClassDescriptor@48['OutputStream']
-    topLevelClasses(JavaClassImpl@136['PrintStream']) = LazyJavaClassDescriptor@52['PrintStream']
-    topLevelClasses(JavaClassImpl@190['SuppressWarnings']) = LazyJavaClassDescriptor@65['SuppressWarnings']
-    topLevelClasses(JavaClassImpl@191['System']) = LazyJavaClassDescriptor@71['System']
-}
-
-LazyJavaPackageFragment@166['java'] {
-    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('lang': Name@195) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@170['lang'] {
-    classes('Deprecated': Name@197) = LazyJavaClassDescriptor@38['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('SuppressWarnings': Name@199) = LazyJavaClassDescriptor@65['SuppressWarnings'] // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('System': Name@200) = LazyJavaClassDescriptor@71['System'] // through LazyPackageFragmentScopeForJavaPackage@198
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('Deprecated': Name@201) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('SuppressWarnings': Name@202) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@198
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@231[10] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.lazy.log
deleted file mode 100644
index 2ada09145f2..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForClassTypeParameter.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A1': FqName@3) = null
-    packageFragments('A2': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('TopLevelClass': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.lazy.log
deleted file mode 100644
index 4ecd0b0bc2b..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForFunctionTypeParameter.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A1': FqName@5) = null
-    packageFragments('A2': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('SomeClass': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.lazy.log
deleted file mode 100644
index e9606c77af5..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationForObject.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = ErrorTypeImpl@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Test': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.someErrorAnnotation': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('kotlin.someErrorAnnotation': FqName@15) = null
-    packageFragments('someErrorAnnotation': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('someErrorAnnotation': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('someErrorAnnotation': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
deleted file mode 100644
index 425c0b5430c..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['Deprecated']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['Deprecated']
-}
-
-LazyJavaClassDescriptor@6['Deprecated'] {
-    constructors = ArrayList@7[1] { JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Deprecated']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Deprecated']
-}
-
-LazyJavaClassTypeConstructor@11['Deprecated'] {
-    parameters = ArrayList@12[empty]
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Deprecated': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Deprecated': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Deprecated': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('my': FqName@26) = null
-    packageFragments('my1': FqName@27) = null
-    topLevelClasses(JavaClassImpl@28['Deprecated']) = LazyJavaClassDescriptor@6['Deprecated']
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Deprecated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('java': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('Deprecated': Name@38) = LazyJavaClassDescriptor@6['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('java': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.lazy.log
deleted file mode 100644
index ef7107e2a03..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForPropertyTypeParameter.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A1': FqName@7) = null
-    packageFragments('A2': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('SomeClass': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('topProp': FqName@20) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
deleted file mode 100644
index 847ba23111f..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['my']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['my1']
-    valueArguments(ValueParameterDescriptorImpl@6['i']) = IntegerValueTypeConstant@7
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['my1']
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['my2']
-    valueArguments(ValueParameterDescriptorImpl@14['i']) = IntegerValueTypeConstant@15
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['my2']
-    valueArguments(ValueParameterDescriptorImpl@14['i']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['my2']
-    valueArguments(ValueParameterDescriptorImpl@14['i']) = null
-}
-
-LazyJavaPackageFragmentProvider@22 {
-    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('Int': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Int': FqName@30) = null
-    packageFragments('java.lang.my': FqName@31) = null
-    packageFragments('java.lang.my1': FqName@32) = null
-    packageFragments('java.lang.my2': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = null
-    packageFragments('kotlin.Int': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-    packageFragments('kotlin.my': FqName@38) = null
-    packageFragments('kotlin.my1': FqName@39) = null
-    packageFragments('kotlin.my2': FqName@40) = null
-    packageFragments('my': FqName@41) = null
-    packageFragments('my1': FqName@42) = null
-    packageFragments('my2': FqName@43) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('Int': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
deleted file mode 100644
index 2f9574ffee1..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
+++ /dev/null
@@ -1,598 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['Ann2']
-    valueArguments(ValueParameterDescriptorImpl@7['a']) = AnnotationValue@8
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['Ann2']
-    valueArguments(ValueParameterDescriptorImpl@7['a']) = AnnotationValue@12
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['Ann4']
-    valueArguments(ValueParameterDescriptorImpl@16['value']) = StringValue@17
-}
-
-LazyJavaClassDescriptor@18['AnnotatedElement'] {
-    defaultType = JetTypeImpl@19['AnnotatedElement']
-    functions('getAnnotation': Name@20) = ArrayList@21[1] { JavaMethodDescriptor@22['getAnnotation'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@27['Class'] {
-    defaultType = JetTypeImpl@28['Class<1>']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
-    functionTypeForSamInterface = null
-    functions('getAnnotation': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['getAnnotation'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@30
-    nestedClasses('getAnnotation': Name@31) = null // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
-}
-
-LazyJavaClassDescriptor@38['GenericDeclaration'] {
-    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@43['Serializable'] {
-    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
-}
-
-LazyJavaClassDescriptor@47['Type'] {
-    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['Type']
-}
-
-LazyJavaClassTypeConstructor@26['AnnotatedElement'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassTypeConstructor@37['Class'] {
-    parameters = ArrayList@54[1] { LazyJavaTypeParameterDescriptor@55['T'] }
-    supertypes = ArrayList@56[4] { LazyJavaClassifierType@57['Serializable'], LazyJavaClassifierType@58['GenericDeclaration'], LazyJavaClassifierType@59['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@42['GenericDeclaration'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassTypeConstructor@46['Serializable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassTypeConstructor@50['Type'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassifierType@66['A'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['A']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@71['A'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['A']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@74['A'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['A']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@77['A'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@68['A']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@80['A'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@76['A']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@82['A'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@73['A']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@84['AnnotatedElement'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['AnnotatedElement']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@26['AnnotatedElement']
-}
-
-LazyJavaClassifierType@87['Annotation'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['Annotation']
-    memberScope = DeserializedClassMemberScope@90
-    nullable = 'false': Boolean@69
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@92['Annotation'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['Annotation']
-    memberScope = DeserializedClassMemberScope@90
-    nullable = 'false': Boolean@69
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@95['Annotation'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@94['Annotation']
-    memberScope = DeserializedClassMemberScope@90
-    nullable = 'true': Boolean@79
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@97['Annotation'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@89['Annotation']
-    memberScope = DeserializedClassMemberScope@90
-    nullable = 'true': Boolean@79
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@99['Class<A>'] {
-    arguments = ArrayList@100[1] { TypeProjectionImpl@101 }
-    classifier = JavaClassImpl@102['Class']
-    memberScope = SubstitutingScope@103
-    nullable = 'false': Boolean@69
-    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
-}
-
-LazyJavaClassifierType@104['Class<A>'] {
-    arguments = ArrayList@105[1] { TypeProjectionImpl@106 }
-    classifier = JavaClassImpl@102['Class']
-    memberScope = SubstitutingScope@107
-    nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
-}
-
-LazyJavaClassifierType@108['Class<T>'] {
-    arguments = ArrayList@109[1] { TypeProjectionImpl@110 }
-    classifier = JavaClassImpl@111['Class']
-    memberScope = SubstitutingScope@112
-    nullable = 'false': Boolean@69
-    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
-}
-
-LazyJavaClassifierType@113['Class<T>'] {
-    arguments = ArrayList@114[1] { TypeProjectionImpl@115 }
-    classifier = JavaClassImpl@111['Class']
-    memberScope = SubstitutingScope@116
-    nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
-}
-
-LazyJavaClassifierType@58['GenericDeclaration'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['GenericDeclaration']
-    memberScope = LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['GenericDeclaration']
-}
-
-LazyJavaClassifierType@119['Object'] {
-    classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@121
-}
-
-LazyJavaClassifierType@122['Object'] {
-    classifier = JavaClassImpl@123['Object']
-    typeConstructor = DeserializedClassTypeConstructor@121
-}
-
-LazyJavaClassifierType@124['Object'] {
-    classifier = JavaClassImpl@125['Object']
-    typeConstructor = DeserializedClassTypeConstructor@121
-}
-
-LazyJavaClassifierType@126['Object'] {
-    classifier = JavaClassImpl@127['Object']
-    typeConstructor = DeserializedClassTypeConstructor@121
-}
-
-LazyJavaClassifierType@128['Object'] {
-    classifier = JavaClassImpl@129['Object']
-    typeConstructor = DeserializedClassTypeConstructor@121
-}
-
-LazyJavaClassifierType@57['Serializable'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@131['Serializable']
-    memberScope = LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
-}
-
-LazyJavaClassifierType@132['T'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['T']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@136['T'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@138['T']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@139['T'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@141['T']
-    nullable = 'false': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@142['T'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@141['T']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@144['T'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@134['T']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@146['T'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@138['T']
-    nullable = 'true': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@59['Type'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['Type']
-    memberScope = LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['Type']
-}
-
-LazyJavaPackageFragmentProvider@150 {
-    packageFragments('<root>': FqName@151) = LazyJavaPackageFragment@152['<root>']
-    packageFragments('Ann': FqName@153) = null
-    packageFragments('Ann1': FqName@154) = null
-    packageFragments('Ann2': FqName@155) = null
-    packageFragments('Ann3': FqName@156) = null
-    packageFragments('Ann4': FqName@157) = null
-    packageFragments('Class': FqName@158) = null
-    packageFragments('Int': FqName@159) = null
-    packageFragments('MyClass': FqName@160) = null
-    packageFragments('String': FqName@161) = null
-    packageFragments('T': FqName@162) = null
-    packageFragments('a': FqName@163) = null
-    packageFragments('c': FqName@164) = null
-    packageFragments('java': FqName@165) = LazyJavaPackageFragment@166['java']
-    packageFragments('java.io': FqName@167) = LazyJavaPackageFragment@168['io']
-    packageFragments('java.lang': FqName@169) = LazyJavaPackageFragment@170['lang']
-    packageFragments('java.lang.Ann': FqName@171) = null
-    packageFragments('java.lang.Ann1': FqName@172) = null
-    packageFragments('java.lang.Ann2': FqName@173) = null
-    packageFragments('java.lang.Ann4': FqName@174) = null
-    packageFragments('java.lang.Class': FqName@175) = null
-    packageFragments('java.lang.Int': FqName@176) = null
-    packageFragments('java.lang.MyClass': FqName@177) = null
-    packageFragments('java.lang.String': FqName@178) = null
-    packageFragments('java.lang.T': FqName@179) = null
-    packageFragments('java.lang.reflect': FqName@180) = LazyJavaPackageFragment@181['reflect']
-    packageFragments('kotlin': FqName@182) = null
-    packageFragments('kotlin.Ann': FqName@183) = null
-    packageFragments('kotlin.Ann1': FqName@184) = null
-    packageFragments('kotlin.Ann2': FqName@185) = null
-    packageFragments('kotlin.Ann4': FqName@186) = null
-    packageFragments('kotlin.Class': FqName@187) = null
-    packageFragments('kotlin.Int': FqName@188) = null
-    packageFragments('kotlin.MyClass': FqName@189) = null
-    packageFragments('kotlin.String': FqName@190) = null
-    packageFragments('kotlin.T': FqName@191) = null
-    packageFragments('kotlin.io': FqName@192) = null
-    packageFragments('kotlin.jvm': FqName@193) = null
-    topLevelClasses(JavaClassImpl@86['AnnotatedElement']) = LazyJavaClassDescriptor@18['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@194['Class']) = LazyJavaClassDescriptor@27['Class']
-    topLevelClasses(JavaClassImpl@118['GenericDeclaration']) = LazyJavaClassDescriptor@38['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@131['Serializable']) = LazyJavaClassDescriptor@43['Serializable']
-    topLevelClasses(JavaClassImpl@149['Type']) = LazyJavaClassDescriptor@47['Type']
-}
-
-LazyJavaPackageFragment@152['<root>'] {
-    classes('Ann': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Ann1': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Class': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Int': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('String': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('bar': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('invoke': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('javaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('Ann': Name@195) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('Ann1': Name@197) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('bar': Name@201) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('invoke': Name@202) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('javaClass': Name@203) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@196
-}
-
-LazyJavaPackageFragment@166['java'] {
-    classes('lang': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@207
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@207
-    functions('lang': Name@208) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@207
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@207
-}
-
-LazyJavaPackageFragment@170['lang'] {
-    classes('Ann': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('Ann1': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('Class': Name@198) = LazyJavaClassDescriptor@27['Class'] // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('bar': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('invoke': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('javaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('Ann': Name@195) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('Ann1': Name@197) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('bar': Name@201) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('invoke': Name@202) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('javaClass': Name@203) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@210
-}
-
-LazyJavaTypeParameterDescriptor@212['A'] {
-    defaultType = JetTypeImpl@213['A']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-    upperBounds = LinkedHashSet@214[1] { DelegatingFlexibleType@215 }
-    upperBoundsAsType = DelegatingFlexibleType@215
-}
-
-LazyJavaTypeParameterDescriptor@55['T'] {
-    defaultType = JetTypeImpl@216['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@217
-    upperBounds = LinkedHashSet@218[1] { NullableType@219 }
-}
-
-LazyJavaTypeParameterDescriptor@220['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-    upperBounds = LinkedHashSet@221[1] { DelegatingFlexibleType@222 }
-    upperBoundsAsType = DelegatingFlexibleType@222
-}
-
-LazyJavaTypeParameterResolver@223 {
-    resolve(JavaTypeParameterImpl@224['A']) = LazyJavaTypeParameterDescriptor@212['A']
-}
-
-LazyJavaTypeParameterResolver@225 {
-    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@55['T']
-}
-
-LazyJavaTypeParameterResolver@227 {
-    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@220['T']
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-null {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log b/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
deleted file mode 100644
index eedc3c462eb..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['Deprecated']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['Deprecated']
-}
-
-LazyJavaClassDescriptor@6['Deprecated'] {
-    constructors = ArrayList@7[1] { JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Deprecated']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['Deprecated']
-}
-
-LazyJavaClassTypeConstructor@11['Deprecated'] {
-    parameters = ArrayList@12[empty]
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Deprecated': FqName@16) = null
-    packageFragments('deprecated': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Deprecated': FqName@22) = null
-    packageFragments('java.lang.deprecated': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.Deprecated': FqName@25) = null
-    packageFragments('kotlin.deprecated': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-    topLevelClasses(JavaClassImpl@29['Deprecated']) = LazyJavaClassDescriptor@6['Deprecated']
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Deprecated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('deprecated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('java': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('java': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('Deprecated': Name@42) = LazyJavaClassDescriptor@6['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('Deprecated': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
deleted file mode 100644
index 0f8485dc1b5..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
+++ /dev/null
@@ -1,328 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-ANNOTATION_TYPE>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@2['<class-object-for-CLASS>'] {
-    defaultType = JetTypeImpl@3['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@4['<class-object-for-CONSTRUCTOR>'] {
-    defaultType = JetTypeImpl@5['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@6['<class-object-for-RUNTIME>'] {
-    defaultType = JetTypeImpl@7['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@8['ANNOTATION_TYPE'] {
-    defaultType = JetTypeImpl@9['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@10['CLASS'] {
-    defaultType = JetTypeImpl@11['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@12['CONSTRUCTOR'] {
-    defaultType = JetTypeImpl@13['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@14['RUNTIME'] {
-    defaultType = JetTypeImpl@15['enum entry']
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['Retention']
-    valueArguments(ValueParameterDescriptorImpl@19['value']) = EnumValue@20
-}
-
-LazyAnnotationDescriptor@21 {
-    resolutionResults = OverloadResolutionResultsImpl@22
-    type = JetTypeImpl@23['Retention']
-    valueArguments(ValueParameterDescriptorImpl@19['value']) = EnumValue@24
-}
-
-LazyAnnotationDescriptor@25 {
-    resolutionResults = OverloadResolutionResultsImpl@26
-    type = JetTypeImpl@27['Target']
-    valueArguments(ValueParameterDescriptorImpl@28['value']) = ArrayValue@29
-}
-
-LazyJavaClassDescriptor@30['ElementType'] {
-    defaultType = JetTypeImpl@31['ElementType']
-    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaStaticClassScope@36
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@33
-    nestedClasses('ANNOTATION_TYPE': Name@38) = EnumEntrySyntheticClassDescriptor@8['ANNOTATION_TYPE'] // through LazyJavaClassMemberScope@33
-    nestedClasses('CONSTRUCTOR': Name@39) = EnumEntrySyntheticClassDescriptor@12['CONSTRUCTOR'] // through LazyJavaClassMemberScope@33
-    properties('ANNOTATION_TYPE': Name@38) = EmptyList@40[empty] // through LazyJavaClassMemberScope@33
-    properties('ANNOTATION_TYPE': Name@38) = EmptyList@40[empty] // through LazyJavaStaticClassScope@36
-    properties('CONSTRUCTOR': Name@39) = EmptyList@40[empty] // through LazyJavaClassMemberScope@33
-    properties('CONSTRUCTOR': Name@39) = EmptyList@40[empty] // through LazyJavaStaticClassScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@41['ElementType']
-}
-
-LazyJavaClassDescriptor@42['Retention'] {
-    constructors = ArrayList@43[1] { JavaConstructorDescriptor@44['<init>'] } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@46['Retention']
-    typeConstructor = LazyJavaClassTypeConstructor@47['Retention']
-}
-
-LazyJavaClassDescriptor@48['RetentionPolicy'] {
-    defaultType = JetTypeImpl@49['RetentionPolicy']
-    enumEntryIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@51
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@51
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaStaticClassScope@54
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@51
-    nestedClasses('CLASS': Name@56) = EnumEntrySyntheticClassDescriptor@10['CLASS'] // through LazyJavaClassMemberScope@51
-    nestedClasses('RUNTIME': Name@57) = EnumEntrySyntheticClassDescriptor@14['RUNTIME'] // through LazyJavaClassMemberScope@51
-    properties('CLASS': Name@56) = EmptyList@40[empty] // through LazyJavaClassMemberScope@51
-    properties('CLASS': Name@56) = EmptyList@40[empty] // through LazyJavaStaticClassScope@54
-    properties('RUNTIME': Name@57) = EmptyList@40[empty] // through LazyJavaClassMemberScope@51
-    properties('RUNTIME': Name@57) = EmptyList@40[empty] // through LazyJavaStaticClassScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@58['RetentionPolicy']
-}
-
-LazyJavaClassDescriptor@59['Target'] {
-    constructors = ArrayList@60[1] { JavaConstructorDescriptor@61['<init>'] } // through LazyJavaClassMemberScope@62
-    defaultType = JetTypeImpl@63['Target']
-    typeConstructor = LazyJavaClassTypeConstructor@64['Target']
-}
-
-LazyJavaClassTypeConstructor@41['ElementType'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { LazyJavaClassifierType@67['Enum<ElementType>'] }
-}
-
-LazyJavaClassTypeConstructor@47['Retention'] {
-    parameters = ArrayList@68[empty]
-}
-
-LazyJavaClassTypeConstructor@58['RetentionPolicy'] {
-    parameters = ArrayList@69[empty]
-    supertypes = ArrayList@70[1] { LazyJavaClassifierType@71['Enum<RetentionPolicy>'] }
-}
-
-LazyJavaClassTypeConstructor@64['Target'] {
-    parameters = ArrayList@72[empty]
-}
-
-LazyJavaClassifierType@73['ElementType'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['ElementType']
-    nullable = 'false': Boolean@76
-    typeConstructor = LazyJavaClassTypeConstructor@41['ElementType']
-}
-
-LazyJavaClassifierType@77['ElementType'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@75['ElementType']
-    nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@41['ElementType']
-}
-
-LazyJavaClassifierType@80['ElementType'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['ElementType']
-    typeConstructor = LazyJavaClassTypeConstructor@41['ElementType']
-}
-
-LazyJavaClassifierType@67['Enum<ElementType>'] {
-    arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@85['Enum']
-    memberScope = SubstitutingScope@86
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@71['Enum<RetentionPolicy>'] {
-    arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@90['Enum']
-    memberScope = SubstitutingScope@91
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@92['RetentionPolicy'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['RetentionPolicy']
-    nullable = 'false': Boolean@76
-    typeConstructor = LazyJavaClassTypeConstructor@58['RetentionPolicy']
-}
-
-LazyJavaClassifierType@95['RetentionPolicy'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@94['RetentionPolicy']
-    nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@58['RetentionPolicy']
-}
-
-LazyJavaClassifierType@97['RetentionPolicy'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['RetentionPolicy']
-    typeConstructor = LazyJavaClassTypeConstructor@58['RetentionPolicy']
-}
-
-LazyJavaPackageFragmentProvider@100 {
-    packageFragments('<root>': FqName@101) = LazyJavaPackageFragment@102['<root>']
-    packageFragments('ElementType': FqName@103) = null
-    packageFragments('Retention': FqName@104) = null
-    packageFragments('RetentionPolicy': FqName@105) = null
-    packageFragments('Target': FqName@106) = null
-    packageFragments('java': FqName@107) = LazyJavaPackageFragment@108['java']
-    packageFragments('java.lang': FqName@109) = LazyJavaPackageFragment@110['lang']
-    packageFragments('java.lang.ElementType': FqName@111) = null
-    packageFragments('java.lang.Retention': FqName@112) = null
-    packageFragments('java.lang.RetentionPolicy': FqName@113) = null
-    packageFragments('java.lang.Target': FqName@114) = null
-    packageFragments('java.lang.annotation': FqName@115) = LazyJavaPackageFragment@116['annotation']
-    packageFragments('java.lang.annotation.ElementType': FqName@117) = null
-    packageFragments('java.lang.annotation.Retention': FqName@118) = null
-    packageFragments('java.lang.annotation.RetentionPolicy': FqName@119) = null
-    packageFragments('java.lang.annotation.Target': FqName@120) = null
-    packageFragments('kotlin': FqName@121) = null
-    packageFragments('kotlin.ElementType': FqName@122) = null
-    packageFragments('kotlin.Retention': FqName@123) = null
-    packageFragments('kotlin.RetentionPolicy': FqName@124) = null
-    packageFragments('kotlin.Target': FqName@125) = null
-    packageFragments('kotlin.io': FqName@126) = null
-    packageFragments('kotlin.jvm': FqName@127) = null
-    packageFragments('my': FqName@128) = null
-    packageFragments('my1': FqName@129) = null
-    topLevelClasses(JavaClassImpl@130['ElementType']) = LazyJavaClassDescriptor@30['ElementType']
-    topLevelClasses(JavaClassImpl@131['Retention']) = LazyJavaClassDescriptor@42['Retention']
-    topLevelClasses(JavaClassImpl@132['RetentionPolicy']) = LazyJavaClassDescriptor@48['RetentionPolicy']
-    topLevelClasses(JavaClassImpl@133['Target']) = LazyJavaClassDescriptor@59['Target']
-}
-
-LazyJavaPackageFragment@102['<root>'] {
-    classes('ElementType': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Retention': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('RetentionPolicy': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Target': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('java': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('java': Name@141) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@135
-}
-
-LazyJavaPackageFragment@116['annotation'] {
-    classes('ElementType': Name@134) = LazyJavaClassDescriptor@30['ElementType'] // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('Retention': Name@144) = LazyJavaClassDescriptor@42['Retention'] // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('RetentionPolicy': Name@137) = LazyJavaClassDescriptor@48['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('Target': Name@138) = LazyJavaClassDescriptor@59['Target'] // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('java': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@143
-}
-
-LazyJavaPackageFragment@108['java'] {
-    classes('lang': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('lang': Name@148) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@147
-}
-
-LazyJavaPackageFragment@110['lang'] {
-    classes('annotation': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('java': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('annotation': Name@152) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@151
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
deleted file mode 100644
index b38d1f71469..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['Foo']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Bar': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Foo': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Foo': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
deleted file mode 100644
index 9c260525fe9..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['T']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Ann': FqName@7) = null
-    packageFragments('Ann2': FqName@8) = null
-    packageFragments('Ann3': FqName@9) = null
-    packageFragments('Ann4': FqName@10) = null
-    packageFragments('C': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('a': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.C': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationModifier.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationModifier.lazy.log
deleted file mode 100644
index a9d839ea0c4..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationModifier.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('O': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('x': FqName@17) = null
-    packageFragments('y': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
deleted file mode 100644
index f7ddc59d029..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = BooleanValue@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['Ann']
-    valueArguments(ValueParameterDescriptorImpl@5['i']) = ArrayValue@6
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Ann': FqName@10) = null
-    packageFragments('Boolean': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Ann': FqName@16) = null
-    packageFragments('java.lang.Boolean': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Ann': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Boolean': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
deleted file mode 100644
index 24c3bc2d0c2..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = BooleanValue@1
-    <name not found> = BooleanValue@2
-    <name not found> = BooleanValue@3
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['Ann']
-    valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Ann': FqName@12) = null
-    packageFragments('Boolean': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Ann': FqName@18) = null
-    packageFragments('java.lang.Boolean': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Ann': FqName@21) = null
-    packageFragments('kotlin.Boolean': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Boolean': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
deleted file mode 100644
index 1584729e058..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['AnnE']
-    valueArguments(ValueParameterDescriptorImpl@3['i']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['AnnE']
-    valueArguments(ValueParameterDescriptorImpl@3['i']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('AnnE': FqName@10) = null
-    packageFragments('MyEnum': FqName@11) = null
-    packageFragments('Test': FqName@12) = null
-    packageFragments('Test2': FqName@13) = null
-    packageFragments('e': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.AnnE': FqName@19) = null
-    packageFragments('java.lang.MyEnum': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.AnnE': FqName@22) = null
-    packageFragments('kotlin.MyEnum': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('e': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Test': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('Test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('e': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Test': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
deleted file mode 100644
index 15e3f58b133..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
+++ /dev/null
@@ -1,235 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['Ann']
-    valueArguments(ValueParameterDescriptorImpl@3['i']) = ArrayValue@4
-}
-
-LazyJavaClassDescriptor@5['Test'] {
-    <name not found> = IntValue@6 // through LazyJavaClassMemberScope@7
-    <name not found> = IntValue@8 // through LazyJavaStaticClassScope@9
-    <name not found> = IntValue@10 // through LazyJavaStaticClassScope@9
-    <name not found> = null // through LazyJavaStaticClassScope@9
-    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@13['Test']
-    enumEntryIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@7
-    functionTypeForSamInterface = null
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaStaticClassScope@9
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@7
-    nestedClasses('i1': Name@18) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i2': Name@19) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i3': Name@20) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i4': Name@21) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i5': Name@22) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i6': Name@23) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('i7': Name@24) = null // through LazyJavaClassMemberScope@7
-    properties('i1': Name@18) = ArrayList@25[1] { JavaPropertyDescriptor@26['i1'] } // through LazyJavaStaticClassScope@9
-    properties('i1': Name@18) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i2': Name@19) = ArrayList@28[1] { JavaPropertyDescriptor@29['i2'] } // through LazyJavaStaticClassScope@9
-    properties('i2': Name@19) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i3': Name@20) = ArrayList@30[1] { JavaPropertyDescriptor@31['i3'] } // through LazyJavaStaticClassScope@9
-    properties('i3': Name@20) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i4': Name@21) = ArrayList@32[1] { JavaPropertyDescriptor@33['i4'] } // through LazyJavaStaticClassScope@9
-    properties('i4': Name@21) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i5': Name@22) = ArrayList@34[1] { JavaPropertyDescriptor@35['i5'] } // through LazyJavaStaticClassScope@9
-    properties('i5': Name@22) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i6': Name@23) = ArrayList@36[1] { JavaPropertyDescriptor@37['i6'] } // through LazyJavaStaticClassScope@9
-    properties('i6': Name@23) = EmptyList@27[empty] // through LazyJavaClassMemberScope@7
-    properties('i7': Name@24) = ArrayList@38[1] { JavaPropertyDescriptor@39['i7'] } // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@40['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@41['Test']
-}
-
-LazyJavaClassTypeConstructor@41['Test'] {
-    parameters = ArrayList@42[empty]
-    supertypes = ArrayList@43[1] { JetTypeImpl@44['Any'] }
-}
-
-LazyJavaClassifierType@45['Object'] {
-    classifier = JavaClassImpl@46['Object']
-    typeConstructor = DeserializedClassTypeConstructor@47
-}
-
-LazyJavaPackageFragmentProvider@48 {
-    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('A': FqName@51) = null
-    packageFragments('Ann': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('Test': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Ann': FqName@59) = null
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.Test': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.Ann': FqName@63) = null
-    packageFragments('kotlin.Int': FqName@64) = null
-    packageFragments('kotlin.Test': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['Test']) = LazyJavaClassDescriptor@5['Test']
-}
-
-LazyJavaPackageFragment@50['<root>'] {
-    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Test': Name@71) = LazyJavaClassDescriptor@5['Test'] // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Test': Name@73) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Test': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Test': Name@73) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
deleted file mode 100644
index 3608640f21f..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
+++ /dev/null
@@ -1,145 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['Ann']
-    valueArguments(ValueParameterDescriptorImpl@7['i']) = ArrayValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Ann': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('Test': FqName@14) = null
-    packageFragments('i1': FqName@15) = null
-    packageFragments('i2': FqName@16) = null
-    packageFragments('i3': FqName@17) = null
-    packageFragments('i4': FqName@18) = null
-    packageFragments('i5': FqName@19) = null
-    packageFragments('i6': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.Ann': FqName@25) = null
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Ann': FqName@28) = null
-    packageFragments('kotlin.Int': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i1': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i3': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i4': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i5': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i6': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('i1': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('i2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('i3': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('i4': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('i5': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('i6': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
deleted file mode 100644
index 7769da432dd..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DoubleValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['String']
-    <name not found> = StringValue@4
-    <name not found> = StringValue@5
-    <name not found> = StringValue@6
-    <name not found> = StringValue@7
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['Ann']
-    valueArguments(ValueParameterDescriptorImpl@11['i']) = ArrayValue@12
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Ann': FqName@16) = null
-    packageFragments('String': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Ann': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.Ann': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-    packageFragments('topLevel': FqName@29) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('topLevel': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('topLevel': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.lazy.log b/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.lazy.log
deleted file mode 100644
index b10b50fc2a3..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/invalidTypesInAnnotationConstructor.lazy.log
+++ /dev/null
@@ -1,230 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassDescriptor@4['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@6['RetentionPolicy'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['RetentionPolicy']
-}
-
-LazyJavaClassDescriptor@8['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaClassDescriptor@10['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Type']
-}
-
-LazyJavaClassTypeConstructor@3['Class'] {
-    parameters = ArrayList@12[1] { LazyJavaTypeParameterDescriptor@13['T'] }
-    supertypes = ArrayList@14[4] { LazyJavaClassifierType@15['Serializable'], LazyJavaClassifierType@16['GenericDeclaration'], LazyJavaClassifierType@17['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@7['RetentionPolicy'] {
-    parameters = ArrayList@18[empty]
-}
-
-LazyJavaClassTypeConstructor@9['Serializable'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassifierType@22['AnnotatedElement'] {
-    classifier = JavaClassImpl@23['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassifierType@16['GenericDeclaration'] {
-    classifier = JavaClassImpl@24['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@5['GenericDeclaration']
-}
-
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@28['Object'] {
-    classifier = JavaClassImpl@29['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@15['Serializable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaClassifierType@17['Type'] {
-    classifier = JavaClassImpl@32['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Type']
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('Ann1': FqName@36) = null
-    packageFragments('Array': FqName@37) = null
-    packageFragments('Boolean': FqName@38) = null
-    packageFragments('BooleanArray': FqName@39) = null
-    packageFragments('Byte': FqName@40) = null
-    packageFragments('ByteArray': FqName@41) = null
-    packageFragments('Char': FqName@42) = null
-    packageFragments('CharArray': FqName@43) = null
-    packageFragments('Class': FqName@44) = null
-    packageFragments('Double': FqName@45) = null
-    packageFragments('DoubleArray': FqName@46) = null
-    packageFragments('Float': FqName@47) = null
-    packageFragments('FloatArray': FqName@48) = null
-    packageFragments('Int': FqName@49) = null
-    packageFragments('IntArray': FqName@50) = null
-    packageFragments('Long': FqName@51) = null
-    packageFragments('LongArray': FqName@52) = null
-    packageFragments('MyClass': FqName@53) = null
-    packageFragments('MyEnum': FqName@54) = null
-    packageFragments('RetentionPolicy': FqName@55) = null
-    packageFragments('Short': FqName@56) = null
-    packageFragments('ShortArray': FqName@57) = null
-    packageFragments('String': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.io': FqName@61) = LazyJavaPackageFragment@62['io']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Ann1': FqName@65) = null
-    packageFragments('java.lang.Array': FqName@66) = null
-    packageFragments('java.lang.Boolean': FqName@67) = null
-    packageFragments('java.lang.BooleanArray': FqName@68) = null
-    packageFragments('java.lang.Byte': FqName@69) = null
-    packageFragments('java.lang.ByteArray': FqName@70) = null
-    packageFragments('java.lang.Char': FqName@71) = null
-    packageFragments('java.lang.CharArray': FqName@72) = null
-    packageFragments('java.lang.Class': FqName@73) = null
-    packageFragments('java.lang.Double': FqName@74) = null
-    packageFragments('java.lang.DoubleArray': FqName@75) = null
-    packageFragments('java.lang.Float': FqName@76) = null
-    packageFragments('java.lang.FloatArray': FqName@77) = null
-    packageFragments('java.lang.Int': FqName@78) = null
-    packageFragments('java.lang.IntArray': FqName@79) = null
-    packageFragments('java.lang.Long': FqName@80) = null
-    packageFragments('java.lang.LongArray': FqName@81) = null
-    packageFragments('java.lang.MyClass': FqName@82) = null
-    packageFragments('java.lang.MyEnum': FqName@83) = null
-    packageFragments('java.lang.RetentionPolicy': FqName@84) = null
-    packageFragments('java.lang.Short': FqName@85) = null
-    packageFragments('java.lang.ShortArray': FqName@86) = null
-    packageFragments('java.lang.String': FqName@87) = null
-    packageFragments('java.lang.annotation': FqName@88) = LazyJavaPackageFragment@89['annotation']
-    packageFragments('java.lang.annotation.RetentionPolicy': FqName@90) = null
-    packageFragments('java.lang.reflect': FqName@91) = LazyJavaPackageFragment@92['reflect']
-    packageFragments('kotlin': FqName@93) = null
-    packageFragments('kotlin.Ann1': FqName@94) = null
-    packageFragments('kotlin.Array': FqName@95) = null
-    packageFragments('kotlin.Boolean': FqName@96) = null
-    packageFragments('kotlin.BooleanArray': FqName@97) = null
-    packageFragments('kotlin.Byte': FqName@98) = null
-    packageFragments('kotlin.ByteArray': FqName@99) = null
-    packageFragments('kotlin.Char': FqName@100) = null
-    packageFragments('kotlin.CharArray': FqName@101) = null
-    packageFragments('kotlin.Class': FqName@102) = null
-    packageFragments('kotlin.Double': FqName@103) = null
-    packageFragments('kotlin.DoubleArray': FqName@104) = null
-    packageFragments('kotlin.Float': FqName@105) = null
-    packageFragments('kotlin.FloatArray': FqName@106) = null
-    packageFragments('kotlin.Int': FqName@107) = null
-    packageFragments('kotlin.IntArray': FqName@108) = null
-    packageFragments('kotlin.Long': FqName@109) = null
-    packageFragments('kotlin.LongArray': FqName@110) = null
-    packageFragments('kotlin.MyClass': FqName@111) = null
-    packageFragments('kotlin.MyEnum': FqName@112) = null
-    packageFragments('kotlin.RetentionPolicy': FqName@113) = null
-    packageFragments('kotlin.Short': FqName@114) = null
-    packageFragments('kotlin.ShortArray': FqName@115) = null
-    packageFragments('kotlin.String': FqName@116) = null
-    packageFragments('kotlin.io': FqName@117) = null
-    packageFragments('kotlin.jvm': FqName@118) = null
-    packageFragments('test': FqName@119) = null
-    packageFragments('test.Ann1': FqName@120) = null
-    packageFragments('test.Ann2': FqName@121) = null
-    packageFragments('test.Ann3': FqName@122) = null
-    packageFragments('test.Ann4': FqName@123) = null
-    packageFragments('test.Ann5': FqName@124) = null
-    packageFragments('test.Ann6': FqName@125) = null
-    packageFragments('test.Ann7': FqName@126) = null
-    packageFragments('test.Ann8': FqName@127) = null
-    packageFragments('test.Ann9': FqName@128) = null
-    packageFragments('test.Array': FqName@129) = null
-    packageFragments('test.Boolean': FqName@130) = null
-    packageFragments('test.BooleanArray': FqName@131) = null
-    packageFragments('test.Byte': FqName@132) = null
-    packageFragments('test.ByteArray': FqName@133) = null
-    packageFragments('test.Char': FqName@134) = null
-    packageFragments('test.CharArray': FqName@135) = null
-    packageFragments('test.Class': FqName@136) = null
-    packageFragments('test.Double': FqName@137) = null
-    packageFragments('test.DoubleArray': FqName@138) = null
-    packageFragments('test.Float': FqName@139) = null
-    packageFragments('test.FloatArray': FqName@140) = null
-    packageFragments('test.InAnn1': FqName@141) = null
-    packageFragments('test.InAnn10': FqName@142) = null
-    packageFragments('test.InAnn11': FqName@143) = null
-    packageFragments('test.InAnn12': FqName@144) = null
-    packageFragments('test.InAnn4': FqName@145) = null
-    packageFragments('test.InAnn6': FqName@146) = null
-    packageFragments('test.InAnn7': FqName@147) = null
-    packageFragments('test.InAnn8': FqName@148) = null
-    packageFragments('test.InAnn9': FqName@149) = null
-    packageFragments('test.Int': FqName@150) = null
-    packageFragments('test.IntArray': FqName@151) = null
-    packageFragments('test.Long': FqName@152) = null
-    packageFragments('test.LongArray': FqName@153) = null
-    packageFragments('test.MyClass': FqName@154) = null
-    packageFragments('test.MyEnum': FqName@155) = null
-    packageFragments('test.RetentionPolicy': FqName@156) = null
-    packageFragments('test.Short': FqName@157) = null
-    packageFragments('test.ShortArray': FqName@158) = null
-    packageFragments('test.String': FqName@159) = null
-    topLevelClasses(JavaClassImpl@23['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@160['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@24['GenericDeclaration']) = LazyJavaClassDescriptor@4['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@161['RetentionPolicy']) = LazyJavaClassDescriptor@6['RetentionPolicy']
-    topLevelClasses(JavaClassImpl@31['Serializable']) = LazyJavaClassDescriptor@8['Serializable']
-    topLevelClasses(JavaClassImpl@32['Type']) = LazyJavaClassDescriptor@10['Type']
-}
-
-LazyJavaPackageFragment@89['annotation'] {
-    classes('RetentionPolicy': Name@162) = LazyJavaClassDescriptor@6['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('RetentionPolicy': Name@165) = EmptyList@166[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@163
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('lang': Name@170) = EmptyList@166[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@169
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Class': Name@172) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('annotation': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('annotation': Name@175) = EmptyList@166[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@173
-}
-
-LazyJavaTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-    upperBounds = LinkedHashSet@178[1] { NullableType@179 }
-    upperBoundsAsType = NullableType@179
-}
-
-LazyJavaTypeParameterResolver@180 {
-    resolve(JavaTypeParameterImpl@181['T']) = LazyJavaTypeParameterDescriptor@13['T']
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
deleted file mode 100644
index ec0c8f10d8d..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = ErrorTypeImpl@2
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = ErrorTypeImpl@5
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = ErrorTypeImpl@8
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = ErrorTypeImpl@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('Any': FqName@15) = null
-    packageFragments('Hello': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('bar': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Any': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.varargs': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('kotlin.varargs': FqName@31) = null
-    packageFragments('varargs': FqName@32) = null
-    packageFragments('x': FqName@33) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('varargs': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('varargs': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
deleted file mode 100644
index f16611280d1..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
+++ /dev/null
@@ -1,80 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['test']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['test']
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['test']
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['test']
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('Any': FqName@15) = null
-    packageFragments('Hello': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('bar': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Any': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.test': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('kotlin.test': FqName@31) = null
-    packageFragments('test': FqName@32) = null
-    packageFragments('x': FqName@33) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.lazy.log
deleted file mode 100644
index 9dfd75aa868..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/kt1886annotationBody.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Annotation1': FqName@5) = null
-    packageFragments('Annotation10': FqName@6) = null
-    packageFragments('Annotation2': FqName@7) = null
-    packageFragments('Annotation3': FqName@8) = null
-    packageFragments('Annotation4': FqName@9) = null
-    packageFragments('Annotation5': FqName@10) = null
-    packageFragments('Annotation6': FqName@11) = null
-    packageFragments('Annotation7': FqName@12) = null
-    packageFragments('Annotation8': FqName@13) = null
-    packageFragments('Annotation9': FqName@14) = null
-    packageFragments('String': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.lazy.log b/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.lazy.log
deleted file mode 100644
index 999a35cafb6..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/missingValOnParameter.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Ann': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log b/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
deleted file mode 100644
index da728c058b6..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['ann']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('ann': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.ann': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.ann': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log b/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
deleted file mode 100644
index e013ebe9d27..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = ErrorTypeImpl@2
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = ErrorTypeImpl@5
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = ErrorTypeImpl@8
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = ErrorTypeImpl@11
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['ann']
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['ann']
-}
-
-LazyAnnotationDescriptor@18 {
-    resolutionResults = OverloadResolutionResultsImpl@19
-    type = JetTypeImpl@20['ann']
-}
-
-LazyAnnotationDescriptor@21 {
-    resolutionResults = OverloadResolutionResultsImpl@22
-    type = JetTypeImpl@23['ann']
-}
-
-LazyJavaPackageFragmentProvider@24 {
-    packageFragments('<root>': FqName@25) = LazyJavaPackageFragment@26['<root>']
-    packageFragments('A': FqName@27) = null
-    packageFragments('T': FqName@28) = null
-    packageFragments('aaa': FqName@29) = null
-    packageFragments('ann': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.aaa': FqName@35) = null
-    packageFragments('java.lang.ann': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.aaa': FqName@38) = null
-    packageFragments('kotlin.ann': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-}
-
-LazyJavaPackageFragment@26['<root>'] {
-    classes('aaa': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('aaa': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
deleted file mode 100644
index 4698d8a702c..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['ann']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['ann']
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['ann']
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('ann': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.ann': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.ann': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@67[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@68[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
deleted file mode 100644
index 4872cdb2bb4..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['ann']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['ann']
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['ann']
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('ann': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.ann': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.ann': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@67[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-    <name not found> = ArrayList@68[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@69[7] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
deleted file mode 100644
index b660d63478c..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
+++ /dev/null
@@ -1,132 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['ann']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Any': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('P': FqName@11) = null
-    packageFragments('ann': FqName@12) = null
-    packageFragments('data': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.ann': FqName@20) = null
-    packageFragments('java.lang.data': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Any': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.ann': FqName@25) = null
-    packageFragments('kotlin.data': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('P': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('data': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('P': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component1': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('P': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('P': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component1': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component2': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.lazy.log b/compiler/testData/diagnostics/tests/annotations/typeAnnotations.lazy.log
deleted file mode 100644
index 3fa4a94b2f4..00000000000
--- a/compiler/testData/diagnostics/tests/annotations/typeAnnotations.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = ErrorTypeImpl@2
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = ErrorTypeImpl@5
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = ErrorTypeImpl@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('A': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.x': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('kotlin.x': FqName@26) = null
-    packageFragments('x': FqName@27) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('x': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('x': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@37
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
deleted file mode 100644
index 5cf154c38c6..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Flower': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('minusOne': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('minusOne': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[8] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[8] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@46[8] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
-    <name not found> = ArrayList@47[8] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
deleted file mode 100644
index 04c2f93d009..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('CustomGetVal': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('zz': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('zz': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
deleted file mode 100644
index 9ce4da8f324..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('customGetValGlobal': FqName@6) = null
-    packageFragments('customGetValGlobal.zz': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('zz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@28, ResolutionCandidate@29, ResolutionCandidate@30, ... }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
deleted file mode 100644
index 08f09aa42f9..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Raise': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@31[7] { ResolutionCandidate@27, ResolutionCandidate@28, ResolutionCandidate@29, ... }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
deleted file mode 100644
index 9f16f81e5b6..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Raise': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@35[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
deleted file mode 100644
index 7d889cff019..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Cyclic': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('a': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('a': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
deleted file mode 100644
index cc53e728bd1..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('ReadForward': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
deleted file mode 100644
index ef6c3e57982..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('ReadForward': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('b': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('b': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
deleted file mode 100644
index f08e06974ca..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('ReadByAnotherPropertyInitializer': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
deleted file mode 100644
index d4ba8c5590d..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('ReadByAnotherPropertyInitializer': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
deleted file mode 100644
index 6897bbbc526..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('ReadByAnotherPropertyInitializer': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
deleted file mode 100644
index 21dca2bfe52..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('ReadNonexistent': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('aa': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('aa': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
deleted file mode 100644
index 5a857224bfe..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('ReadNonexistent': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('aa': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('aa': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
deleted file mode 100644
index e9b5fbac586..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('ReadNonexistent': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
deleted file mode 100644
index a8704afe9b4..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CustomValNoBackingField': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
deleted file mode 100644
index a8704afe9b4..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CustomValNoBackingField': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
deleted file mode 100644
index d2dead0a066..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('$a': FqName@1) = null
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Cl': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.$a': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.$a': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('$a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('$a': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('$a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('$a': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log b/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
deleted file mode 100644
index b16c70e805c..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-    packageFragments('y': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('y': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('y': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
deleted file mode 100644
index 916df4517f5..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
+++ /dev/null
@@ -1,500 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@4 {
-    <name not found> = JetTypeImpl@5['<no name provided>']
-}
-
-DescriptorResolver@6 {
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = JetTypeImpl@11['Any']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = null
-}
-
-DescriptorResolver@13 {
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = null
-}
-
-DescriptorResolver@15 {
-    <name not found> = JetTypeImpl@16['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('$b': FqName@18) = null
-    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('Int': FqName@21) = null
-    packageFragments('TestBackingFieldsVisibility': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.$b': FqName@27) = null
-    packageFragments('java.lang.Int': FqName@28) = null
-    packageFragments('java.lang.TestBackingFieldsVisibility': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.$b': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.TestBackingFieldsVisibility': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    packageFragments('kt462': FqName@36) = null
-    packageFragments('kt462.$b': FqName@37) = null
-    packageFragments('kt462.Int': FqName@38) = null
-    packageFragments('kt462.T': FqName@39) = null
-    packageFragments('kt462.TestBackingFieldsVisibility': FqName@40) = null
-    packageFragments('kt462.TestInitializationThroughBackingField': FqName@41) = null
-    packageFragments('kt462.TestInitializationWithoutBackingField': FqName@42) = null
-    packageFragments('kt462.topLevelVar': FqName@43) = null
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('$b': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('a': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('abstractVar': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('finalDefaultVar': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('openVar': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('r': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('topLevelVar': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('valWithBackingField': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('valWithoutBackingField': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('varWithCustomSetter': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('varWithoutBackingField': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('w': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('z': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('$b': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-null {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log b/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
deleted file mode 100644
index c477c82819a..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt782': FqName@16) = null
-    packageFragments('kt782.Int': FqName@17) = null
-    packageFragments('kt782.w': FqName@18) = null
-    packageFragments('kt782.x': FqName@19) = null
-    packageFragments('kt782.y': FqName@20) = null
-    packageFragments('kt782.z': FqName@21) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('y': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('z': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log b/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
deleted file mode 100644
index 28e08563771..00000000000
--- a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Bar': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
deleted file mode 100644
index 9c0b57941e7..00000000000
--- a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MutableList<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('MutableCollection': FqName@6) = null
-    packageFragments('MutableList': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.MutableCollection': FqName@14) = null
-    packageFragments('java.lang.MutableList': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.MutableCollection': FqName@19) = null
-    packageFragments('kotlin.MutableList': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('MutableCollection': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('MutableList': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
deleted file mode 100644
index bde9cc5ab79..00000000000
--- a/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MutableList<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('MutableCollection': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.MutableCollection': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.MutableCollection': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MutableCollection': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
deleted file mode 100644
index 949f4685f47..00000000000
--- a/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MutableList<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.MutableList': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.MutableList': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('MutableList': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
deleted file mode 100644
index edb88de5246..00000000000
--- a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MutableList<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log b/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
deleted file mode 100644
index 34313f844ab..00000000000
--- a/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('K': FqName@4) = null
-    packageFragments('Map': FqName@5) = null
-    packageFragments('MutableMap': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('V': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.K': FqName@14) = null
-    packageFragments('java.lang.Map': FqName@15) = null
-    packageFragments('java.lang.MutableMap': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.V': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.K': FqName@21) = null
-    packageFragments('kotlin.Map': FqName@22) = null
-    packageFragments('kotlin.MutableMap': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.V': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log b/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
deleted file mode 100644
index 2908adbd43b..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Array': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Number': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Number': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Number': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Array': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Number': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
deleted file mode 100644
index 3f6a601bd53..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('BaseTwo': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('DerivedWithOne': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('U': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.BaseTwo': FqName@15) = null
-    packageFragments('java.lang.D': FqName@16) = null
-    packageFragments('java.lang.DerivedWithOne': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('java.lang.U': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.BaseTwo': FqName@22) = null
-    packageFragments('kotlin.D': FqName@23) = null
-    packageFragments('kotlin.DerivedWithOne': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.T': FqName@26) = null
-    packageFragments('kotlin.U': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
deleted file mode 100644
index 9883d47845c..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Some': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Base': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Some': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Base': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Some': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
deleted file mode 100644
index 4197d96800e..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('SubBase': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Base': FqName@16) = null
-    packageFragments('java.lang.SubBase': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Base': FqName@22) = null
-    packageFragments('kotlin.SubBase': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
deleted file mode 100644
index 13c8cabf0c7..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('SubBase': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@15) = null
-    packageFragments('java.lang.SubBase': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Base': FqName@20) = null
-    packageFragments('kotlin.SubBase': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
deleted file mode 100644
index d234f4008c3..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('SubBase': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@15) = null
-    packageFragments('java.lang.SubBase': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Base': FqName@20) = null
-    packageFragments('kotlin.SubBase': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
deleted file mode 100644
index 8b6b90f394b..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('BaseImpl': FqName@7) = null
-    packageFragments('BaseSuper': FqName@8) = null
-    packageFragments('D': FqName@9) = null
-    packageFragments('DerivedSuper': FqName@10) = null
-    packageFragments('S': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.BaseImpl': FqName@18) = null
-    packageFragments('java.lang.BaseSuper': FqName@19) = null
-    packageFragments('java.lang.D': FqName@20) = null
-    packageFragments('java.lang.DerivedSuper': FqName@21) = null
-    packageFragments('java.lang.S': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.B': FqName@25) = null
-    packageFragments('kotlin.BaseImpl': FqName@26) = null
-    packageFragments('kotlin.BaseSuper': FqName@27) = null
-    packageFragments('kotlin.D': FqName@28) = null
-    packageFragments('kotlin.DerivedSuper': FqName@29) = null
-    packageFragments('kotlin.S': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
deleted file mode 100644
index 89973505b9d..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('BaseMulti': FqName@6) = null
-    packageFragments('D': FqName@7) = null
-    packageFragments('SomeMultiDerived': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.BaseMulti': FqName@15) = null
-    packageFragments('java.lang.D': FqName@16) = null
-    packageFragments('java.lang.SomeMultiDerived': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.BaseMulti': FqName@21) = null
-    packageFragments('kotlin.D': FqName@22) = null
-    packageFragments('kotlin.SomeMultiDerived': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
deleted file mode 100644
index e74b8d47f2b..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Base': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Some': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.Some': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.Some': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
deleted file mode 100644
index cae14bac454..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('Number': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.Number': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.Number': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Number': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
deleted file mode 100644
index 3eb6b4100ab..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CharSequence': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.CharSequence': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.CharSequence': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
deleted file mode 100644
index 832b63297a8..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('Number': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.Number': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.List': FqName@17) = null
-    packageFragments('kotlin.Number': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('List': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Number': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
deleted file mode 100644
index 6c0475593bb..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('MutableCollection': FqName@7) = null
-    packageFragments('MutableList': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.MutableCollection': FqName@15) = null
-    packageFragments('java.lang.MutableList': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.MutableCollection': FqName@20) = null
-    packageFragments('kotlin.MutableList': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MutableCollection': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('MutableList': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
deleted file mode 100644
index 4a3dbc464a4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('MutableCollection': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.MutableCollection': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.MutableCollection': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MutableCollection': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
deleted file mode 100644
index 04075020329..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('MutableCollection': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.MutableCollection': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.MutableCollection': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MutableCollection': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
deleted file mode 100644
index 3eb6b4100ab..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CharSequence': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.CharSequence': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.CharSequence': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
deleted file mode 100644
index 6e30a1bb9d8..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('SubBase': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Base': FqName@16) = null
-    packageFragments('java.lang.SubBase': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Base': FqName@22) = null
-    packageFragments('kotlin.SubBase': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
deleted file mode 100644
index 36ce13671f4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Base': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
deleted file mode 100644
index d7a93601579..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
deleted file mode 100644
index 3eb6b4100ab..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CharSequence': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.CharSequence': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.CharSequence': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
deleted file mode 100644
index 3da706600c9..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('MutableList': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.MutableList': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.MutableList': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
deleted file mode 100644
index 832b63297a8..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('Number': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.Number': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.List': FqName@17) = null
-    packageFragments('kotlin.Number': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('List': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Number': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
deleted file mode 100644
index 33a67e0187d..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('D': FqName@8) = null
-    packageFragments('Derived': FqName@9) = null
-    packageFragments('S': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.Base': FqName@17) = null
-    packageFragments('java.lang.D': FqName@18) = null
-    packageFragments('java.lang.Derived': FqName@19) = null
-    packageFragments('java.lang.S': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.Base': FqName@24) = null
-    packageFragments('kotlin.D': FqName@25) = null
-    packageFragments('kotlin.Derived': FqName@26) = null
-    packageFragments('kotlin.S': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@44 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
deleted file mode 100644
index 0293108bcea..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Base': FqName@7) = null
-    packageFragments('D': FqName@8) = null
-    packageFragments('Derived': FqName@9) = null
-    packageFragments('S': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.Base': FqName@17) = null
-    packageFragments('java.lang.D': FqName@18) = null
-    packageFragments('java.lang.Derived': FqName@19) = null
-    packageFragments('java.lang.S': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.Base': FqName@24) = null
-    packageFragments('kotlin.D': FqName@25) = null
-    packageFragments('kotlin.Derived': FqName@26) = null
-    packageFragments('kotlin.S': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
deleted file mode 100644
index a7d4d6dd19e..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
deleted file mode 100644
index eb5dc1207c3..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
deleted file mode 100644
index 5eaf3e5ecfe..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.MutableList': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.MutableList': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('MutableList': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
deleted file mode 100644
index ee107b9473c..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.T': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
deleted file mode 100644
index 681523f3ff0..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('UnresolvedType': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.UnresolvedType': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.UnresolvedType': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('UnresolvedType': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('UnresolvedType': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log b/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
deleted file mode 100644
index 66d3a7ee1c2..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
+++ /dev/null
@@ -1,67 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('RecA': FqName@5) = null
-    packageFragments('RecB': FqName@6) = null
-    packageFragments('SelfR': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.RecA': FqName@14) = null
-    packageFragments('java.lang.RecB': FqName@15) = null
-    packageFragments('java.lang.SelfR': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.RecA': FqName@20) = null
-    packageFragments('kotlin.RecB': FqName@21) = null
-    packageFragments('kotlin.SelfR': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log b/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
deleted file mode 100644
index ea0a5f9b685..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Array': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Array': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log b/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
deleted file mode 100644
index 8e1f527490c..00000000000
--- a/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Aaa': FqName@5) = null
-    packageFragments('Bbb': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Aaa': FqName@11) = null
-    packageFragments('java.lang.Bbb': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Aaa': FqName@14) = null
-    packageFragments('kotlin.Bbb': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
deleted file mode 100644
index f50412dfbd7..00000000000
--- a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.MutableList': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.MutableList': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('MutableList': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
deleted file mode 100644
index e2a64cfca27..00000000000
--- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
+++ /dev/null
@@ -1,115 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['List<1>']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('Nothing': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.List': FqName@15) = null
-    packageFragments('java.lang.Nothing': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.List': FqName@20) = null
-    packageFragments('kotlin.Nothing': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('List': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Nothing': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('List': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('List': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('List': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
deleted file mode 100644
index 2f19d50b457..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('G': FqName@4) = null
-    packageFragments('Tr': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.G': FqName@15) = null
-    packageFragments('kotlin.Tr': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
deleted file mode 100644
index c7c04f66bd8..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.G': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
deleted file mode 100644
index 23e1556a390..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Tr': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.Tr': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.Tr': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
deleted file mode 100644
index 656aa9ffe5c..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Either': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Left': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('Right': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C1': FqName@20) = null
-    packageFragments('java.lang.C2': FqName@21) = null
-    packageFragments('java.lang.Either': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Left': FqName@24) = null
-    packageFragments('java.lang.Nothing': FqName@25) = null
-    packageFragments('java.lang.Right': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.B': FqName@30) = null
-    packageFragments('kotlin.C1': FqName@31) = null
-    packageFragments('kotlin.C2': FqName@32) = null
-    packageFragments('kotlin.Either': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Left': FqName@35) = null
-    packageFragments('kotlin.Nothing': FqName@36) = null
-    packageFragments('kotlin.Right': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@52 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
deleted file mode 100644
index 324a35f52f4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Either': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Left': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('Right': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C1': FqName@20) = null
-    packageFragments('java.lang.C2': FqName@21) = null
-    packageFragments('java.lang.Either': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Left': FqName@24) = null
-    packageFragments('java.lang.Nothing': FqName@25) = null
-    packageFragments('java.lang.Right': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.B': FqName@30) = null
-    packageFragments('kotlin.C1': FqName@31) = null
-    packageFragments('kotlin.C2': FqName@32) = null
-    packageFragments('kotlin.Either': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Left': FqName@35) = null
-    packageFragments('kotlin.Nothing': FqName@36) = null
-    packageFragments('kotlin.Right': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@58 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
deleted file mode 100644
index 6efdd26fd6c..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Either': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Left': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('Right': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C1': FqName@20) = null
-    packageFragments('java.lang.C2': FqName@21) = null
-    packageFragments('java.lang.Either': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Left': FqName@24) = null
-    packageFragments('java.lang.Nothing': FqName@25) = null
-    packageFragments('java.lang.Right': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.B': FqName@30) = null
-    packageFragments('kotlin.C1': FqName@31) = null
-    packageFragments('kotlin.C2': FqName@32) = null
-    packageFragments('kotlin.Either': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Left': FqName@35) = null
-    packageFragments('kotlin.Nothing': FqName@36) = null
-    packageFragments('kotlin.Right': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@70 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
deleted file mode 100644
index 93579520aac..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Either': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Left': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('Right': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C1': FqName@20) = null
-    packageFragments('java.lang.C2': FqName@21) = null
-    packageFragments('java.lang.Either': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Left': FqName@24) = null
-    packageFragments('java.lang.Nothing': FqName@25) = null
-    packageFragments('java.lang.Right': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.B': FqName@30) = null
-    packageFragments('kotlin.C1': FqName@31) = null
-    packageFragments('kotlin.C2': FqName@32) = null
-    packageFragments('kotlin.Either': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Left': FqName@35) = null
-    packageFragments('kotlin.Nothing': FqName@36) = null
-    packageFragments('kotlin.Right': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
deleted file mode 100644
index 77999e2c7e4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Either': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Left': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('Right': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.C1': FqName@20) = null
-    packageFragments('java.lang.C2': FqName@21) = null
-    packageFragments('java.lang.Either': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Left': FqName@24) = null
-    packageFragments('java.lang.Nothing': FqName@25) = null
-    packageFragments('java.lang.Right': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.B': FqName@30) = null
-    packageFragments('kotlin.C1': FqName@31) = null
-    packageFragments('kotlin.C2': FqName@32) = null
-    packageFragments('kotlin.Either': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Left': FqName@35) = null
-    packageFragments('kotlin.Nothing': FqName@36) = null
-    packageFragments('kotlin.Right': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@67 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
deleted file mode 100644
index 0a9835e8977..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('G': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Foo': FqName@14) = null
-    packageFragments('java.lang.G': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Foo': FqName@20) = null
-    packageFragments('kotlin.G': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
deleted file mode 100644
index 0f3d89b1e0f..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('P': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.P': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.P': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('P': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('P': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
deleted file mode 100644
index ad1e95417f6..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.G': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
deleted file mode 100644
index 3868f17cdb4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Tr': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.Tr': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.Tr': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
deleted file mode 100644
index c9af5fd9cf1..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.G': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
deleted file mode 100644
index 29c3a56b87e..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Tr': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.Tr': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.Tr': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
deleted file mode 100644
index 80a9a1b28df..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('G': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.G': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.G': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
deleted file mode 100644
index 8c3137cde75..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('G': FqName@4) = null
-    packageFragments('P': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.P': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.G': FqName@15) = null
-    packageFragments('kotlin.P': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('G': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('G': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
deleted file mode 100644
index bcfc1a7e752..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Tr': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.Tr': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.Tr': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
deleted file mode 100644
index c695fb02ec1..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('G': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.G': FqName@14) = null
-    packageFragments('kotlin.Tr': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
deleted file mode 100644
index ffc4ff3396a..00000000000
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('G': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.G': FqName@14) = null
-    packageFragments('kotlin.Tr': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/constants.lazy.log b/compiler/testData/diagnostics/tests/cast/constants.lazy.log
deleted file mode 100644
index 5e0d0341494..00000000000
--- a/compiler/testData/diagnostics/tests/cast/constants.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Byte': FqName@3) = null
-    packageFragments('Char': FqName@4) = null
-    packageFragments('Double': FqName@5) = null
-    packageFragments('Float': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('Short': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Byte': FqName@14) = null
-    packageFragments('java.lang.Char': FqName@15) = null
-    packageFragments('java.lang.Double': FqName@16) = null
-    packageFragments('java.lang.Float': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Long': FqName@19) = null
-    packageFragments('java.lang.Short': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Byte': FqName@22) = null
-    packageFragments('kotlin.Char': FqName@23) = null
-    packageFragments('kotlin.Double': FqName@24) = null
-    packageFragments('kotlin.Float': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.Long': FqName@27) = null
-    packageFragments('kotlin.Short': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Byte': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Char': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Double': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Float': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Long': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Short': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
deleted file mode 100644
index b32953adcb6..00000000000
--- a/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('G': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.G': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.G': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
deleted file mode 100644
index 4a1fcce5546..00000000000
--- a/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('G': FqName@5) = null
-    packageFragments('Q': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Q': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.G': FqName@14) = null
-    packageFragments('kotlin.Q': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log b/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
deleted file mode 100644
index ffc4ff3396a..00000000000
--- a/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('G': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.G': FqName@14) = null
-    packageFragments('kotlin.Tr': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/kt614.lazy.log b/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
deleted file mode 100644
index 4e1103f365a..00000000000
--- a/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Collection': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Collection': FqName@11) = null
-    packageFragments('java.lang.List': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Collection': FqName@14) = null
-    packageFragments('kotlin.List': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Collection': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('List': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
deleted file mode 100644
index dae3e7a1dc4..00000000000
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
deleted file mode 100644
index 98f9484225d..00000000000
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
+++ /dev/null
@@ -1,230 +0,0 @@
-LazyJavaClassDescriptor@0['CharSequence'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@1['CharSequence']
-}
-
-LazyJavaClassDescriptor@2['Integer'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Integer']
-}
-
-LazyJavaClassDescriptor@4['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['Serializable']
-}
-
-LazyJavaClassDescriptor@6['String'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['String']
-}
-
-LazyJavaClassTypeConstructor@1['CharSequence'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { JetTypeImpl@10['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3['Integer'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[2] { LazyJavaClassifierType@13['Number'], LazyJavaClassifierType@14['Comparable<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@5['Serializable'] {
-    supertypes = ArrayList@15[1] { JetTypeImpl@10['Any'] }
-}
-
-LazyJavaClassTypeConstructor@7['String'] {
-    parameters = ArrayList@16[empty]
-    supertypes = ArrayList@17[3] { LazyJavaClassifierType@18['Serializable'], LazyJavaClassifierType@19['Comparable<String>'], LazyJavaClassifierType@20['CharSequence'] }
-}
-
-LazyJavaClassifierType@20['CharSequence'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@14['Comparable<Integer>'] {
-    classifier = JavaClassImpl@24['Comparable']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@19['Comparable<String>'] {
-    classifier = JavaClassImpl@26['Comparable']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@13['Number'] {
-    classifier = JavaClassImpl@27['Number']
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['Object'] {
-    classifier = JavaClassImpl@30['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@34['Object'] {
-    classifier = JavaClassImpl@35['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@18['Serializable'] {
-    classifier = JavaClassImpl@36['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@5['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('CharSequence': FqName@40) = null
-    packageFragments('Int': FqName@41) = null
-    packageFragments('JCS': FqName@42) = null
-    packageFragments('JString': FqName@43) = null
-    packageFragments('String': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.io': FqName@47) = LazyJavaPackageFragment@48['io']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.CharSequence': FqName@51) = null
-    packageFragments('java.lang.Int': FqName@52) = null
-    packageFragments('java.lang.Integer': FqName@53) = null
-    packageFragments('java.lang.JCS': FqName@54) = null
-    packageFragments('java.lang.JString': FqName@55) = null
-    packageFragments('java.lang.String': FqName@56) = null
-    packageFragments('kotlin': FqName@57) = null
-    packageFragments('kotlin.CharSequence': FqName@58) = null
-    packageFragments('kotlin.Int': FqName@59) = null
-    packageFragments('kotlin.JCS': FqName@60) = null
-    packageFragments('kotlin.JString': FqName@61) = null
-    packageFragments('kotlin.String': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['CharSequence']) = LazyJavaClassDescriptor@0['CharSequence']
-    topLevelClasses(JavaClassImpl@66['Integer']) = LazyJavaClassDescriptor@2['Integer']
-    topLevelClasses(JavaClassImpl@36['Serializable']) = LazyJavaClassDescriptor@4['Serializable']
-    topLevelClasses(JavaClassImpl@67['String']) = LazyJavaClassDescriptor@6['String']
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('CharSequence': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('JCS': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('JString': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('java': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('java': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    classes('CharSequence': Name@83) = LazyJavaClassDescriptor@0['CharSequence'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Integer': Name@85) = LazyJavaClassDescriptor@2['Integer'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@86) = LazyJavaClassDescriptor@6['String'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('java': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('CharSequence': Name@88) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('String': Name@89) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-null {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@96 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
deleted file mode 100644
index e1d22d3f1aa..00000000000
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-LazyJavaClassDescriptor@0['CharSequence'] {
-    allDescriptors = ArrayList@1[6] { JavaMethodDescriptor@2['length'], DeserializedSimpleFunctionDescriptor@3['hashCode'], JavaMethodDescriptor@4['subSequence'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['CharSequence']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = null
-    functions('charAt': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['charAt'] } // through LazyJavaClassMemberScope@5
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@3['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('length': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@2['length'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('subSequence': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@4['subSequence'] } // through LazyJavaClassMemberScope@5
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@30) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['CharSequence']
-}
-
-LazyJavaClassTypeConstructor@34['CharSequence'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassifierType@38['CharSequence'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['CharSequence']
-    nullable = 'false': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['CharSequence'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['CharSequence']
-    nullable = 'true': Boolean@45
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@46['Object'] {
-    classifier = JavaClassImpl@47['Object']
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('CharSequence': FqName@52) = null
-    packageFragments('JCS': FqName@53) = null
-    packageFragments('JSub': FqName@54) = null
-    packageFragments('Sub': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.CharSequence': FqName@60) = null
-    packageFragments('java.lang.JCS': FqName@61) = null
-    packageFragments('java.lang.JSub': FqName@62) = null
-    packageFragments('java.lang.Sub': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.CharSequence': FqName@65) = null
-    packageFragments('kotlin.JCS': FqName@66) = null
-    packageFragments('kotlin.JSub': FqName@67) = null
-    packageFragments('kotlin.Sub': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['CharSequence']) = LazyJavaClassDescriptor@0['CharSequence']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('CharSequence': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('JCS': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('java': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('java': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('CharSequence': Name@83) = LazyJavaClassDescriptor@0['CharSequence'] // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('CharSequence': Name@85) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@101 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
deleted file mode 100644
index e50c3d5ebc0..00000000000
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('FC1': FqName@3) = null
-    packageFragments('OC1': FqName@4) = null
-    packageFragments('OC2': FqName@5) = null
-    packageFragments('T1': FqName@6) = null
-    packageFragments('T2': FqName@7) = null
-    packageFragments('T3': FqName@8) = null
-    packageFragments('T4': FqName@9) = null
-    packageFragments('T5': FqName@10) = null
-    packageFragments('TP1': FqName@11) = null
-    packageFragments('TP2': FqName@12) = null
-    packageFragments('TP3': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.FC1': FqName@18) = null
-    packageFragments('java.lang.OC1': FqName@19) = null
-    packageFragments('java.lang.OC2': FqName@20) = null
-    packageFragments('java.lang.T1': FqName@21) = null
-    packageFragments('java.lang.T2': FqName@22) = null
-    packageFragments('java.lang.T3': FqName@23) = null
-    packageFragments('java.lang.T4': FqName@24) = null
-    packageFragments('java.lang.T5': FqName@25) = null
-    packageFragments('java.lang.TP1': FqName@26) = null
-    packageFragments('java.lang.TP2': FqName@27) = null
-    packageFragments('java.lang.TP3': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.FC1': FqName@30) = null
-    packageFragments('kotlin.OC1': FqName@31) = null
-    packageFragments('kotlin.OC2': FqName@32) = null
-    packageFragments('kotlin.T1': FqName@33) = null
-    packageFragments('kotlin.T2': FqName@34) = null
-    packageFragments('kotlin.T3': FqName@35) = null
-    packageFragments('kotlin.T4': FqName@36) = null
-    packageFragments('kotlin.T5': FqName@37) = null
-    packageFragments('kotlin.TP1': FqName@38) = null
-    packageFragments('kotlin.TP2': FqName@39) = null
-    packageFragments('kotlin.TP3': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-null {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@66 }
-}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
deleted file mode 100644
index 5ce0b64cd93..00000000000
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
+++ /dev/null
@@ -1,122 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('FClass1': FqName@3) = null
-    packageFragments('FClass2': FqName@4) = null
-    packageFragments('OClass1': FqName@5) = null
-    packageFragments('OClass2': FqName@6) = null
-    packageFragments('TP1': FqName@7) = null
-    packageFragments('TP2': FqName@8) = null
-    packageFragments('Trait1': FqName@9) = null
-    packageFragments('Trait2': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.FClass1': FqName@15) = null
-    packageFragments('java.lang.FClass2': FqName@16) = null
-    packageFragments('java.lang.OClass1': FqName@17) = null
-    packageFragments('java.lang.OClass2': FqName@18) = null
-    packageFragments('java.lang.TP1': FqName@19) = null
-    packageFragments('java.lang.TP2': FqName@20) = null
-    packageFragments('java.lang.Trait1': FqName@21) = null
-    packageFragments('java.lang.Trait2': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.FClass1': FqName@24) = null
-    packageFragments('kotlin.FClass2': FqName@25) = null
-    packageFragments('kotlin.OClass1': FqName@26) = null
-    packageFragments('kotlin.OClass2': FqName@27) = null
-    packageFragments('kotlin.TP1': FqName@28) = null
-    packageFragments('kotlin.TP2': FqName@29) = null
-    packageFragments('kotlin.Trait1': FqName@30) = null
-    packageFragments('kotlin.Trait2': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
-}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
deleted file mode 100644
index bb2d13e17a1..00000000000
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
+++ /dev/null
@@ -1,1992 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaClassDescriptor@2['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@3['AbstractStringBuilder']
-    functions('append': Name@4) = ArrayList@5[13] { JavaMethodDescriptor@6['append'], JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], ... } // through LazyJavaClassMemberScope@9
-    functions('toString': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['toString'] } // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@16['Appendable'] {
-    defaultType = JetTypeImpl@17['Appendable']
-    functions('append': Name@18) = ArrayList@19[3] { JavaMethodDescriptor@20['append'], JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'] } // through LazyJavaClassMemberScope@23
-    functions('toString': Name@24) = ArrayList@25[1] { DeserializedSimpleFunctionDescriptor@26['toString'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassDescriptor@30['Serializable'] {
-    defaultType = JetTypeImpl@31['Serializable']
-    functions('append': Name@4) = EmptyList@32[empty] // through LazyJavaClassMemberScope@33
-    functions('toString': Name@10) = ArrayList@34[1] { DeserializedSimpleFunctionDescriptor@35['toString'] } // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
-}
-
-LazyJavaClassDescriptor@38['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
-}
-
-LazyJavaClassDescriptor@40['StringBuilder'] {
-    constructors = ArrayList@41[4] { JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], ... } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@46['StringBuilder']
-    enumEntryIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@45
-    functionTypeForSamInterface = null
-    functions('append': Name@48) = ArrayList@49[14] { JavaMethodDescriptor@50['append'], JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], ... } // through LazyJavaClassMemberScope@45
-    functions('toString': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['toString'] } // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@45
-    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@45
-    nestedClasses('append': Name@48) = null // through LazyJavaClassMemberScope@45
-    nestedClasses('toString': Name@53) = null // through LazyJavaClassMemberScope@45
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@15['AbstractStringBuilder'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[2] { LazyJavaClassifierType@62['Appendable'], LazyJavaClassifierType@63['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@29['Appendable'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { JetTypeImpl@66['Any'] }
-}
-
-LazyJavaClassTypeConstructor@37['Serializable'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { JetTypeImpl@66['Any'] }
-}
-
-LazyJavaClassTypeConstructor@39['StringBuffer'] {
-    parameters = ArrayList@69[empty]
-    supertypes = ArrayList@70[3] { LazyJavaClassifierType@71['AbstractStringBuilder'], LazyJavaClassifierType@72['Serializable'], LazyJavaClassifierType@73['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@59['StringBuilder'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[3] { LazyJavaClassifierType@76['AbstractStringBuilder'], LazyJavaClassifierType@77['Serializable'], LazyJavaClassifierType@78['CharSequence'] }
-}
-
-LazyJavaClassifierType@76['AbstractStringBuilder'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@81['AbstractStringBuilder'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@83['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@85['AbstractStringBuilder'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@88['AbstractStringBuilder'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@91['AbstractStringBuilder'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@93['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@94['AbstractStringBuilder'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@97['AbstractStringBuilder'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@100['AbstractStringBuilder'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@103['AbstractStringBuilder'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@106['AbstractStringBuilder'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@109['AbstractStringBuilder'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@111['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@112['AbstractStringBuilder'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@114['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@115['AbstractStringBuilder'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@117['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@118['AbstractStringBuilder'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@120['AbstractStringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@121['AbstractStringBuilder'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@114['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@124['AbstractStringBuilder'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@111['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@126['AbstractStringBuilder'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@105['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@128['AbstractStringBuilder'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@130['AbstractStringBuilder'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@108['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@132['AbstractStringBuilder'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@83['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@134['AbstractStringBuilder'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@96['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@136['AbstractStringBuilder'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@120['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@138['AbstractStringBuilder'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@87['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@140['AbstractStringBuilder'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@102['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@142['AbstractStringBuilder'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@99['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@144['AbstractStringBuilder'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@93['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@146['AbstractStringBuilder'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@117['AbstractStringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@71['AbstractStringBuilder'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@62['Appendable'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@151['Appendable']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@152['Appendable'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaClassImpl@154['Appendable']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@155['Appendable'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaClassImpl@157['Appendable']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@158['Appendable'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaClassImpl@160['Appendable']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@161['Appendable'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@157['Appendable']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@163['Appendable'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@154['Appendable']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@165['Appendable'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@160['Appendable']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
-}
-
-LazyJavaClassifierType@63['CharSequence'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@168['CharSequence']
-    memberScope = DeserializedClassMemberScope@169
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@78['CharSequence'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaClassImpl@172['CharSequence']
-    memberScope = DeserializedClassMemberScope@169
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@173['CharSequence'] {
-    arguments = ArrayList@174[empty]
-    classifier = JavaClassImpl@175['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@176['CharSequence'] {
-    arguments = ArrayList@177[empty]
-    classifier = JavaClassImpl@178['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@179['CharSequence'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaClassImpl@181['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@182['CharSequence'] {
-    arguments = ArrayList@183[empty]
-    classifier = JavaClassImpl@184['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@185['CharSequence'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaClassImpl@187['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@188['CharSequence'] {
-    arguments = ArrayList@189[empty]
-    classifier = JavaClassImpl@190['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@191['CharSequence'] {
-    arguments = ArrayList@192[empty]
-    classifier = JavaClassImpl@193['CharSequence']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@194['CharSequence'] {
-    arguments = ArrayList@195[empty]
-    classifier = JavaClassImpl@181['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@196['CharSequence'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@175['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@198['CharSequence'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@193['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@200['CharSequence'] {
-    arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@190['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@202['CharSequence'] {
-    arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@187['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@204['CharSequence'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@178['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@206['CharSequence'] {
-    arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@184['CharSequence']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@73['CharSequence'] {
-    classifier = JavaClassImpl@208['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@209['Object'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaClassImpl@211['Object']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@213['Object'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaClassImpl@215['Object']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@216['Object'] {
-    arguments = ArrayList@217[empty]
-    classifier = JavaClassImpl@215['Object']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@218['Object'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@211['Object']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@220['Object'] {
-    classifier = JavaClassImpl@221['Object']
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@222['Object'] {
-    classifier = JavaClassImpl@223['Object']
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@224['Object'] {
-    classifier = JavaClassImpl@225['Object']
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@77['Serializable'] {
-    arguments = ArrayList@226[empty]
-    classifier = JavaClassImpl@227['Serializable']
-    memberScope = LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
-}
-
-LazyJavaClassifierType@72['Serializable'] {
-    classifier = JavaClassImpl@228['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
-}
-
-LazyJavaClassifierType@229['String'] {
-    arguments = ArrayList@230[empty]
-    classifier = JavaClassImpl@231['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@233['String'] {
-    arguments = ArrayList@234[empty]
-    classifier = JavaClassImpl@235['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@236['String'] {
-    arguments = ArrayList@237[empty]
-    classifier = JavaClassImpl@238['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@239['String'] {
-    arguments = ArrayList@240[empty]
-    classifier = JavaClassImpl@241['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@242['String'] {
-    arguments = ArrayList@243[empty]
-    classifier = JavaClassImpl@244['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@245['String'] {
-    arguments = ArrayList@246[empty]
-    classifier = JavaClassImpl@241['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@247['String'] {
-    arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@244['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@249['String'] {
-    arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@231['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@251['String'] {
-    arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@238['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@253['String'] {
-    arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@235['String']
-    nullable = 'true': Boolean@123
-    typeConstructor = DeserializedClassTypeConstructor@232
-}
-
-LazyJavaClassifierType@255['StringBuffer'] {
-    arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@257['StringBuffer']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
-}
-
-LazyJavaClassifierType@258['StringBuffer'] {
-    arguments = ArrayList@259[empty]
-    classifier = JavaClassImpl@260['StringBuffer']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
-}
-
-LazyJavaClassifierType@261['StringBuffer'] {
-    arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@260['StringBuffer']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
-}
-
-LazyJavaClassifierType@263['StringBuffer'] {
-    arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@257['StringBuffer']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
-}
-
-LazyJavaClassifierType@265['StringBuilder'] {
-    arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@267['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@268['StringBuilder'] {
-    arguments = ArrayList@269[empty]
-    classifier = JavaClassImpl@270['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@271['StringBuilder'] {
-    arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@274['StringBuilder'] {
-    arguments = ArrayList@275[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@277['StringBuilder'] {
-    arguments = ArrayList@278[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@280['StringBuilder'] {
-    arguments = ArrayList@281[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@283['StringBuilder'] {
-    arguments = ArrayList@284[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@286['StringBuilder'] {
-    arguments = ArrayList@287[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@289['StringBuilder'] {
-    arguments = ArrayList@290[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@292['StringBuilder'] {
-    arguments = ArrayList@293[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@295['StringBuilder'] {
-    arguments = ArrayList@296[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@298['StringBuilder'] {
-    arguments = ArrayList@299[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@301['StringBuilder'] {
-    arguments = ArrayList@302[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@304['StringBuilder'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@307['StringBuilder'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@310['StringBuilder'] {
-    arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@312['StringBuilder'] {
-    arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@314['StringBuilder'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@316['StringBuilder'] {
-    arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@318['StringBuilder'] {
-    arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@320['StringBuilder'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@322['StringBuilder'] {
-    arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@267['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@324['StringBuilder'] {
-    arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@326['StringBuilder'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@328['StringBuilder'] {
-    arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@270['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@330['StringBuilder'] {
-    arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@332['StringBuilder'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@334['StringBuilder'] {
-    arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@336['StringBuilder'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaClassifierType@338['StringBuilder'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
-    nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
-}
-
-LazyJavaPackageFragmentProvider@340 {
-    packageFragments('<root>': FqName@341) = LazyJavaPackageFragment@342['<root>']
-    packageFragments('Any': FqName@343) = null
-    packageFragments('Array': FqName@344) = null
-    packageFragments('Int': FqName@345) = null
-    packageFragments('String': FqName@346) = null
-    packageFragments('T': FqName@347) = null
-    packageFragments('java': FqName@348) = LazyJavaPackageFragment@349['java']
-    packageFragments('java.io': FqName@350) = LazyJavaPackageFragment@351['io']
-    packageFragments('java.lang': FqName@352) = LazyJavaPackageFragment@353['lang']
-    packageFragments('java.lang.Any': FqName@354) = null
-    packageFragments('java.lang.Array': FqName@355) = null
-    packageFragments('java.lang.Int': FqName@356) = null
-    packageFragments('java.lang.String': FqName@357) = null
-    packageFragments('java.lang.T': FqName@358) = null
-    packageFragments('kotlin': FqName@359) = null
-    packageFragments('kotlin.Any': FqName@360) = null
-    packageFragments('kotlin.Array': FqName@361) = null
-    packageFragments('kotlin.Int': FqName@362) = null
-    packageFragments('kotlin.String': FqName@363) = null
-    packageFragments('kotlin.T': FqName@364) = null
-    packageFragments('kotlin.io': FqName@365) = null
-    packageFragments('kotlin.jvm': FqName@366) = null
-    topLevelClasses(JavaClassImpl@80['AbstractStringBuilder']) = LazyJavaClassDescriptor@2['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@151['Appendable']) = LazyJavaClassDescriptor@16['Appendable']
-    topLevelClasses(JavaClassImpl@227['Serializable']) = LazyJavaClassDescriptor@30['Serializable']
-    topLevelClasses(JavaClassImpl@260['StringBuffer']) = LazyJavaClassDescriptor@38['StringBuffer']
-    topLevelClasses(JavaClassImpl@367['StringBuilder']) = LazyJavaClassDescriptor@40['StringBuilder']
-}
-
-LazyJavaPackageFragment@342['<root>'] {
-    classes('Any': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('Array': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('Int': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('String': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('StringBuilder': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('array1': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('join': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('joinG': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('joinT': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('StringBuilder': Name@373) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('array1': Name@374) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('join': Name@375) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('joinG': Name@376) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('joinT': Name@377) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    memberIndex = computeMemberIndex$1@379 // through LazyPackageFragmentScopeForJavaPackage@369
-}
-
-LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('lang': Name@382) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    memberIndex = computeMemberIndex$1@383 // through LazyPackageFragmentScopeForJavaPackage@381
-}
-
-LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@40['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@384
-    classes('array1': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@384
-    classes('join': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@384
-    classes('joinG': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@384
-    classes('joinT': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@384
-    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@384
-    functions('StringBuilder': Name@373) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
-    functions('array1': Name@374) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
-    functions('join': Name@375) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
-    functions('joinG': Name@376) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
-    functions('joinT': Name@377) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
-    memberIndex = computeMemberIndex$1@385 // through LazyPackageFragmentScopeForJavaPackage@384
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[13] { ResolutionCandidate@388, ResolutionCandidate@389, ResolutionCandidate@390, ... }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[13] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@483 {
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@510 {
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@519 {
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@531 {
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@543 {
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-}
-
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-}
-
-ResolutionTaskHolder@651 {
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-}
-
-ResolutionTaskHolder@663 {
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-}
-
-ResolutionTaskHolder@675 {
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
-}
-
-ResolutionTaskHolder@678 {
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
-}
-
-ResolutionTaskHolder@681 {
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-}
-
-ResolutionTaskHolder@687 {
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
-}
-
-ResolutionTaskHolder@690 {
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
-}
-
-ResolutionTaskHolder@693 {
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-}
-
-ResolutionTaskHolder@699 {
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
-}
-
-ResolutionTaskHolder@702 {
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
-}
-
-ResolutionTaskHolder@705 {
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-}
-
-ResolutionTaskHolder@711 {
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
-}
-
-ResolutionTaskHolder@714 {
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
-}
-
-ResolutionTaskHolder@717 {
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
-}
-
-ResolutionTaskHolder@726 {
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
-}
-
-ResolutionTaskHolder@729 {
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-}
-
-ResolutionTaskHolder@735 {
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
-}
-
-ResolutionTaskHolder@738 {
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
-}
-
-ResolutionTaskHolder@741 {
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-}
-
-ResolutionTaskHolder@744 {
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
-}
-
-ResolutionTaskHolder@750 {
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
-}
-
-ResolutionTaskHolder@753 {
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-}
-
-ResolutionTaskHolder@756 {
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
-}
-
-ResolutionTaskHolder@759 {
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
-}
-
-ResolutionTaskHolder@762 {
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
-}
-
-ResolutionTaskHolder@765 {
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-}
-
-ResolutionTaskHolder@768 {
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
-}
-
-ResolutionTaskHolder@771 {
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
-}
-
-ResolutionTaskHolder@774 {
-    <name not found> = ArrayList@775[4] { ResolutionCandidate@776, ResolutionCandidate@777, ResolutionCandidate@778, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@779 {
-    <name not found> = ArrayList@780[4] { ResolutionCandidate@781, ResolutionCandidate@782, ResolutionCandidate@783, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@784[14] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@785, ... }
-    <name not found> = ArrayList@786[14] { ResolutionCandidate@388, ResolutionCandidate@389, ResolutionCandidate@787, ... }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@512 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@695 }
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@731 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@521 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@668 }
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@716 }
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@725 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@680 }
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@752 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@728 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@509 }
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@677 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@683 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@707 }
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@855[1] { ResolutionCandidate@617 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@857[1] { ResolutionCandidate@692 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@861[1] { ResolutionCandidate@761 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@863[1] { ResolutionCandidate@656 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@865[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@866[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@867[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@869[1] { ResolutionCandidate@737 }
-    <name not found> = ArrayList@870[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@773 }
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@873[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@875[1] { ResolutionCandidate@749 }
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@879[1] { ResolutionCandidate@524 }
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@701 }
-    <name not found> = ArrayList@881[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@758 }
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@885[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@887[1] { ResolutionCandidate@770 }
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@719 }
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@629 }
-    <name not found> = ArrayList@891[1] { ResolutionCandidate@689 }
-    <name not found> = ArrayList@892[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@893[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@894[1] { ResolutionCandidate@605 }
-    <name not found> = ArrayList@895[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@896[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@897[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@898[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@899[1] { ResolutionCandidate@740 }
-    <name not found> = ArrayList@900[1] { ResolutionCandidate@764 }
-    <name not found> = ArrayList@901[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@902[1] { ResolutionCandidate@632 }
-    <name not found> = ArrayList@903[1] { ResolutionCandidate@704 }
-    <name not found> = ArrayList@904[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@905[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@906[1] { ResolutionCandidate@713 }
-    <name not found> = ArrayList@907[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@908[1] { ResolutionCandidate@653 }
-    <name not found> = ArrayList@909[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@910[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@911[1] { ResolutionCandidate@746 }
-    <name not found> = ArrayList@912[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@913[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@914[4] { ResolutionCandidate@776, ResolutionCandidate@777, ResolutionCandidate@778, ... }
-    <name not found> = ArrayList@915[4] { ResolutionCandidate@781, ResolutionCandidate@782, ResolutionCandidate@783, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
deleted file mode 100644
index a2d2be4459f..00000000000
--- a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
+++ /dev/null
@@ -1,69 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Boolean': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Boolean': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
deleted file mode 100644
index 4aeaf530644..00000000000
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
+++ /dev/null
@@ -1,357 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.Int': FqName@6) = null
-    packageFragments('a.String': FqName@7) = null
-    packageFragments('a.xx': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.xx': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kotlin.xx': FqName@21) = null
-    packageFragments('xx': FqName@22) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('xx': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('xx': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
deleted file mode 100644
index 468eaf47f89..00000000000
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt1940': FqName@13) = null
-    packageFragments('kt1940.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/checkType.lazy.log b/compiler/testData/diagnostics/tests/checkType.lazy.log
deleted file mode 100644
index 962cf149ac1..00000000000
--- a/compiler/testData/diagnostics/tests/checkType.lazy.log
+++ /dev/null
@@ -1,127 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('_': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.C': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('java.lang.Unit': FqName@19) = null
-    packageFragments('java.lang._': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin._': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('tests': FqName@30) = null
-    packageFragments('tests._checkType': FqName@31) = null
-    packageFragments('tests._checkType.A': FqName@32) = null
-    packageFragments('tests._checkType.B': FqName@33) = null
-    packageFragments('tests._checkType.C': FqName@34) = null
-    packageFragments('tests._checkType.T': FqName@35) = null
-    packageFragments('tests._checkType.Unit': FqName@36) = null
-    packageFragments('tests._checkType._': FqName@37) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('_': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('checkType': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('tests': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('checkType': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('tests': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('checkType': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('checkType': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
deleted file mode 100644
index 8ec0cf8fbe1..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
+++ /dev/null
@@ -1,99 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('x': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('x': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
deleted file mode 100644
index 0db5c8f4904..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
+++ /dev/null
@@ -1,173 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('CCC': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('foo.A': FqName@11) = null
-    packageFragments('foo.B': FqName@12) = null
-    packageFragments('foo.CCC': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.CCC': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.CCC': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
deleted file mode 100644
index a9022b442f1..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
+++ /dev/null
@@ -1,511 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@9['Int']
-}
-
-LazyJavaClassDescriptor@10['Appendable'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
-}
-
-LazyJavaClassDescriptor@16['AutoCloseable'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@20['Closeable'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
-}
-
-LazyJavaClassDescriptor@24['FilterOutputStream'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@28['OutputStream'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@29
-    typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
-}
-
-LazyJavaClassDescriptor@32['PrintStream'] {
-    defaultType = JetTypeImpl@33['PrintStream']
-    enumEntryIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@35
-    functions('println': Name@36) = ArrayList@37[10] { JavaMethodDescriptor@38['println'], JavaMethodDescriptor@39['println'], JavaMethodDescriptor@40['println'], ... } // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@35
-    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@35
-    nestedClasses('println': Name@36) = null // through LazyJavaClassMemberScope@35
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
-}
-
-LazyJavaClassDescriptor@45['System'] {
-    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@48 // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaStaticClassScope@50
-    nestedClassIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@47
-    nestedClasses('out': Name@52) = null // through LazyJavaClassMemberScope@47
-    properties('out': Name@52) = ArrayList@53[1] { JavaPropertyDescriptor@54['out'] } // through LazyJavaStaticClassScope@50
-    properties('out': Name@52) = EmptyList@12[empty] // through LazyJavaClassMemberScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@55['System']
-}
-
-LazyJavaClassTypeConstructor@15['Appendable'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassTypeConstructor@19['AutoCloseable'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Closeable'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@27['FilterOutputStream'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@31['OutputStream'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@44['PrintStream'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['FilterOutputStream'], LazyJavaClassifierType@73['Appendable'], LazyJavaClassifierType@74['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@55['System'] {
-    supertypes = ArrayList@75[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassifierType@73['Appendable'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['Appendable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
-}
-
-LazyJavaClassifierType@63['AutoCloseable'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
-}
-
-LazyJavaClassifierType@74['Closeable'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@81['Closeable']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
-}
-
-LazyJavaClassifierType@69['Closeable'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@83['Closeable']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
-}
-
-LazyJavaClassifierType@72['FilterOutputStream'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
-}
-
-LazyJavaClassifierType@86['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@87
-}
-
-LazyJavaClassifierType@88['Object'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['Object']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@93['Object'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@90['Object']
-    nullable = 'true': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@96['Object'] {
-    classifier = JavaClassImpl@97['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@98['Object'] {
-    classifier = JavaClassImpl@99['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@100['Object'] {
-    classifier = JavaClassImpl@101['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@102['Object'] {
-    classifier = JavaClassImpl@103['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@66['OutputStream'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['OutputStream']
-    memberScope = LazyJavaClassMemberScope@29
-    typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
-}
-
-LazyJavaClassifierType@106['PrintStream'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['PrintStream']
-    memberScope = LazyJavaClassMemberScope@35
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
-}
-
-LazyJavaClassifierType@109['PrintStream'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@108['PrintStream']
-    nullable = 'true': Boolean@95
-    typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
-}
-
-LazyJavaClassifierType@111['String'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@114
-}
-
-LazyJavaClassifierType@115['String'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'true': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@114
-}
-
-LazyJavaPackageFragmentProvider@117 {
-    packageFragments('<root>': FqName@118) = LazyJavaPackageFragment@119['<root>']
-    packageFragments('A': FqName@120) = null
-    packageFragments('B': FqName@121) = null
-    packageFragments('Jet86': FqName@122) = null
-    packageFragments('Jet86.A': FqName@123) = null
-    packageFragments('Jet86.B': FqName@124) = null
-    packageFragments('Jet86.System': FqName@125) = null
-    packageFragments('Jet86.a': FqName@126) = null
-    packageFragments('Jet86.b': FqName@127) = null
-    packageFragments('Jet86.c': FqName@128) = null
-    packageFragments('Jet86.d': FqName@129) = null
-    packageFragments('Jet86.java': FqName@130) = null
-    packageFragments('Jet86.s': FqName@131) = null
-    packageFragments('System': FqName@132) = null
-    packageFragments('b': FqName@133) = null
-    packageFragments('java': FqName@134) = LazyJavaPackageFragment@135['java']
-    packageFragments('java.io': FqName@136) = LazyJavaPackageFragment@137['io']
-    packageFragments('java.lang': FqName@138) = LazyJavaPackageFragment@139['lang']
-    packageFragments('java.lang.A': FqName@140) = null
-    packageFragments('java.lang.B': FqName@141) = null
-    packageFragments('java.lang.System': FqName@142) = null
-    packageFragments('java.lang.b': FqName@143) = null
-    packageFragments('kotlin': FqName@144) = null
-    packageFragments('kotlin.A': FqName@145) = null
-    packageFragments('kotlin.B': FqName@146) = null
-    packageFragments('kotlin.System': FqName@147) = null
-    packageFragments('kotlin.b': FqName@148) = null
-    packageFragments('kotlin.io': FqName@149) = null
-    packageFragments('kotlin.jvm': FqName@150) = null
-    topLevelClasses(JavaClassImpl@77['Appendable']) = LazyJavaClassDescriptor@10['Appendable']
-    topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@16['AutoCloseable']
-    topLevelClasses(JavaClassImpl@81['Closeable']) = LazyJavaClassDescriptor@20['Closeable']
-    topLevelClasses(JavaClassImpl@85['FilterOutputStream']) = LazyJavaClassDescriptor@24['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@105['OutputStream']) = LazyJavaClassDescriptor@28['OutputStream']
-    topLevelClasses(JavaClassImpl@108['PrintStream']) = LazyJavaClassDescriptor@32['PrintStream']
-    topLevelClasses(JavaClassImpl@151['System']) = LazyJavaClassDescriptor@45['System']
-}
-
-LazyJavaPackageFragment@135['java'] {
-    classes('lang': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('lang': Name@155) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@153
-}
-
-LazyJavaPackageFragment@139['lang'] {
-    classes('System': Name@157) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('java': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('x': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('x': Name@160) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-null {
-    <name not found> = ArrayList@197[10] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@198[10] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.lazy.log b/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.lazy.log
deleted file mode 100644
index ed8cef46596..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.lazy.log
+++ /dev/null
@@ -1,18 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.lazy.log b/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.lazy.log
deleted file mode 100644
index a7349710d2e..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/classObjectInLocalClass.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
deleted file mode 100644
index 860dd506349..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('f': FqName@5) = null
-    packageFragments('f.A': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('B': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
deleted file mode 100644
index b4c4250637b..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
+++ /dev/null
@@ -1,471 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('D': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.A': FqName@9) = null
-    packageFragments('a.B': FqName@10) = null
-    packageFragments('a.C': FqName@11) = null
-    packageFragments('a.D': FqName@12) = null
-    packageFragments('b': FqName@13) = null
-    packageFragments('b.A': FqName@14) = null
-    packageFragments('b.Any': FqName@15) = null
-    packageFragments('b.B': FqName@16) = null
-    packageFragments('b.C': FqName@17) = null
-    packageFragments('b.D': FqName@18) = null
-    packageFragments('b.a': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.A': FqName@24) = null
-    packageFragments('java.lang.Any': FqName@25) = null
-    packageFragments('java.lang.B': FqName@26) = null
-    packageFragments('java.lang.C': FqName@27) = null
-    packageFragments('java.lang.D': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.Any': FqName@31) = null
-    packageFragments('kotlin.B': FqName@32) = null
-    packageFragments('kotlin.C': FqName@33) = null
-    packageFragments('kotlin.D': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('a': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('baz': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('f': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('quux': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('baz': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('f': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('quux': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log b/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
deleted file mode 100644
index 4871c0010dd..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('X': FqName@4) = null
-    packageFragments('Y': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('java.lang.X': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.C': FqName@13) = null
-    packageFragments('kotlin.X': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
deleted file mode 100644
index 6545460ef89..00000000000
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
+++ /dev/null
@@ -1,201 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['<class-object-for-C>']
-    <name not found> = JetTypeImpl@2['Unit']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
deleted file mode 100644
index 4bf48527e01..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
+++ /dev/null
@@ -1,1730 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@4 {
-    <name not found> = JetTypeImpl@5['<no name provided>']
-}
-
-DescriptorResolver@6 {
-    <name not found> = ErrorTypeImpl@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = IntValue@13
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@15['Int']
-    <name not found> = JetTypeImpl@16['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = JetTypeImpl@17['ProtocolState']
-    <name not found> = JetTypeImpl@17['ProtocolState']
-    <name not found> = null
-}
-
-DescriptorResolver@18 {
-    <name not found> = IntValue@19
-    <name not found> = JetTypeImpl@14['Int']
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('$b': FqName@21) = null
-    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    packageFragments('A': FqName@24) = null
-    packageFragments('Boolean': FqName@25) = null
-    packageFragments('Int': FqName@26) = null
-    packageFragments('M': FqName@27) = null
-    packageFragments('Open': FqName@28) = null
-    packageFragments('ProtocolState': FqName@29) = null
-    packageFragments('String': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.$b': FqName@35) = null
-    packageFragments('java.lang.A': FqName@36) = null
-    packageFragments('java.lang.Boolean': FqName@37) = null
-    packageFragments('java.lang.Int': FqName@38) = null
-    packageFragments('java.lang.M': FqName@39) = null
-    packageFragments('java.lang.Open': FqName@40) = null
-    packageFragments('java.lang.ProtocolState': FqName@41) = null
-    packageFragments('java.lang.String': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.$b': FqName@44) = null
-    packageFragments('kotlin.A': FqName@45) = null
-    packageFragments('kotlin.Boolean': FqName@46) = null
-    packageFragments('kotlin.Int': FqName@47) = null
-    packageFragments('kotlin.M': FqName@48) = null
-    packageFragments('kotlin.Open': FqName@49) = null
-    packageFragments('kotlin.ProtocolState': FqName@50) = null
-    packageFragments('kotlin.String': FqName@51) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    packageFragments('uninitialized_reassigned_variables': FqName@54) = null
-    packageFragments('uninitialized_reassigned_variables.$b': FqName@55) = null
-    packageFragments('uninitialized_reassigned_variables.A': FqName@56) = null
-    packageFragments('uninitialized_reassigned_variables.AnonymousInitializers': FqName@57) = null
-    packageFragments('uninitialized_reassigned_variables.Boolean': FqName@58) = null
-    packageFragments('uninitialized_reassigned_variables.ClassObject': FqName@59) = null
-    packageFragments('uninitialized_reassigned_variables.ForwardAccessToBackingField': FqName@60) = null
-    packageFragments('uninitialized_reassigned_variables.Int': FqName@61) = null
-    packageFragments('uninitialized_reassigned_variables.LocalValsVsProperties': FqName@62) = null
-    packageFragments('uninitialized_reassigned_variables.M': FqName@63) = null
-    packageFragments('uninitialized_reassigned_variables.Open': FqName@64) = null
-    packageFragments('uninitialized_reassigned_variables.Outer': FqName@65) = null
-    packageFragments('uninitialized_reassigned_variables.ProtocolState': FqName@66) = null
-    packageFragments('uninitialized_reassigned_variables.String': FqName@67) = null
-    packageFragments('uninitialized_reassigned_variables.TestObjectDeclaration': FqName@68) = null
-    packageFragments('uninitialized_reassigned_variables.TestObjectExpression': FqName@69) = null
-    packageFragments('uninitialized_reassigned_variables.x': FqName@70) = null
-    packageFragments('uninitialized_reassigned_variables.y': FqName@71) = null
-    packageFragments('uninitialized_reassigned_variables.z': FqName@72) = null
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('$b': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('A': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('b': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('c': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('doSmth': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('i': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('j': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('k': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('l': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('m': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('minusAssign': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('n': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('o': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('p': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('plusAssign': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('timesAssign': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('x': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('y': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('yy': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('z': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('$b': Name@101) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('A': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('doSmth': Name@85) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('minusAssign': Name@91) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('plusAssign': Name@95) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('timesAssign': Name@96) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-}
-
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-}
-
-ResolutionTaskHolder@483 {
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[2] { ResolutionCandidate@506, ResolutionCandidate@507 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[2] { ResolutionCandidate@510, ResolutionCandidate@511 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[2] { ResolutionCandidate@514, ResolutionCandidate@515 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[2] { ResolutionCandidate@518, ResolutionCandidate@519 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[2] { ResolutionCandidate@522, ResolutionCandidate@523 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[2] { ResolutionCandidate@526, ResolutionCandidate@527 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[2] { ResolutionCandidate@530, ResolutionCandidate@531 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[2] { ResolutionCandidate@534, ResolutionCandidate@535 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[2] { ResolutionCandidate@538, ResolutionCandidate@539 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[2] { ResolutionCandidate@542, ResolutionCandidate@543 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[2] { ResolutionCandidate@546, ResolutionCandidate@547 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[2] { ResolutionCandidate@550, ResolutionCandidate@551 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[2] { ResolutionCandidate@554, ResolutionCandidate@555 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@556 {
-    <name not found> = ArrayList@557[7] { ResolutionCandidate@558, ResolutionCandidate@559, ResolutionCandidate@560, ... }
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[7] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@565, ... }
-}
-
-ResolutionTaskHolder@566 {
-    <name not found> = ArrayList@567[7] { ResolutionCandidate@568, ResolutionCandidate@569, ResolutionCandidate@570, ... }
-}
-
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[7] { ResolutionCandidate@578, ResolutionCandidate@579, ResolutionCandidate@580, ... }
-}
-
-ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[7] { ResolutionCandidate@583, ResolutionCandidate@584, ResolutionCandidate@585, ... }
-}
-
-ResolutionTaskHolder@586 {
-    <name not found> = ArrayList@587[7] { ResolutionCandidate@588, ResolutionCandidate@589, ResolutionCandidate@590, ... }
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[8] { ResolutionCandidate@593, ResolutionCandidate@594, ResolutionCandidate@595, ... }
-}
-
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[8] { ResolutionCandidate@598, ResolutionCandidate@599, ResolutionCandidate@600, ... }
-}
-
-ResolutionTaskHolder@601 {
-    <name not found> = ArrayList@602[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[8] { ResolutionCandidate@608, ResolutionCandidate@609, ResolutionCandidate@610, ... }
-}
-
-ResolutionTaskHolder@611 {
-    <name not found> = ArrayList@612[8] { ResolutionCandidate@613, ResolutionCandidate@614, ResolutionCandidate@615, ... }
-}
-
-ResolutionTaskHolder@616 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@617 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@619 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@622 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@623 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@625 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@626 {
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@764[2] { ResolutionCandidate@534, ResolutionCandidate@535 }
-    <name not found> = ArrayList@765[2] { ResolutionCandidate@550, ResolutionCandidate@551 }
-    <name not found> = ArrayList@766[2] { ResolutionCandidate@538, ResolutionCandidate@539 }
-    <name not found> = ArrayList@767[2] { ResolutionCandidate@542, ResolutionCandidate@543 }
-    <name not found> = ArrayList@768[2] { ResolutionCandidate@554, ResolutionCandidate@555 }
-    <name not found> = ArrayList@769[2] { ResolutionCandidate@546, ResolutionCandidate@547 }
-    <name not found> = ArrayList@770[2] { ResolutionCandidate@530, ResolutionCandidate@531 }
-    <name not found> = ArrayList@771[2] { ResolutionCandidate@514, ResolutionCandidate@515 }
-    <name not found> = ArrayList@772[2] { ResolutionCandidate@522, ResolutionCandidate@523 }
-    <name not found> = ArrayList@773[2] { ResolutionCandidate@526, ResolutionCandidate@527 }
-    <name not found> = ArrayList@774[2] { ResolutionCandidate@518, ResolutionCandidate@519 }
-    <name not found> = ArrayList@775[2] { ResolutionCandidate@510, ResolutionCandidate@511 }
-    <name not found> = ArrayList@776[2] { ResolutionCandidate@506, ResolutionCandidate@507 }
-    <name not found> = ArrayList@777[7] { ResolutionCandidate@563, ResolutionCandidate@564, ResolutionCandidate@565, ... }
-    <name not found> = ArrayList@778[7] { ResolutionCandidate@583, ResolutionCandidate@584, ResolutionCandidate@585, ... }
-    <name not found> = ArrayList@779[7] { ResolutionCandidate@578, ResolutionCandidate@579, ResolutionCandidate@580, ... }
-    <name not found> = ArrayList@780[7] { ResolutionCandidate@558, ResolutionCandidate@559, ResolutionCandidate@560, ... }
-    <name not found> = ArrayList@781[7] { ResolutionCandidate@588, ResolutionCandidate@589, ResolutionCandidate@590, ... }
-    <name not found> = ArrayList@782[7] { ResolutionCandidate@568, ResolutionCandidate@569, ResolutionCandidate@570, ... }
-    <name not found> = ArrayList@783[7] { ResolutionCandidate@573, ResolutionCandidate@574, ResolutionCandidate@575, ... }
-    <name not found> = ArrayList@784[8] { ResolutionCandidate@598, ResolutionCandidate@599, ResolutionCandidate@600, ... }
-    <name not found> = ArrayList@785[8] { ResolutionCandidate@593, ResolutionCandidate@594, ResolutionCandidate@595, ... }
-    <name not found> = ArrayList@786[8] { ResolutionCandidate@613, ResolutionCandidate@614, ResolutionCandidate@615, ... }
-    <name not found> = ArrayList@787[8] { ResolutionCandidate@608, ResolutionCandidate@609, ResolutionCandidate@610, ... }
-    <name not found> = ArrayList@788[8] { ResolutionCandidate@603, ResolutionCandidate@604, ResolutionCandidate@605, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
deleted file mode 100644
index a3cb1fb8bad..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
+++ /dev/null
@@ -1,308 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@4['AbstractSet'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
-}
-
-LazyJavaClassDescriptor@6['HashSet'] {
-    constructors = ArrayList@7[5] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['HashSet<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['HashSet']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['AbstractSet'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['Set<E>'] }
-}
-
-LazyJavaClassTypeConstructor@13['HashSet'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    supertypes = ArrayList@25[4] { LazyJavaClassifierType@26['AbstractSet<E>'], LazyJavaClassifierType@27['Set<E>'], LazyJavaClassifierType@28['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@31['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassifierType@26['AbstractSet<E>'] {
-    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
-    classifier = JavaClassImpl@34['AbstractSet']
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractSet']
-}
-
-LazyJavaClassifierType@28['Cloneable'] {
-    classifier = JavaClassImpl@35['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['Collection<? extends E>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@41
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@44['Collection<? extends E>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@47
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@17['Collection<E>'] {
-    classifier = JavaClassImpl@50['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@51['E'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaTypeParameterImpl@53['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@55['E'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@59['E'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@65['E'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@61['E']
-    nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@57['E']
-    nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@69['E'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@53['E']
-    nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-LazyJavaClassifierType@73['Object'] {
-    classifier = JavaClassImpl@74['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@76['Object'] {
-    classifier = JavaClassImpl@77['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@78['Serializable'] {
-    classifier = JavaClassImpl@79['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassifierType@22['Set<E>'] {
-    arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
-    classifier = JavaClassImpl@82['Set']
-    memberScope = SubstitutingScope@83
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@27['Set<E>'] {
-    classifier = JavaClassImpl@85['Set']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaPackageFragmentProvider@86 {
-    packageFragments('<root>': FqName@87) = LazyJavaPackageFragment@88['<root>']
-    packageFragments('MutableSet': FqName@89) = null
-    packageFragments('String': FqName@90) = null
-    packageFragments('a': FqName@91) = null
-    packageFragments('a.MutableSet': FqName@92) = null
-    packageFragments('a.R': FqName@93) = null
-    packageFragments('a.String': FqName@94) = null
-    packageFragments('a.a': FqName@95) = null
-    packageFragments('java': FqName@96) = LazyJavaPackageFragment@97['java']
-    packageFragments('java.io': FqName@98) = LazyJavaPackageFragment@99['io']
-    packageFragments('java.lang': FqName@100) = LazyJavaPackageFragment@101['lang']
-    packageFragments('java.lang.MutableSet': FqName@102) = null
-    packageFragments('java.lang.String': FqName@103) = null
-    packageFragments('java.util': FqName@104) = LazyJavaPackageFragment@105['util']
-    packageFragments('java.util.HashSet': FqName@106) = null
-    packageFragments('kotlin': FqName@107) = null
-    packageFragments('kotlin.MutableSet': FqName@108) = null
-    packageFragments('kotlin.String': FqName@109) = null
-    packageFragments('kotlin.io': FqName@110) = null
-    packageFragments('kotlin.jvm': FqName@111) = null
-    topLevelClasses(JavaClassImpl@31['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@34['AbstractSet']) = LazyJavaClassDescriptor@4['AbstractSet']
-    topLevelClasses(JavaClassImpl@112['HashSet']) = LazyJavaClassDescriptor@6['HashSet']
-    topLevelClasses(JavaClassImpl@79['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@97['java'] {
-    classes('lang': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('util': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('lang': Name@117) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('util': Name@119) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@114
-}
-
-LazyJavaPackageFragment@101['lang'] {
-    classes('HashSet': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('a': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('b': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('equals': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('HashSet': Name@121) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('equals': Name@125) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@122
-}
-
-LazyJavaPackageFragment@105['util'] {
-    classes('HashSet': Name@127) = LazyJavaClassDescriptor@6['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@116 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('HashSet': Name@129) = EmptyList@118[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
-}
-
-LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@131['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-    upperBounds = LinkedHashSet@132[1] { NullableType@133 }
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaTypeParameterResolver@134 {
-    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@24['E']
-}
-
-LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@118[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-}
-
-null {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@181[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-    <name not found> = EmptyList@118[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
deleted file mode 100644
index efba41e5518..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
+++ /dev/null
@@ -1,155 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Boolean': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Boolean': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@129[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@130[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
deleted file mode 100644
index 22d0f096b53..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('c': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-ResolutionTaskHolder@17 {
-    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
-}
-
-null {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
deleted file mode 100644
index e8252a7c7a2..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('d': FqName@4) = null
-    packageFragments('d.A': FqName@5) = null
-    packageFragments('d.Int': FqName@6) = null
-    packageFragments('d.a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
deleted file mode 100644
index 856d7b2dc2f..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
+++ /dev/null
@@ -1,182 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Any': FqName@59) = null
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.Any': FqName@63) = null
-    packageFragments('kotlin.Int': FqName@64) = null
-    packageFragments('kotlin.String': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Exception': Name@71) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('bar': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('todo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('Exception': Name@71) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('bar': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[4] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@98[5] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
deleted file mode 100644
index 4481bb608e1..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('a': FqName@55) = null
-    packageFragments('a.Any': FqName@56) = null
-    packageFragments('a.Int': FqName@57) = null
-    packageFragments('a.String': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Any': FqName@63) = null
-    packageFragments('java.lang.Int': FqName@64) = null
-    packageFragments('java.lang.String': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Any': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.String': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@72['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@76) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('Exception': Name@79) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@79) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@113[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
deleted file mode 100644
index 5fe40755e76..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
+++ /dev/null
@@ -1,203 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-    <name not found> = JetTypeImpl@2['Nothing']
-    <name not found> = JetTypeImpl@3['Nothing']
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['Exception']
-}
-
-LazyJavaClassTypeConstructor@11['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassifierType@15['String'] {
-    arguments = ArrayList@16[empty]
-    classifier = JavaClassImpl@17['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@23['String'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@17['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['Throwable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@40['Throwable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('Int': FqName@54) = null
-    packageFragments('Nothing': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.Nothing': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.Int': FqName@63) = null
-    packageFragments('kotlin.Nothing': FqName@64) = null
-    packageFragments('kotlin.io': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = null
-    topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@4['Exception']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('Exception': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Nothing': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('invoke': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('todo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('Exception': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('invoke': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('todo': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('lang': Name@79) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@68) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('invoke': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('todo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('Exception': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('invoke': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('todo': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
deleted file mode 100644
index 8a9092a7670..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
+++ /dev/null
@@ -1,200 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Any': FqName@58) = null
-    packageFragments('java.lang.Int': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Any': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Exception': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Exception': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@68) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Exception': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@102[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
deleted file mode 100644
index e03e667f78e..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
+++ /dev/null
@@ -1,370 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['RuntimeException'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@11['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@52['Throwable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@55['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Any': FqName@59) = null
-    packageFragments('Boolean': FqName@60) = null
-    packageFragments('Int': FqName@61) = null
-    packageFragments('Nothing': FqName@62) = null
-    packageFragments('Unit': FqName@63) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.Any': FqName@68) = null
-    packageFragments('java.lang.Boolean': FqName@69) = null
-    packageFragments('java.lang.Int': FqName@70) = null
-    packageFragments('java.lang.Nothing': FqName@71) = null
-    packageFragments('java.lang.Unit': FqName@72) = null
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.Any': FqName@74) = null
-    packageFragments('kotlin.Boolean': FqName@75) = null
-    packageFragments('kotlin.Int': FqName@76) = null
-    packageFragments('kotlin.Nothing': FqName@77) = null
-    packageFragments('kotlin.Unit': FqName@78) = null
-    packageFragments('kotlin.io': FqName@79) = null
-    packageFragments('kotlin.jvm': FqName@80) = null
-    topLevelClasses(JavaClassImpl@19['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@81['RuntimeException']) = LazyJavaClassDescriptor@4['RuntimeException']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Any': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Boolean': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Nothing': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Unit': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@67['lang'] {
-    classes('RuntimeException': Name@98) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('RuntimeException': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[4] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-null {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@232[5] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@233[7] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@234[7] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@235[7] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@236[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-    <name not found> = ArrayList@237[7] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@238[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@239[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@240[7] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@241[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
deleted file mode 100644
index 0dfa926c15a..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Nothing': FqName@53) = null
-    packageFragments('c': FqName@54) = null
-    packageFragments('c.A': FqName@55) = null
-    packageFragments('c.Nothing': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.A': FqName@61) = null
-    packageFragments('java.lang.Nothing': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = null
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Nothing': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('lang': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('bar': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Exception': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('bar': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-null {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
deleted file mode 100644
index b3c2d2da062..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
+++ /dev/null
@@ -1,397 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Array': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('Nothing': FqName@55) = null
-    packageFragments('String': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.Any': FqName@61) = null
-    packageFragments('java.lang.Array': FqName@62) = null
-    packageFragments('java.lang.Int': FqName@63) = null
-    packageFragments('java.lang.Nothing': FqName@64) = null
-    packageFragments('java.lang.String': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Any': FqName@67) = null
-    packageFragments('kotlin.Array': FqName@68) = null
-    packageFragments('kotlin.Int': FqName@69) = null
-    packageFragments('kotlin.Nothing': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    topLevelClasses(JavaClassImpl@74['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Array': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Exception': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Nothing': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('get': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plus': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plusAssign': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('todo': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Exception': Name@78) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('get': Name@82) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plus': Name@83) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plusAssign': Name@84) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('set': Name@85) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@78) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('get': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('plus': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('plusAssign': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('todo': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('Exception': Name@78) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('get': Name@82) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('plus': Name@83) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('plusAssign': Name@84) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('set': Name@85) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
-
-null {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@201[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-    <name not found> = EmptyList@88[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
deleted file mode 100644
index 76bf72b8560..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
+++ /dev/null
@@ -1,220 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Int': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Int': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.Int': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    topLevelClasses(JavaClassImpl@62['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-}
-
-null {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
deleted file mode 100644
index f609c194ca6..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
+++ /dev/null
@@ -1,283 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Boolean': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Boolean': FqName@59) = null
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.Boolean': FqName@63) = null
-    packageFragments('kotlin.Int': FqName@64) = null
-    packageFragments('kotlin.String': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Boolean': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@151[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
deleted file mode 100644
index d28ac6e57c6..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInCalls.lazy.log
+++ /dev/null
@@ -1,211 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('Unit': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.String': FqName@62) = null
-    packageFragments('java.lang.Unit': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Any': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.String': FqName@67) = null
-    packageFragments('kotlin.Unit': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Unit': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
deleted file mode 100644
index 472a4f7983c..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Array': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Any': FqName@58) = null
-    packageFragments('java.lang.Array': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Any': FqName@61) = null
-    packageFragments('kotlin.Array': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Array': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
deleted file mode 100644
index 53280e3313d..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
+++ /dev/null
@@ -1,202 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Boolean': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Boolean': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.Boolean': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    topLevelClasses(JavaClassImpl@62['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Boolean': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Exception': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Exception': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('bar': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@65) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('bar': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('Exception': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('bar': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-null {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@106[5] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
deleted file mode 100644
index d8baa42d40d..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
+++ /dev/null
@@ -1,243 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Array': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('Nothing': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Array': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.Nothing': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Array': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.Nothing': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Array': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Nothing': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('times': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('get': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('times': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('times': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('get': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('times': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@124[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
deleted file mode 100644
index 1e797db3f74..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLocalDeclarations.lazy.log
+++ /dev/null
@@ -1,279 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@4 {
-    <name not found> = JetTypeImpl@5['<no name provided>']
-}
-
-DescriptorResolver@6 {
-    <name not found> = JetTypeImpl@7['Int']
-}
-
-DescriptorResolver@8 {
-    <name not found> = JetTypeImpl@7['Int']
-}
-
-DescriptorResolver@9 {
-    <name not found> = JetTypeImpl@7['Int']
-}
-
-DescriptorResolver@10 {
-    <name not found> = JetTypeImpl@11['Nothing']
-}
-
-LazyJavaClassDescriptor@12['Exception'] {
-    constructors = ArrayList@13[5] { JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], ... } // through LazyJavaClassMemberScope@17
-    defaultType = JetTypeImpl@18['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@19['Exception']
-}
-
-LazyJavaClassTypeConstructor@19['Exception'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['Throwable'] }
-}
-
-LazyJavaClassifierType@23['String'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@51['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@53['Throwable'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@55['Throwable'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@22['Throwable'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaClassImpl@58['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaPackageFragmentProvider@59 {
-    packageFragments('<root>': FqName@60) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('Any': FqName@62) = null
-    packageFragments('Foo': FqName@63) = null
-    packageFragments('Int': FqName@64) = null
-    packageFragments('java': FqName@65) = LazyJavaPackageFragment@66['java']
-    packageFragments('java.lang': FqName@67) = LazyJavaPackageFragment@68['lang']
-    packageFragments('java.lang.Any': FqName@69) = null
-    packageFragments('java.lang.Foo': FqName@70) = null
-    packageFragments('java.lang.Int': FqName@71) = null
-    packageFragments('kotlin': FqName@72) = null
-    packageFragments('kotlin.Any': FqName@73) = null
-    packageFragments('kotlin.Foo': FqName@74) = null
-    packageFragments('kotlin.Int': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    topLevelClasses(JavaClassImpl@78['Exception']) = LazyJavaClassDescriptor@12['Exception']
-}
-
-LazyJavaPackageFragment@61['<root>'] {
-    classes('Any': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Exception': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Int': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@81) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@84) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@66['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@68['lang'] {
-    classes('Exception': Name@81) = LazyJavaClassDescriptor@12['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('bar': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('todo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('Exception': Name@81) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('bar': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('todo': Name@84) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
deleted file mode 100644
index fa8e93eec90..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
+++ /dev/null
@@ -1,230 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.IntIterator']
-    <name not found> = JetTypeImpl@2['Nothing']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Nothing': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Nothing': FqName@58) = null
-    packageFragments('kotlin': FqName@59) = null
-    packageFragments('kotlin.Nothing': FqName@60) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    topLevelClasses(JavaClassImpl@63['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('Exception': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Nothing': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[4] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@121[5] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@122[7] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
deleted file mode 100644
index 98184857aad..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
+++ /dev/null
@@ -1,161 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('kotlin': FqName@56) = null
-    packageFragments('kotlin.io': FqName@57) = null
-    packageFragments('kotlin.jvm': FqName@58) = null
-    topLevelClasses(JavaClassImpl@59['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('todo': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('Exception': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@55['lang'] {
-    classes('Exception': Name@60) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Exception': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@81[5] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
deleted file mode 100644
index d96dce3dd16..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
+++ /dev/null
@@ -1,214 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Nothing': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Any': FqName@58) = null
-    packageFragments('java.lang.Nothing': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Any': FqName@61) = null
-    packageFragments('kotlin.Nothing': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Exception': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Nothing': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('inc': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('not': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Exception': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('inc': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('not': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@68) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('inc': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('not': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('inc': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('not': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
deleted file mode 100644
index 4ef382a6507..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
+++ /dev/null
@@ -1,135 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Array': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Array': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-null {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@99[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
deleted file mode 100644
index e23f7d33861..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
deleted file mode 100644
index 9ddc6643886..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
+++ /dev/null
@@ -1,174 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@9['RuntimeException'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Exception'] }
-}
-
-LazyJavaClassifierType@15['Exception'] {
-    arguments = ArrayList@16[empty]
-    classifier = JavaClassImpl@17['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@23['String'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['Throwable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['Throwable']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@45['Throwable']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@53['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    packageFragments('Exception': FqName@57) = null
-    packageFragments('String': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Exception': FqName@63) = null
-    packageFragments('java.lang.String': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Exception': FqName@66) = null
-    packageFragments('kotlin.String': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@70['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@71['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-}
-
-LazyJavaPackageFragment@56['<root>'] {
-    classes('Exception': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('RuntimeException': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('RuntimeException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('Exception': Name@72) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('RuntimeException': Name@74) = LazyJavaClassDescriptor@2['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('RuntimeException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[4] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@94[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
deleted file mode 100644
index c759f6a1832..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
+++ /dev/null
@@ -1,191 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['RuntimeException'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@11['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@52['Throwable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@55['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Exception': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.Exception': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Exception': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    topLevelClasses(JavaClassImpl@69['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@70['RuntimeException']) = LazyJavaClassDescriptor@4['RuntimeException']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('RuntimeException': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('cond': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('RuntimeException': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('cond': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@63['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('RuntimeException': Name@73) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('cond': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('RuntimeException': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('cond': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[4] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@98[5] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@99[5] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
deleted file mode 100644
index 67612418fd8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
+++ /dev/null
@@ -1,210 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['NullPointerException'] {
-    constructors = ArrayList@3[2] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'] } // through LazyJavaClassMemberScope@6
-    defaultType = JetTypeImpl@7['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@8['NullPointerException']
-}
-
-LazyJavaClassDescriptor@9['RuntimeException'] {
-    constructors = ArrayList@10[5] { JavaConstructorDescriptor@11['<init>'], JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], ... } // through LazyJavaClassMemberScope@14
-    defaultType = JetTypeImpl@15['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@16['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@8['NullPointerException'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@16['RuntimeException'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Exception'] }
-}
-
-LazyJavaClassifierType@25['Exception'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@22['RuntimeException'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@16['RuntimeException']
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['String'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@44['String'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@43['String']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@47['String'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@49['String'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@51['String'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@40['String']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@53['Throwable'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@55['Throwable']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@57['Throwable'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@59['Throwable']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@60['Throwable'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaClassImpl@62['Throwable']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@63['Throwable'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@55['Throwable']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@65['Throwable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@59['Throwable']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@67['Throwable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@62['Throwable']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@19['Throwable'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@70['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaPackageFragmentProvider@71 {
-    packageFragments('<root>': FqName@72) = LazyJavaPackageFragment@73['<root>']
-    packageFragments('String': FqName@74) = null
-    packageFragments('java': FqName@75) = LazyJavaPackageFragment@76['java']
-    packageFragments('java.lang': FqName@77) = LazyJavaPackageFragment@78['lang']
-    packageFragments('java.lang.String': FqName@79) = null
-    packageFragments('kotlin': FqName@80) = null
-    packageFragments('kotlin.String': FqName@81) = null
-    packageFragments('kotlin.io': FqName@82) = null
-    packageFragments('kotlin.jvm': FqName@83) = null
-    topLevelClasses(JavaClassImpl@27['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@84['NullPointerException']) = LazyJavaClassDescriptor@2['NullPointerException']
-    topLevelClasses(JavaClassImpl@29['RuntimeException']) = LazyJavaClassDescriptor@9['RuntimeException']
-}
-
-LazyJavaPackageFragment@73['<root>'] {
-    classes('NullPointerException': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('RuntimeException': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('NullPointerException': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('RuntimeException': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@76['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@78['lang'] {
-    classes('NullPointerException': Name@85) = LazyJavaClassDescriptor@2['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('RuntimeException': Name@87) = LazyJavaClassDescriptor@9['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('NullPointerException': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('RuntimeException': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
deleted file mode 100644
index 9e15a5996c4..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
-}
-
-LazyJavaClassifierType@4['Throwable'] {
-    arguments = ArrayList@5[empty]
-    classifier = JavaClassImpl@6['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Exception': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Exception': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Exception': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    topLevelClasses(JavaClassImpl@24['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Exception': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Exception': Name@25) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
deleted file mode 100644
index 561af58d126..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
+++ /dev/null
@@ -1,186 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyJavaClassDescriptor@6['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassDescriptor@8['NullPointerException'] {
-    constructors = ArrayList@9[2] { JavaConstructorDescriptor@10['<init>'], JavaConstructorDescriptor@11['<init>'] } // through LazyJavaClassMemberScope@12
-    defaultType = JetTypeImpl@13['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@14['NullPointerException']
-}
-
-LazyJavaClassDescriptor@15['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@16['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@14['NullPointerException'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@16['RuntimeException'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Exception'] }
-}
-
-LazyJavaClassifierType@25['Exception'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassifierType@22['RuntimeException'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@16['RuntimeException']
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@19['Throwable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('Boolean': FqName@44) = null
-    packageFragments('String': FqName@45) = null
-    packageFragments('inline': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.Boolean': FqName@51) = null
-    packageFragments('java.lang.String': FqName@52) = null
-    packageFragments('java.lang.inline': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.Boolean': FqName@55) = null
-    packageFragments('kotlin.String': FqName@56) = null
-    packageFragments('kotlin.inline': FqName@57) = null
-    packageFragments('kotlin.io': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = null
-    topLevelClasses(JavaClassImpl@27['Exception']) = LazyJavaClassDescriptor@6['Exception']
-    topLevelClasses(JavaClassImpl@60['NullPointerException']) = LazyJavaClassDescriptor@8['NullPointerException']
-    topLevelClasses(JavaClassImpl@29['RuntimeException']) = LazyJavaClassDescriptor@15['RuntimeException']
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('Boolean': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('NullPointerException': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('String': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('inline': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    classes('NullPointerException': Name@63) = LazyJavaClassDescriptor@8['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.lazy.log
deleted file mode 100644
index e12080439d8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/ReturnFromFunctionInObject.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['X']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('X': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.X': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.X': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('m': FqName@23) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
deleted file mode 100644
index 84c5a7866cf..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('f': FqName@6) = null
-    packageFragments('f.Array': FqName@7) = null
-    packageFragments('f.Int': FqName@8) = null
-    packageFragments('f.String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('box': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('local': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('box': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('local': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
deleted file mode 100644
index 9f4dc674798..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('JavaClassifierType': FqName@3) = null
-    packageFragments('JetType': FqName@4) = null
-    packageFragments('TypeUsage': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.JavaClassifierType': FqName@10) = null
-    packageFragments('java.lang.JetType': FqName@11) = null
-    packageFragments('java.lang.TypeUsage': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.JavaClassifierType': FqName@14) = null
-    packageFragments('kotlin.JetType': FqName@15) = null
-    packageFragments('kotlin.TypeUsage': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
deleted file mode 100644
index 1d507982aa2..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
deleted file mode 100644
index 4d9d46401c3..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
-}
-
-LazyJavaClassifierType@4['Throwable'] {
-    arguments = ArrayList@5[empty]
-    classifier = JavaClassImpl@6['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Array': FqName@11) = null
-    packageFragments('Exception': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Array': FqName@18) = null
-    packageFragments('java.lang.Exception': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Array': FqName@22) = null
-    packageFragments('kotlin.Exception': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('kt1001': FqName@27) = null
-    packageFragments('kt1001.Array': FqName@28) = null
-    packageFragments('kt1001.Exception': FqName@29) = null
-    packageFragments('kt1001.Int': FqName@30) = null
-    topLevelClasses(JavaClassImpl@31['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('Exception': Name@38) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('doSmth': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('doSmth': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
deleted file mode 100644
index 0c69c57dae2..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
+++ /dev/null
@@ -1,135 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.List': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.List': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1027': FqName@16) = null
-    packageFragments('kt1027.Int': FqName@17) = null
-    packageFragments('kt1027.List': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('doSmth': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plusAssign': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('doSmth': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plusAssign': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@58, ResolutionCandidate@59, ResolutionCandidate@60, ... }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
deleted file mode 100644
index cda14d3e1c5..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
+++ /dev/null
@@ -1,196 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Char']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Char': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Set': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Char': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Set': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Char': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Set': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1066': FqName@21) = null
-    packageFragments('kt1066.Char': FqName@22) = null
-    packageFragments('kt1066.Int': FqName@23) = null
-    packageFragments('kt1066.Set': FqName@24) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('randomDigit': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plusAssign': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('randomDigit': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@133[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@134[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@135[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
deleted file mode 100644
index f75c219d7c8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
+++ /dev/null
@@ -1,413 +0,0 @@
-LazyJavaClassDescriptor@0['Appendable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassDescriptor@6['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@10['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassDescriptor@14['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
-}
-
-LazyJavaClassDescriptor@16['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@20['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassDescriptor@24['PrintStream'] {
-    defaultType = JetTypeImpl@25['PrintStream']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
-    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
-    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassDescriptor@37['RuntimeException'] {
-    constructors = ArrayList@38[5] { JavaConstructorDescriptor@39['<init>'], JavaConstructorDescriptor@40['<init>'], JavaConstructorDescriptor@41['<init>'], ... } // through LazyJavaClassMemberScope@42
-    defaultType = JetTypeImpl@43['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@44['RuntimeException']
-}
-
-LazyJavaClassDescriptor@45['System'] {
-    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@48 // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaStaticClassScope@50
-    nestedClassIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@47
-    nestedClasses('out': Name@52) = null // through LazyJavaClassMemberScope@47
-    properties('out': Name@52) = ArrayList@53[1] { JavaPropertyDescriptor@54['out'] } // through LazyJavaStaticClassScope@50
-    properties('out': Name@52) = EmptyList@2[empty] // through LazyJavaClassMemberScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@55['System']
-}
-
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@15['Exception'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@23['OutputStream'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@36['PrintStream'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[3] { LazyJavaClassifierType@75['FilterOutputStream'], LazyJavaClassifierType@76['Appendable'], LazyJavaClassifierType@77['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@44['RuntimeException'] {
-    parameters = ArrayList@78[empty]
-    supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@55['System'] {
-    supertypes = ArrayList@81[1] { JetTypeImpl@58['Any'] }
-}
-
-LazyJavaClassifierType@76['Appendable'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@83['Appendable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassifierType@63['AutoCloseable'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassifierType@72['Closeable'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@77['Closeable'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@80['Exception'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@91['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
-}
-
-LazyJavaClassifierType@75['FilterOutputStream'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@93['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassifierType@94['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@95
-}
-
-LazyJavaClassifierType@96['Object'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['Object']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@101['Object'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@98['Object']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@104['Object'] {
-    classifier = JavaClassImpl@105['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@106['Object'] {
-    classifier = JavaClassImpl@107['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@108['Object'] {
-    classifier = JavaClassImpl@109['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@110['Object'] {
-    classifier = JavaClassImpl@111['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@69['OutputStream'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['OutputStream']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassifierType@114['PrintStream'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['PrintStream']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@99
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@117['PrintStream'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@116['PrintStream']
-    nullable = 'true': Boolean@103
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@119['String'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@123['String'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@129['String'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@131['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@132['String'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@121['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@134['String'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@131['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@136['String'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@138['String'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@128['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@122
-}
-
-LazyJavaClassifierType@140['Throwable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@142['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@144['Throwable'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@147['Throwable'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@150['Throwable'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@149['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@152['Throwable'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaClassImpl@146['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@154['Throwable'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@142['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@66['Throwable'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaClassImpl@157['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaPackageFragmentProvider@158 {
-    packageFragments('<root>': FqName@159) = LazyJavaPackageFragment@160['<root>']
-    packageFragments('Int': FqName@161) = null
-    packageFragments('System': FqName@162) = null
-    packageFragments('java': FqName@163) = LazyJavaPackageFragment@164['java']
-    packageFragments('java.io': FqName@165) = LazyJavaPackageFragment@166['io']
-    packageFragments('java.lang': FqName@167) = LazyJavaPackageFragment@168['lang']
-    packageFragments('java.lang.Int': FqName@169) = null
-    packageFragments('java.lang.System': FqName@170) = null
-    packageFragments('kotlin': FqName@171) = null
-    packageFragments('kotlin.Int': FqName@172) = null
-    packageFragments('kotlin.System': FqName@173) = null
-    packageFragments('kotlin.io': FqName@174) = null
-    packageFragments('kotlin.jvm': FqName@175) = null
-    topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
-    topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@14['Exception']
-    topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
-    topLevelClasses(JavaClassImpl@116['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
-    topLevelClasses(JavaClassImpl@176['RuntimeException']) = LazyJavaClassDescriptor@37['RuntimeException']
-    topLevelClasses(JavaClassImpl@177['System']) = LazyJavaClassDescriptor@45['System']
-}
-
-LazyJavaPackageFragment@160['<root>'] {
-    classes('Int': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('RuntimeException': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('System': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@179
-}
-
-LazyJavaPackageFragment@164['java'] {
-    classes('lang': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('lang': Name@186) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@187 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-LazyJavaPackageFragment@168['lang'] {
-    classes('RuntimeException': Name@180) = LazyJavaClassDescriptor@37['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('System': Name@181) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@188
-    deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@188
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[4] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@213[10] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@218[5] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
deleted file mode 100644
index 585f397098b..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
+++ /dev/null
@@ -1,325 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Color': FqName@5) = null
-    packageFragments('Direction': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Color': FqName@12) = null
-    packageFragments('java.lang.Direction': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Color': FqName@16) = null
-    packageFragments('kotlin.Direction': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1185': FqName@21) = null
-    packageFragments('kt1185.A': FqName@22) = null
-    packageFragments('kt1185.Color': FqName@23) = null
-    packageFragments('kt1185.Direction': FqName@24) = null
-    packageFragments('kt1185.Int': FqName@25) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
deleted file mode 100644
index 382ddb72fea..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
+++ /dev/null
@@ -1,523 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['inline']
-    valueArguments(ValueParameterDescriptorImpl@4['strategy']) = null
-}
-
-LazyJavaClassDescriptor@5['Lock'] {
-    defaultType = JetTypeImpl@6['Lock']
-    functions('lock': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['lock'] } // through LazyJavaClassMemberScope@10
-    functions('unlock': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['unlock'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassDescriptor@17['ReadLock'] {
-    defaultType = JetTypeImpl@18['ReadLock']
-    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@20
-    functions('lock': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['lock'] } // through LazyJavaClassMemberScope@20
-    functions('unlock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['unlock'] } // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@20
-    nestedClasses('lock': Name@21) = null // through LazyJavaClassMemberScope@20
-    nestedClasses('unlock': Name@24) = null // through LazyJavaClassMemberScope@20
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
-}
-
-LazyJavaClassDescriptor@31['ReadWriteLock'] {
-    defaultType = JetTypeImpl@32['ReadWriteLock']
-    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
-    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
-    functions('readLock': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['readLock'] } // through LazyJavaClassMemberScope@35
-    functions('writeLock': Name@40) = ArrayList@41[1] { JavaMethodDescriptor@42['writeLock'] } // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@35
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@44['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
-}
-
-LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] {
-    defaultType = JetTypeImpl@47['ReentrantReadWriteLock']
-    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@49
-    functionTypeForSamInterface = null
-    functions('getReadHoldCount': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['getReadHoldCount'] } // through LazyJavaClassMemberScope@49
-    functions('getWriteHoldCount': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['getWriteHoldCount'] } // through LazyJavaClassMemberScope@49
-    functions('readLock': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['readLock'] } // through LazyJavaClassMemberScope@49
-    functions('writeLock': Name@59) = ArrayList@60[1] { JavaMethodDescriptor@61['writeLock'] } // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@62 // through LazyJavaClassMemberScope@49
-    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@49
-    nestedClasses('ReadLock': Name@64) = LazyJavaClassDescriptor@17['ReadLock'] // through LazyJavaClassMemberScope@49
-    nestedClasses('WriteLock': Name@65) = LazyJavaClassDescriptor@66['WriteLock'] // through LazyJavaClassMemberScope@49
-    nestedClasses('getReadHoldCount': Name@50) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('getWriteHoldCount': Name@53) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('readLock': Name@56) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('writeLock': Name@59) = null // through LazyJavaClassMemberScope@49
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock']
-}
-
-LazyJavaClassDescriptor@69['Serializable'] {
-    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    functions('lock': Name@7) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    functions('readLock': Name@37) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    functions('unlock': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    functions('writeLock': Name@40) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
-    memberIndex = computeMemberIndex$1@71 // through LazyJavaClassMemberScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
-}
-
-LazyJavaClassDescriptor@66['WriteLock'] {
-    defaultType = JetTypeImpl@73['WriteLock']
-    enumEntryIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@75
-    functions('lock': Name@76) = ArrayList@77[1] { JavaMethodDescriptor@78['lock'] } // through LazyJavaClassMemberScope@75
-    functions('unlock': Name@79) = ArrayList@80[1] { JavaMethodDescriptor@81['unlock'] } // through LazyJavaClassMemberScope@75
-    memberIndex = computeMemberIndex$1@82 // through LazyJavaClassMemberScope@75
-    nestedClassIndex = LinkedHashMap@83 // through LazyJavaClassMemberScope@75
-    nestedClasses('lock': Name@76) = null // through LazyJavaClassMemberScope@75
-    nestedClasses('unlock': Name@79) = null // through LazyJavaClassMemberScope@75
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@84['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
-}
-
-LazyJavaClassTypeConstructor@16['Lock'] {
-    parameters = ArrayList@86[empty]
-    supertypes = ArrayList@87[1] { JetTypeImpl@88['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['ReadLock'] {
-    parameters = ArrayList@89[empty]
-    supertypes = ArrayList@90[2] { LazyJavaClassifierType@91['Lock'], LazyJavaClassifierType@92['Serializable'] }
-}
-
-LazyJavaClassTypeConstructor@45['ReadWriteLock'] {
-    parameters = ArrayList@93[empty]
-    supertypes = ArrayList@94[1] { JetTypeImpl@88['Any'] }
-}
-
-LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock'] {
-    parameters = ArrayList@95[empty]
-    supertypes = ArrayList@96[2] { LazyJavaClassifierType@97['ReadWriteLock'], LazyJavaClassifierType@98['Serializable'] }
-}
-
-LazyJavaClassTypeConstructor@72['Serializable'] {
-    parameters = ArrayList@99[empty]
-    supertypes = ArrayList@100[1] { JetTypeImpl@88['Any'] }
-}
-
-LazyJavaClassTypeConstructor@85['WriteLock'] {
-    parameters = ArrayList@101[empty]
-    supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['Lock'], LazyJavaClassifierType@104['Serializable'] }
-}
-
-LazyJavaClassifierType@103['Lock'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['Lock']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@91['Lock'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Lock']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@109['Lock'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@111['Lock']
-    nullable = 'false': Boolean@112
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@113['Lock'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['Lock']
-    nullable = 'false': Boolean@112
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@116['Lock'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@115['Lock']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@119['Lock'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@111['Lock']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
-}
-
-LazyJavaClassifierType@121['Object'] {
-    classifier = JavaClassImpl@122['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@124['Object'] {
-    classifier = JavaClassImpl@125['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@126['Object'] {
-    classifier = JavaClassImpl@127['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@128['Object'] {
-    classifier = JavaClassImpl@129['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@130['Object'] {
-    classifier = JavaClassImpl@131['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@132['Object'] {
-    classifier = JavaClassImpl@133['Object']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@134['ReadLock'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@136['ReadLock']
-    memberScope = LazyJavaClassMemberScope@20
-    nullable = 'false': Boolean@112
-    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
-}
-
-LazyJavaClassifierType@137['ReadLock'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@136['ReadLock']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
-}
-
-LazyJavaClassifierType@97['ReadWriteLock'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@140['ReadWriteLock']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
-}
-
-LazyJavaClassifierType@92['Serializable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@142['Serializable']
-    memberScope = LazyJavaClassMemberScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
-}
-
-LazyJavaClassifierType@104['Serializable'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['Serializable']
-    memberScope = LazyJavaClassMemberScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
-}
-
-LazyJavaClassifierType@98['Serializable'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['Serializable']
-    memberScope = LazyJavaClassMemberScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
-}
-
-LazyJavaClassifierType@147['WriteLock'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['WriteLock']
-    memberScope = LazyJavaClassMemberScope@75
-    nullable = 'false': Boolean@112
-    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
-}
-
-LazyJavaClassifierType@150['WriteLock'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@149['WriteLock']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
-}
-
-LazyJavaPackageFragmentProvider@152 {
-    packageFragments('<root>': FqName@153) = LazyJavaPackageFragment@154['<root>']
-    packageFragments('ReentrantReadWriteLock': FqName@155) = null
-    packageFragments('T': FqName@156) = null
-    packageFragments('inline': FqName@157) = null
-    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
-    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
-    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
-    packageFragments('java.lang.ReentrantReadWriteLock': FqName@164) = null
-    packageFragments('java.lang.T': FqName@165) = null
-    packageFragments('java.lang.inline': FqName@166) = null
-    packageFragments('java.util': FqName@167) = LazyJavaPackageFragment@168['util']
-    packageFragments('java.util.concurrent': FqName@169) = LazyJavaPackageFragment@170['concurrent']
-    packageFragments('java.util.concurrent.locks': FqName@171) = LazyJavaPackageFragment@172['locks']
-    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@173) = null
-    packageFragments('kotlin': FqName@174) = null
-    packageFragments('kotlin.ReentrantReadWriteLock': FqName@175) = null
-    packageFragments('kotlin.T': FqName@176) = null
-    packageFragments('kotlin.inline': FqName@177) = null
-    packageFragments('kotlin.io': FqName@178) = null
-    packageFragments('kotlin.jvm': FqName@179) = null
-    packageFragments('kt1189': FqName@180) = null
-    packageFragments('kt1189.ReentrantReadWriteLock': FqName@181) = null
-    packageFragments('kt1189.T': FqName@182) = null
-    packageFragments('kt1189.inline': FqName@183) = null
-    topLevelClasses(JavaClassImpl@115['Lock']) = LazyJavaClassDescriptor@5['Lock']
-    topLevelClasses(JavaClassImpl@140['ReadWriteLock']) = LazyJavaClassDescriptor@31['ReadWriteLock']
-    topLevelClasses(JavaClassImpl@184['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock']
-    topLevelClasses(JavaClassImpl@146['Serializable']) = LazyJavaClassDescriptor@69['Serializable']
-}
-
-LazyJavaPackageFragment@170['concurrent'] {
-    classes('locks': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@186
-    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@186
-    functions('locks': Name@188) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@186
-    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@186
-}
-
-LazyJavaPackageFragment@159['java'] {
-    classes('lang': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('util': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('lang': Name@193) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('util': Name@194) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@191
-}
-
-LazyJavaPackageFragment@163['lang'] {
-    classes('action': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('getReadHoldCount': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('getWriteHoldCount': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('readLock': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('writeLock': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('action': Name@196) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('getReadHoldCount': Name@50) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('getWriteHoldCount': Name@53) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('readLock': Name@56) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('writeLock': Name@59) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaPackageFragment@172['locks'] {
-    classes('ReentrantReadWriteLock': Name@199) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('ReentrantReadWriteLock': Name@201) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@200
-}
-
-LazyJavaPackageFragment@168['util'] {
-    classes('concurrent': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('concurrent': Name@205) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@206 // through LazyPackageFragmentScopeForJavaPackage@204
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[7] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[7] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[7] { ResolutionCandidate@322, ResolutionCandidate@323, ResolutionCandidate@324, ... }
-}
-
-null {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@356[7] { ResolutionCandidate@317, ResolutionCandidate@318, ResolutionCandidate@319, ... }
-    <name not found> = ArrayList@357[7] { ResolutionCandidate@312, ResolutionCandidate@313, ResolutionCandidate@314, ... }
-    <name not found> = ArrayList@358[7] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
-    <name not found> = ArrayList@359[7] { ResolutionCandidate@322, ResolutionCandidate@323, ResolutionCandidate@324, ... }
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
deleted file mode 100644
index 14875c4496d..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['Any']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('FunctionalList': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.FunctionalList': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.FunctionalList': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kt1191': FqName@25) = null
-    packageFragments('kt1191.FunctionalList': FqName@26) = null
-    packageFragments('kt1191.Int': FqName@27) = null
-    packageFragments('kt1191.T': FqName@28) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
deleted file mode 100644
index f3707adc42e..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
+++ /dev/null
@@ -1,377 +0,0 @@
-LazyJavaClassDescriptor@0['Appendable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassDescriptor@6['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@10['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassDescriptor@14['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@18['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
-}
-
-LazyJavaClassDescriptor@22['PrintStream'] {
-    defaultType = JetTypeImpl@23['PrintStream']
-    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@25
-    functions('println': Name@26) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
-    nestedClasses('println': Name@26) = null // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassDescriptor@35['System'] {
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaStaticClassScope@40
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@37
-    nestedClasses('out': Name@42) = null // through LazyJavaClassMemberScope@37
-    properties('out': Name@42) = ArrayList@43[1] { JavaPropertyDescriptor@44['out'] } // through LazyJavaStaticClassScope@40
-    properties('out': Name@42) = EmptyList@2[empty] // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@45['System']
-}
-
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    parameters = ArrayList@46[empty]
-    supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    parameters = ArrayList@49[empty]
-    supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@21['OutputStream'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@34['PrintStream'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[3] { LazyJavaClassifierType@62['FilterOutputStream'], LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@45['System'] {
-    supertypes = ArrayList@65[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassifierType@63['Appendable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Appendable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassifierType@53['AutoCloseable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassifierType@59['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@64['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@62['FilterOutputStream'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassifierType@76['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@77
-}
-
-LazyJavaClassifierType@78['Object'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['Object']
-    nullable = 'false': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@83['Object'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@80['Object']
-    nullable = 'true': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@56['OutputStream'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['OutputStream']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
-}
-
-LazyJavaClassifierType@96['PrintStream'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['PrintStream']
-    memberScope = LazyJavaClassMemberScope@25
-    nullable = 'false': Boolean@81
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassifierType@99['PrintStream'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@98['PrintStream']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassifierType@101['String'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'false': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@105['String'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'true': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaPackageFragmentProvider@107 {
-    packageFragments('<root>': FqName@108) = LazyJavaPackageFragment@109['<root>']
-    packageFragments('Iterable': FqName@110) = null
-    packageFragments('R': FqName@111) = null
-    packageFragments('System': FqName@112) = null
-    packageFragments('T': FqName@113) = null
-    packageFragments('Unit': FqName@114) = null
-    packageFragments('java': FqName@115) = LazyJavaPackageFragment@116['java']
-    packageFragments('java.io': FqName@117) = LazyJavaPackageFragment@118['io']
-    packageFragments('java.lang': FqName@119) = LazyJavaPackageFragment@120['lang']
-    packageFragments('java.lang.Iterable': FqName@121) = null
-    packageFragments('java.lang.R': FqName@122) = null
-    packageFragments('java.lang.System': FqName@123) = null
-    packageFragments('java.lang.T': FqName@124) = null
-    packageFragments('java.lang.Unit': FqName@125) = null
-    packageFragments('kotlin': FqName@126) = null
-    packageFragments('kotlin.Iterable': FqName@127) = null
-    packageFragments('kotlin.R': FqName@128) = null
-    packageFragments('kotlin.System': FqName@129) = null
-    packageFragments('kotlin.T': FqName@130) = null
-    packageFragments('kotlin.Unit': FqName@131) = null
-    packageFragments('kotlin.io': FqName@132) = null
-    packageFragments('kotlin.jvm': FqName@133) = null
-    packageFragments('kt1219': FqName@134) = null
-    packageFragments('kt1219.Iterable': FqName@135) = null
-    packageFragments('kt1219.R': FqName@136) = null
-    packageFragments('kt1219.System': FqName@137) = null
-    packageFragments('kt1219.T': FqName@138) = null
-    packageFragments('kt1219.Unit': FqName@139) = null
-    topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
-    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@18['OutputStream']
-    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@22['PrintStream']
-    topLevelClasses(JavaClassImpl@140['System']) = LazyJavaClassDescriptor@35['System']
-}
-
-LazyJavaPackageFragment@116['java'] {
-    classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('lang': Name@144) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaPackageFragment@120['lang'] {
-    classes('System': Name@146) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bar': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foreach': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('op': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('operation': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('bar': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('foreach': Name@149) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('op': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('operation': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@147
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@213[10] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
deleted file mode 100644
index 034d76cb473..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
+++ /dev/null
@@ -1,259 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1571': FqName@21) = null
-    packageFragments('kt1571.A': FqName@22) = null
-    packageFragments('kt1571.Int': FqName@23) = null
-    packageFragments('kt1571.String': FqName@24) = null
-    packageFragments('kt1571.a': FqName@25) = null
-    packageFragments('kt1571.c0': FqName@26) = null
-    packageFragments('kt1571.c1': FqName@27) = null
-    packageFragments('kt1571.c2': FqName@28) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('a': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c0': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c1': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('c2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('div': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('timesAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('div': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('timesAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
deleted file mode 100644
index ac3480c8df5..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1977.lazy.log
+++ /dev/null
@@ -1,282 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['IllegalArgumentException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
-}
-
-LazyJavaClassDescriptor@4['Integer'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functions('parseInt': Name@7) = ArrayList@8[2] { JavaMethodDescriptor@9['parseInt'], JavaMethodDescriptor@10['parseInt'] } // through LazyJavaStaticClassScope@11
-    functions('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@6
-    nestedClasses('parseInt': Name@7) = null // through LazyJavaClassMemberScope@6
-    properties('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    properties('parseInt': Name@7) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@16['Integer']
-}
-
-LazyJavaClassDescriptor@17['NumberFormatException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@18['NumberFormatException']
-}
-
-LazyJavaClassDescriptor@19['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['IllegalArgumentException'] {
-    parameters = ArrayList@24[empty]
-    supertypes = ArrayList@25[1] { LazyJavaClassifierType@26['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@16['Integer'] {
-    supertypes = ArrayList@27[2] { LazyJavaClassifierType@28['Number'], LazyJavaClassifierType@29['Comparable<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@18['NumberFormatException'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['IllegalArgumentException'] }
-}
-
-LazyJavaClassTypeConstructor@20['RuntimeException'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Exception'] }
-}
-
-LazyJavaClassifierType@29['Comparable<Integer>'] {
-    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    classifier = JavaClassImpl@38['Comparable']
-    memberScope = SubstitutingScope@39
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@35['Exception'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@32['IllegalArgumentException'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['IllegalArgumentException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['IllegalArgumentException']
-}
-
-LazyJavaClassifierType@45['Integer'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Integer']
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['Integer'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Integer']
-    nullable = 'true': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@28['Number'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['Number']
-    memberScope = DeserializedClassMemberScope@55
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@26['RuntimeException'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaClassImpl@58['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@20['RuntimeException']
-}
-
-LazyJavaClassifierType@59['String'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['String'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@65['String']
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@66['String'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'true': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@68['String'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@65['String']
-    nullable = 'true': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@23['Throwable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaPackageFragmentProvider@73 {
-    packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
-    packageFragments('Exception': FqName@76) = null
-    packageFragments('Int': FqName@77) = null
-    packageFragments('Integer': FqName@78) = null
-    packageFragments('NumberFormatException': FqName@79) = null
-    packageFragments('String': FqName@80) = null
-    packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
-    packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
-    packageFragments('java.lang.Exception': FqName@85) = null
-    packageFragments('java.lang.Int': FqName@86) = null
-    packageFragments('java.lang.Integer': FqName@87) = null
-    packageFragments('java.lang.NumberFormatException': FqName@88) = null
-    packageFragments('java.lang.String': FqName@89) = null
-    packageFragments('kotlin': FqName@90) = null
-    packageFragments('kotlin.Exception': FqName@91) = null
-    packageFragments('kotlin.Int': FqName@92) = null
-    packageFragments('kotlin.Integer': FqName@93) = null
-    packageFragments('kotlin.NumberFormatException': FqName@94) = null
-    packageFragments('kotlin.String': FqName@95) = null
-    packageFragments('kotlin.io': FqName@96) = null
-    packageFragments('kotlin.jvm': FqName@97) = null
-    packageFragments('kt1977': FqName@98) = null
-    packageFragments('kt1977.Exception': FqName@99) = null
-    packageFragments('kt1977.Int': FqName@100) = null
-    packageFragments('kt1977.Integer': FqName@101) = null
-    packageFragments('kt1977.NumberFormatException': FqName@102) = null
-    packageFragments('kt1977.String': FqName@103) = null
-    topLevelClasses(JavaClassImpl@42['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@44['IllegalArgumentException']) = LazyJavaClassDescriptor@2['IllegalArgumentException']
-    topLevelClasses(JavaClassImpl@104['Integer']) = LazyJavaClassDescriptor@4['Integer']
-    topLevelClasses(JavaClassImpl@105['NumberFormatException']) = LazyJavaClassDescriptor@17['NumberFormatException']
-    topLevelClasses(JavaClassImpl@58['RuntimeException']) = LazyJavaClassDescriptor@19['RuntimeException']
-}
-
-LazyJavaPackageFragment@82['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@109) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@84['lang'] {
-    classes('Exception': Name@111) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Integer': Name@113) = LazyJavaClassDescriptor@4['Integer'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('NumberFormatException': Name@114) = LazyJavaClassDescriptor@17['NumberFormatException'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('bar': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@108 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('bar': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-null {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@152[2] { ResolutionCandidate@138, ResolutionCandidate@139 }
-    <name not found> = ArrayList@153[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
-    <name not found> = ArrayList@154[2] { ResolutionCandidate@142, ResolutionCandidate@143 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
deleted file mode 100644
index 70db267e3f2..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.Boolean': FqName@6) = null
-    packageFragments('a.Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Boolean': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
deleted file mode 100644
index c78df8407c8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.A': FqName@11) = null
-    packageFragments('a.B': FqName@12) = null
-    packageFragments('a.Int': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
deleted file mode 100644
index abcddd0f03a..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
+++ /dev/null
@@ -1,281 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.Int': FqName@9) = null
-    packageFragments('a.P': FqName@10) = null
-    packageFragments('a.R': FqName@11) = null
-    packageFragments('a.p': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.p': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.p': FqName@23) = null
-    packageFragments('p': FqName@24) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('P': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('other': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('P': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('p': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2334.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
deleted file mode 100644
index e00f80e3fcc..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
+++ /dev/null
@@ -1,192 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('Array': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.Array': FqName@61) = null
-    packageFragments('java.lang.Int': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Any': FqName@65) = null
-    packageFragments('kotlin.Array': FqName@66) = null
-    packageFragments('kotlin.Int': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Array': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Int': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@110[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@111[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
deleted file mode 100644
index b57900a5c51..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
+++ /dev/null
@@ -1,285 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    supertypes = ArrayList@25[5] { LazyJavaClassifierType@26['AbstractList<E>'], LazyJavaClassifierType@27['List<E>'], LazyJavaClassifierType@28['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@13['RandomAccess'] {
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@31[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@32['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@26['AbstractList<E>'] {
-    arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
-    classifier = JavaClassImpl@35['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@36['Cloneable'] {
-    classifier = JavaClassImpl@37['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@38
-}
-
-LazyJavaClassifierType@39['Collection<? extends E>'] {
-    arguments = ArrayList@40[1] { TypeProjectionImpl@41 }
-    classifier = JavaClassImpl@42['Collection']
-    memberScope = SubstitutingScope@43
-    nullable = 'false': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Collection<? extends E>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@42['Collection']
-    memberScope = SubstitutingScope@49
-    nullable = 'true': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@17['Collection<E>'] {
-    classifier = JavaClassImpl@52['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@53['E'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@57['E'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@69['E'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@22['List<E>'] {
-    arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
-    classifier = JavaClassImpl@77['List']
-    memberScope = SubstitutingScope@78
-    nullable = 'false': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@27['List<E>'] {
-    classifier = JavaClassImpl@80['List']
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@84['Object'] {
-    classifier = JavaClassImpl@85['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@28['RandomAccess'] {
-    classifier = JavaClassImpl@88['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassifierType@89['Serializable'] {
-    classifier = JavaClassImpl@90['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@91 {
-    packageFragments('<root>': FqName@92) = LazyJavaPackageFragment@93['<root>']
-    packageFragments('Int': FqName@94) = null
-    packageFragments('MutableList': FqName@95) = null
-    packageFragments('h': FqName@96) = null
-    packageFragments('h.Int': FqName@97) = null
-    packageFragments('h.MutableList': FqName@98) = null
-    packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
-    packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
-    packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
-    packageFragments('java.lang.Int': FqName@105) = null
-    packageFragments('java.lang.MutableList': FqName@106) = null
-    packageFragments('java.util': FqName@107) = LazyJavaPackageFragment@108['util']
-    packageFragments('java.util.ArrayList': FqName@109) = null
-    packageFragments('kotlin': FqName@110) = null
-    packageFragments('kotlin.Int': FqName@111) = null
-    packageFragments('kotlin.MutableList': FqName@112) = null
-    packageFragments('kotlin.io': FqName@113) = null
-    packageFragments('kotlin.jvm': FqName@114) = null
-    topLevelClasses(JavaClassImpl@32['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@35['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@115['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@88['RandomAccess']) = LazyJavaClassDescriptor@12['RandomAccess']
-    topLevelClasses(JavaClassImpl@90['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@100['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('util': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@120) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('util': Name@122) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@117
-}
-
-LazyJavaPackageFragment@104['lang'] {
-    classes('ArrayList': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('equals': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('ArrayList': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('equals': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-LazyJavaPackageFragment@108['util'] {
-    classes('ArrayList': Name@128) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@129
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('ArrayList': Name@130) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@129
-}
-
-LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@132['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@133[1] { NullableType@134 }
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaTypeParameterResolver@135 {
-    resolve(JavaTypeParameterImpl@136['E']) = LazyJavaTypeParameterDescriptor@24['E']
-}
-
-LazyJavaTypeParameterResolver@137 {
-    resolve(JavaTypeParameterImpl@138['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@121[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
-
-null {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-    <name not found> = ArrayList@168[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
deleted file mode 100644
index b8e45ba1958..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
+++ /dev/null
@@ -1,171 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Any']
-    <name not found> = JetTypeImpl@5['Function0<1>']
-    <name not found> = JetTypeImpl@6['Function0<1>']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = MutableClassDescriptor$1@8
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Int': FqName@12) = null
-    packageFragments('b': FqName@13) = null
-    packageFragments('b.A': FqName@14) = null
-    packageFragments('b.Int': FqName@15) = null
-    packageFragments('b.P': FqName@16) = null
-    packageFragments('b.f': FqName@17) = null
-    packageFragments('b.g': FqName@18) = null
-    packageFragments('b.o': FqName@19) = null
-    packageFragments('b.p': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('P': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('a': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('doSmth': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('p': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('P': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('doSmth': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
deleted file mode 100644
index 7af40352ec3..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
+++ /dev/null
@@ -1,197 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@4['AutoCloseable'] {
-    defaultType = JetTypeImpl@5['AutoCloseable']
-    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('close': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['close'] } // through LazyJavaClassMemberScope@8
-    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@8
-    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['hashCode'] } // through LazyJavaClassMemberScope@8
-    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['toString'] } // through LazyJavaClassMemberScope@8
-    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@29['Closeable'] {
-    allDescriptors = ArrayList@30[4] { DeserializedSimpleFunctionDescriptor@31['hashCode'], JavaMethodDescriptor@32['close'], DeserializedSimpleFunctionDescriptor@33['toString'], ... } // through LazyJavaClassMemberScope@34
-    annotations = LazyJavaAnnotations@35
-    defaultType = JetTypeImpl@36['Closeable']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@34
-    functionTypeForSamInterface = JetTypeImpl@38['Function0<1>']
-    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    functions('close': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@32['close'] } // through LazyJavaClassMemberScope@34
-    functions('equals': Name@12) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['equals'] } // through LazyJavaClassMemberScope@34
-    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    functions('hashCode': Name@17) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@31['hashCode'] } // through LazyJavaClassMemberScope@34
-    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    functions('toString': Name@22) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@33['toString'] } // through LazyJavaClassMemberScope@34
-    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@34
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@34
-    nestedClasses('close': Name@47) = null // through LazyJavaClassMemberScope@34
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
-}
-
-LazyJavaClassDescriptor@50['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@51['Exception']
-}
-
-LazyJavaClassTypeConstructor@28['AutoCloseable'] {
-    parameters = ArrayList@52[empty]
-    supertypes = ArrayList@53[1] { JetTypeImpl@54['Any'] }
-}
-
-LazyJavaClassTypeConstructor@49['Closeable'] {
-    parameters = ArrayList@55[empty]
-    supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@51['Exception'] {
-    parameters = ArrayList@58[empty]
-    supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['Throwable'] }
-}
-
-LazyJavaClassifierType@57['AutoCloseable'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaClassImpl@62['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
-}
-
-LazyJavaClassifierType@63['Object'] {
-    classifier = JavaClassImpl@64['Object']
-    typeConstructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaClassifierType@60['Throwable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaPackageFragmentProvider@69 {
-    packageFragments('<root>': FqName@70) = LazyJavaPackageFragment@71['<root>']
-    packageFragments('Closeable': FqName@72) = null
-    packageFragments('Exception': FqName@73) = null
-    packageFragments('R': FqName@74) = null
-    packageFragments('T': FqName@75) = null
-    packageFragments('inline': FqName@76) = null
-    packageFragments('java': FqName@77) = LazyJavaPackageFragment@78['java']
-    packageFragments('java.io': FqName@79) = LazyJavaPackageFragment@80['io']
-    packageFragments('java.io.Closeable': FqName@81) = null
-    packageFragments('java.lang': FqName@82) = LazyJavaPackageFragment@83['lang']
-    packageFragments('java.lang.Closeable': FqName@84) = null
-    packageFragments('java.lang.Exception': FqName@85) = null
-    packageFragments('java.lang.R': FqName@86) = null
-    packageFragments('java.lang.T': FqName@87) = null
-    packageFragments('java.lang.inline': FqName@88) = null
-    packageFragments('kotlin': FqName@89) = null
-    packageFragments('kotlin.Closeable': FqName@90) = null
-    packageFragments('kotlin.Exception': FqName@91) = null
-    packageFragments('kotlin.R': FqName@92) = null
-    packageFragments('kotlin.T': FqName@93) = null
-    packageFragments('kotlin.inline': FqName@94) = null
-    packageFragments('kotlin.io': FqName@95) = null
-    packageFragments('kotlin.jvm': FqName@96) = null
-    topLevelClasses(JavaClassImpl@62['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
-    topLevelClasses(JavaClassImpl@97['Closeable']) = LazyJavaClassDescriptor@29['Closeable']
-    topLevelClasses(JavaClassImpl@98['Exception']) = LazyJavaClassDescriptor@50['Exception']
-}
-
-LazyJavaPackageFragment@71['<root>'] {
-    classes('Closeable': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Exception': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('inline': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('java': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('java': Name@106) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@80['io'] {
-    classes('Closeable': Name@108) = LazyJavaClassDescriptor@29['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('Closeable': Name@110) = ArrayList@111[1] { SamConstructorDescriptor@112['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaPackageFragment@78['java'] {
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('io': Name@117) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@118) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@83['lang'] {
-    classes('Exception': Name@101) = LazyJavaClassDescriptor@50['Exception'] // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-null {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.lazy.log
deleted file mode 100644
index e12080439d8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3444.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['X']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('X': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.X': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.X': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('m': FqName@23) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
deleted file mode 100644
index 5b32e551049..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.lazy.log
deleted file mode 100644
index f8fda801fbd..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt4405.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('d': FqName@6) = null
-    packageFragments('d.A': FqName@7) = null
-    packageFragments('d.Int': FqName@8) = null
-    packageFragments('d.closure': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
deleted file mode 100644
index 8ced7a82672..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Boolean': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Boolean': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt510': FqName@13) = null
-    packageFragments('kt510.Boolean': FqName@14) = null
-    packageFragments('kt510.Identifier1': FqName@15) = null
-    packageFragments('kt510.Identifier2': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('field': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
deleted file mode 100644
index d095769880c..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('kt607': FqName@18) = null
-    packageFragments('kt607.A': FqName@19) = null
-    packageFragments('kt607.Int': FqName@20) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
deleted file mode 100644
index ce215938771..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt609': FqName@19) = null
-    packageFragments('kt609.A': FqName@20) = null
-    packageFragments('kt609.B': FqName@21) = null
-    packageFragments('kt609.C': FqName@22) = null
-    packageFragments('kt609.Int': FqName@23) = null
-    packageFragments('kt609.String': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
deleted file mode 100644
index 8d1c5209f22..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-    packageFragments('kt610': FqName@10) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-ResolutionTaskHolder@17 {
-    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
-}
-
-null {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@19 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
deleted file mode 100644
index aa44677ce81..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt776': FqName@13) = null
-    packageFragments('kt776.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('doSmth': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('doSmth': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.lazy.log
deleted file mode 100644
index 37185c1aba3..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt843.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Array': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Array': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt843': FqName@16) = null
-    packageFragments('kt843.Array': FqName@17) = null
-    packageFragments('kt843.String': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
deleted file mode 100644
index 77ab04b444c..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('kt897': FqName@15) = null
-    packageFragments('kt897.A': FqName@16) = null
-    packageFragments('kt897.Int': FqName@17) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('i': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('j': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('k': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.lazy.log
deleted file mode 100644
index e668e30d4d2..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/localClasses.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('f': FqName@5) = null
-    packageFragments('f.Int': FqName@6) = null
-    packageFragments('f.String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
deleted file mode 100644
index 5266282446f..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Int': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.Int': FqName@6) = null
-    packageFragments('a.a': FqName@7) = null
-    packageFragments('a.b': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('a': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('b': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
deleted file mode 100644
index ea34cd055d9..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
+++ /dev/null
@@ -1,210 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['A']
-}
-
-DescriptorResolver@6 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('A': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Unit': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Unit': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('o': FqName@26) = null
-    packageFragments('o.A': FqName@27) = null
-    packageFragments('o.Int': FqName@28) = null
-    packageFragments('o.TestFunctionLiteral': FqName@29) = null
-    packageFragments('o.TestObjectLiteral': FqName@30) = null
-    packageFragments('o.TestOther': FqName@31) = null
-    packageFragments('o.Unit': FqName@32) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj1': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('sum': Name@43) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
-
-null {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@145[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@146[8] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
deleted file mode 100644
index 4529ad6b9e8..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Int': FqName@4) = null
-    packageFragments('aa': FqName@5) = null
-    packageFragments('aa.C': FqName@6) = null
-    packageFragments('aa.Int': FqName@7) = null
-    packageFragments('aa.a': FqName@8) = null
-    packageFragments('aa.b': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('b': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[8] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@81[8] { ResolutionCandidate@64, ResolutionCandidate@65, ResolutionCandidate@66, ... }
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
deleted file mode 100644
index cfaf6f4770c..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('AnonymousInitializers': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.String': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.String': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
deleted file mode 100644
index 15854501b94..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@4[empty]
-    supertypes = ArrayList@5[1] { LazyJavaClassifierType@6['Throwable'] }
-}
-
-LazyJavaClassifierType@6['Throwable'] {
-    arguments = ArrayList@7[empty]
-    classifier = JavaClassImpl@8['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@9
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('Any': FqName@13) = null
-    packageFragments('Exception': FqName@14) = null
-    packageFragments('Int': FqName@15) = null
-    packageFragments('String': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Any': FqName@21) = null
-    packageFragments('java.lang.Exception': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Any': FqName@26) = null
-    packageFragments('kotlin.Exception': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    topLevelClasses(JavaClassImpl@32['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('Any': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Exception': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('doSmth': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('Exception': Name@35) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('doSmth': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
deleted file mode 100644
index 7125a7e4b5e..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[8] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
deleted file mode 100644
index 870cb46ad76..00000000000
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Boolean': FqName@6) = null
-    packageFragments('Collection': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Collection': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Boolean': FqName@19) = null
-    packageFragments('kotlin.Collection': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Boolean': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Collection': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@84[7] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
deleted file mode 100644
index 4208d10186d..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('plusAssign': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('plusAssign': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@14 // through LazyPackageFragmentScopeForJavaPackage@11
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@6['lang'] {
-    classes('plusAssign': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plusAssign': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@56[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
deleted file mode 100644
index d2bcd1f3da3..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
+++ /dev/null
@@ -1,97 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Boolean': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Boolean': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('b': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('b': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('iterator': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('b': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('b': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
deleted file mode 100644
index ef78b0c6436..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Unit': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Unit': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
deleted file mode 100644
index 1c5b95ac1cb..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Coll': FqName@6) = null
-    packageFragments('It': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Coll': FqName@12) = null
-    packageFragments('java.lang.It': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Coll': FqName@15) = null
-    packageFragments('kotlin.It': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('It': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('It': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('It': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('iterator': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('It': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('iterator': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
deleted file mode 100644
index 40a0fcd19ec..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Coll': FqName@6) = null
-    packageFragments('It': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.It': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.It': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Coll': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('next': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Coll': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('hasNext': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('next': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Coll': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Coll': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
deleted file mode 100644
index 52fcd356150..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Unit': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Unit': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('call': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('call': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('f': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('call': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('call': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('f': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
deleted file mode 100644
index 1ff4e8ccceb..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
+++ /dev/null
@@ -1,116 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt1075': FqName@13) = null
-    packageFragments('kt1075.String': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('contains': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('contains': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[7] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
deleted file mode 100644
index 3a5e7e238d5..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('f': FqName@5) = null
-    packageFragments('f.Boolean': FqName@6) = null
-    packageFragments('f.Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Boolean': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
deleted file mode 100644
index 5145f5abdeb..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kt657': FqName@22) = null
-    packageFragments('kt657.A': FqName@23) = null
-    packageFragments('kt657.B': FqName@24) = null
-    packageFragments('kt657.Int': FqName@25) = null
-    packageFragments('kt657.Pair': FqName@26) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Pair': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('cond1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('cond2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('Pair': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('cond1': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('cond2': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@55[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
deleted file mode 100644
index 80f6a535354..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.lazy.log
+++ /dev/null
@@ -1,546 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaClassDescriptor@2['Appendable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassDescriptor@8['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@12['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassDescriptor@16['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@20['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassDescriptor@24['PrintStream'] {
-    defaultType = JetTypeImpl@25['PrintStream']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
-    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
-    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassDescriptor@37['System'] {
-    enumEntryIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaStaticClassScope@42
-    nestedClassIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@39
-    nestedClasses('out': Name@44) = null // through LazyJavaClassMemberScope@39
-    properties('out': Name@44) = ArrayList@45[1] { JavaPropertyDescriptor@46['out'] } // through LazyJavaStaticClassScope@42
-    properties('out': Name@44) = EmptyList@4[empty] // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@47['System']
-}
-
-LazyJavaClassTypeConstructor@7['Appendable'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@11['AutoCloseable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Closeable'] {
-    parameters = ArrayList@53[empty]
-    supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@23['OutputStream'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@36['PrintStream'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[3] { LazyJavaClassifierType@64['FilterOutputStream'], LazyJavaClassifierType@65['Appendable'], LazyJavaClassifierType@66['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@47['System'] {
-    supertypes = ArrayList@67[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassifierType@65['Appendable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['Appendable']
-    memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassifierType@55['AutoCloseable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassifierType@61['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@66['Closeable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@64['FilterOutputStream'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassifierType@78['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@79
-}
-
-LazyJavaClassifierType@80['Object'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@85['Object'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@58['OutputStream'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassifierType@98['PrintStream'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@101['PrintStream'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    nullable = 'true': Boolean@87
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@103['String'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@107['String'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaPackageFragmentProvider@109 {
-    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    packageFragments('Any': FqName@112) = null
-    packageFragments('Array': FqName@113) = null
-    packageFragments('Int': FqName@114) = null
-    packageFragments('String': FqName@115) = null
-    packageFragments('System': FqName@116) = null
-    packageFragments('Unit': FqName@117) = null
-    packageFragments('j': FqName@118) = null
-    packageFragments('java': FqName@119) = LazyJavaPackageFragment@120['java']
-    packageFragments('java.io': FqName@121) = LazyJavaPackageFragment@122['io']
-    packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
-    packageFragments('java.lang.Any': FqName@125) = null
-    packageFragments('java.lang.Array': FqName@126) = null
-    packageFragments('java.lang.Int': FqName@127) = null
-    packageFragments('java.lang.String': FqName@128) = null
-    packageFragments('java.lang.System': FqName@129) = null
-    packageFragments('java.lang.Unit': FqName@130) = null
-    packageFragments('java.lang.j': FqName@131) = null
-    packageFragments('kotlin': FqName@132) = null
-    packageFragments('kotlin.Any': FqName@133) = null
-    packageFragments('kotlin.Array': FqName@134) = null
-    packageFragments('kotlin.Int': FqName@135) = null
-    packageFragments('kotlin.String': FqName@136) = null
-    packageFragments('kotlin.System': FqName@137) = null
-    packageFragments('kotlin.Unit': FqName@138) = null
-    packageFragments('kotlin.io': FqName@139) = null
-    packageFragments('kotlin.j': FqName@140) = null
-    packageFragments('kotlin.jvm': FqName@141) = null
-    packageFragments('kt770_351_735': FqName@142) = null
-    packageFragments('kt770_351_735.Any': FqName@143) = null
-    packageFragments('kt770_351_735.Array': FqName@144) = null
-    packageFragments('kt770_351_735.Int': FqName@145) = null
-    packageFragments('kt770_351_735.String': FqName@146) = null
-    packageFragments('kt770_351_735.System': FqName@147) = null
-    packageFragments('kt770_351_735.Unit': FqName@148) = null
-    packageFragments('kt770_351_735.j': FqName@149) = null
-    packageFragments('kt770_351_735.w': FqName@150) = null
-    topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
-    topLevelClasses(JavaClassImpl@151['System']) = LazyJavaClassDescriptor@37['System']
-}
-
-LazyJavaPackageFragment@120['java'] {
-    classes('lang': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('lang': Name@155) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@153
-}
-
-LazyJavaPackageFragment@124['lang'] {
-    classes('System': Name@157) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('bar': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('doSmth': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('j': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('bar': Name@159) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('doSmth': Name@160) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('j': Name@162) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[10] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[7] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@296[10] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@335[7] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-    <name not found> = ArrayList@336[8] { ResolutionCandidate@290, ResolutionCandidate@291, ResolutionCandidate@292, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
deleted file mode 100644
index 6e077f12926..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt786': FqName@13) = null
-    packageFragments('kt786.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('bar': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
deleted file mode 100644
index 3bf4bb08276..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
+++ /dev/null
@@ -1,113 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Unit']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Nothing': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.Nothing': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Nothing': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt799': FqName@19) = null
-    packageFragments('kt799.Int': FqName@20) = null
-    packageFragments('kt799.Nothing': FqName@21) = null
-    packageFragments('kt799.a': FqName@22) = null
-    packageFragments('kt799.b': FqName@23) = null
-    packageFragments('kt799.c': FqName@24) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('doSmth': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('doSmth': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
deleted file mode 100644
index c476f6d5ba5..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
+++ /dev/null
@@ -1,69 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
-}
-
-LazyJavaClassifierType@4['Throwable'] {
-    arguments = ArrayList@5[empty]
-    classifier = JavaClassImpl@6['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Exception': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('a': FqName@13) = null
-    packageFragments('a.Exception': FqName@14) = null
-    packageFragments('a.Int': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Exception': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Exception': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    topLevelClasses(JavaClassImpl@27['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Exception': Name@34) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('doSmth': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('doSmth': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.lazy.log
deleted file mode 100644
index 43e4ce64da8..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/valVarCatchParameter.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
-}
-
-LazyJavaClassifierType@4['Throwable'] {
-    arguments = ArrayList@5[empty]
-    classifier = JavaClassImpl@6['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Exception': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Exception': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Exception': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    topLevelClasses(JavaClassImpl@21['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Exception': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('Exception': Name@22) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@30
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
deleted file mode 100644
index f1a17bf6934..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
-
-ResolutionTaskHolder@16 {
-    <name not found> = ArrayList@17[1] { ResolutionCandidate@18 }
-}
-
-ResolutionTaskHolder@19 {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[7] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@18 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@21 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@36, ResolutionCandidate@37, ResolutionCandidate@38, ... }
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@41, ResolutionCandidate@42, ResolutionCandidate@43, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
deleted file mode 100644
index bc8e509e2d7..00000000000
--- a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Pair': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Pair': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.Pair': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kt234_kt973': FqName@25) = null
-    packageFragments('kt234_kt973.A': FqName@26) = null
-    packageFragments('kt234_kt973.B': FqName@27) = null
-    packageFragments('kt234_kt973.Int': FqName@28) = null
-    packageFragments('kt234_kt973.Pair': FqName@29) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Pair': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Pair': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
deleted file mode 100644
index c25346211da..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('D': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.D': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.D': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
deleted file mode 100644
index bdfc7869db2..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.E': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.E': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-ResolutionTaskHolder@19 {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-}
-
-null {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
deleted file mode 100644
index 6aa589e69d2..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
+++ /dev/null
@@ -1,463 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('D': FqName@8) = null
-    packageFragments('E': FqName@9) = null
-    packageFragments('F': FqName@10) = null
-    packageFragments('G': FqName@11) = null
-    packageFragments('H': FqName@12) = null
-    packageFragments('a': FqName@13) = null
-    packageFragments('b': FqName@14) = null
-    packageFragments('c': FqName@15) = null
-    packageFragments('d': FqName@16) = null
-    packageFragments('e': FqName@17) = null
-    packageFragments('f': FqName@18) = null
-    packageFragments('g': FqName@19) = null
-    packageFragments('h': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.A': FqName@25) = null
-    packageFragments('java.lang.B': FqName@26) = null
-    packageFragments('java.lang.C': FqName@27) = null
-    packageFragments('java.lang.D': FqName@28) = null
-    packageFragments('java.lang.E': FqName@29) = null
-    packageFragments('java.lang.F': FqName@30) = null
-    packageFragments('java.lang.G': FqName@31) = null
-    packageFragments('java.lang.H': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.A': FqName@34) = null
-    packageFragments('kotlin.B': FqName@35) = null
-    packageFragments('kotlin.C': FqName@36) = null
-    packageFragments('kotlin.D': FqName@37) = null
-    packageFragments('kotlin.E': FqName@38) = null
-    packageFragments('kotlin.F': FqName@39) = null
-    packageFragments('kotlin.G': FqName@40) = null
-    packageFragments('kotlin.H': FqName@41) = null
-    packageFragments('kotlin.io': FqName@42) = null
-    packageFragments('kotlin.jvm': FqName@43) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('a': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('b': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('c': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('d': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('e': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('h': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('a': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('b': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('c': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('d': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('e': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('h': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('foo': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.lazy.log
deleted file mode 100644
index cea0ab167b1..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/javaKotlinJavaCycle.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    defaultType = JetTypeImpl@1['A']
-    typeConstructor = LazyJavaClassTypeConstructor@2['A']
-}
-
-LazyJavaClassDescriptor@3['C'] {
-    defaultType = JetTypeImpl@4['C']
-    typeConstructor = LazyJavaClassTypeConstructor@5['C']
-}
-
-LazyJavaClassTypeConstructor@2['A'] {
-    parameters = ArrayList@6[empty]
-    supertypes = ArrayList@7[1] { LazyJavaClassifierType@8['C'] }
-}
-
-LazyJavaClassTypeConstructor@5['C'] {
-    parameters = ArrayList@9[empty]
-    supertypes = ArrayList@10[1] { LazyJavaClassifierType@11['B'] }
-}
-
-LazyJavaClassifierType@11['B'] {
-    classifier = JavaClassImpl@12['B']
-    typeConstructor = TypeConstructorImpl$1@13
-}
-
-LazyJavaClassifierType@8['C'] {
-    classifier = JavaClassImpl@14['C']
-    typeConstructor = LazyJavaClassTypeConstructor@5['C']
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('B': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.A': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-    topLevelClasses(JavaClassImpl@29['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@14['C']) = LazyJavaClassDescriptor@3['C']
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('A': Name@30) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
deleted file mode 100644
index 915650e95bd..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    typeConstructor = LazyJavaClassTypeConstructor@5['J']
-}
-
-LazyJavaClassTypeConstructor@5['J'] {
-    parameters = ArrayList@6[empty]
-    supertypes = ArrayList@7[1] { LazyJavaClassifierType@8['K'] }
-}
-
-LazyJavaClassifierType@8['K'] {
-    classifier = JavaClassImpl@9['K']
-    typeConstructor = TypeConstructorImpl$1@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('J': FqName@14) = null
-    packageFragments('K': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.J': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.J': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    topLevelClasses(JavaClassImpl@25['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('J': Name@26) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
deleted file mode 100644
index df800e166d7..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    typeConstructor = LazyJavaClassTypeConstructor@5['J']
-}
-
-LazyJavaClassTypeConstructor@5['J'] {
-    parameters = ArrayList@6[empty]
-    supertypes = ArrayList@7[1] { LazyJavaClassifierType@8['I'] }
-}
-
-LazyJavaClassifierType@8['I'] {
-    classifier = JavaClassImpl@9['I']
-    typeConstructor = TypeConstructorImpl$1@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('I': FqName@14) = null
-    packageFragments('J': FqName@15) = null
-    packageFragments('K': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.J': FqName@21) = null
-    packageFragments('java.lang.K': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.J': FqName@24) = null
-    packageFragments('kotlin.K': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    topLevelClasses(JavaClassImpl@28['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('J': Name@29) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.lazy.log
deleted file mode 100644
index 44213cc1b71..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaNestedCycle.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-LazyJavaClassDescriptor@0['ExceptionHandlingStrategy'] {
-    defaultType = JetTypeImpl@1['ExceptionHandlingStrategy']
-    typeConstructor = LazyJavaClassTypeConstructor@2['ExceptionHandlingStrategy']
-}
-
-LazyJavaClassDescriptor@3['LockBasedStorageManager'] {
-    defaultType = JetTypeImpl@4['LockBasedStorageManager']
-    nestedClassIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    nestedClasses('ExceptionHandlingStrategy': Name@7) = LazyJavaClassDescriptor@0['ExceptionHandlingStrategy'] // through LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@8['LockBasedStorageManager']
-}
-
-LazyJavaClassTypeConstructor@2['ExceptionHandlingStrategy'] {
-    parameters = ArrayList@9[empty]
-    supertypes = ArrayList@10[1] { JetTypeImpl@11['Any'] }
-}
-
-LazyJavaClassTypeConstructor@8['LockBasedStorageManager'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['StorageManager'] }
-}
-
-LazyJavaClassifierType@15['Object'] {
-    classifier = JavaClassImpl@16['Object']
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@14['StorageManager'] {
-    classifier = JavaClassImpl@18['StorageManager']
-    typeConstructor = TypeConstructorImpl$1@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('ExceptionTracker': FqName@23) = null
-    packageFragments('LockBasedStorageManager': FqName@24) = null
-    packageFragments('StorageManager': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.ExceptionTracker': FqName@30) = null
-    packageFragments('java.lang.LockBasedStorageManager': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.ExceptionTracker': FqName@33) = null
-    packageFragments('kotlin.LockBasedStorageManager': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-    topLevelClasses(JavaClassImpl@37['LockBasedStorageManager']) = LazyJavaClassDescriptor@3['LockBasedStorageManager']
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('LockBasedStorageManager': Name@38) = LazyJavaClassDescriptor@3['LockBasedStorageManager'] // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
deleted file mode 100644
index db376f0441a..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
+++ /dev/null
@@ -1,67 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Bar': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Bar': FqName@12) = null
-    packageFragments('java.lang.Foo': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Bar': FqName@16) = null
-    packageFragments('kotlin.Foo': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('x': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Foo': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('Foo': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
deleted file mode 100644
index 62d313630b0..00000000000
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
deleted file mode 100644
index cc7946a067e..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
+++ /dev/null
@@ -1,173 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
deleted file mode 100644
index 35acb033d16..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('data': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.data': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.data': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('B': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('data': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('B': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component1': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('B': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('component1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('B': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('component1': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
deleted file mode 100644
index 6956e73a4c8..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
+++ /dev/null
@@ -1,255 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Any': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('data': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.data': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.Any': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.data': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component3': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('data': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component1': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component3': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component3': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component1': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component2': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component3': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
deleted file mode 100644
index 7965008d462..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('data': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.data': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.B': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.data': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('data': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
deleted file mode 100644
index 3a6f1d32c53..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('data': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.data': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.data': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('component1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('data': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('component1': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('component1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
deleted file mode 100644
index 4e12f60ef44..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
+++ /dev/null
@@ -1,96 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('data': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.data': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.data': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('A': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('A': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('A': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
deleted file mode 100644
index 624cb4b5f1f..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['data']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('data': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.data': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
deleted file mode 100644
index 3bd4e1b9121..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('B': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('data': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.data': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.data': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('data': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
deleted file mode 100644
index 41767b841dd..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('data': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.data': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.data': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('component1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('data': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('component1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component1': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
deleted file mode 100644
index bec0cc93ffe..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
deleted file mode 100644
index 0eedcbc7413..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
deleted file mode 100644
index 113c54f8fa4..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.data': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.data': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('data': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
deleted file mode 100644
index 113c54f8fa4..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.data': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.data': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('data': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
deleted file mode 100644
index dc9e9b66a1d..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
+++ /dev/null
@@ -1,108 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
deleted file mode 100644
index 13fccc3ea4d..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
+++ /dev/null
@@ -1,127 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('data': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.data': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.Array': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.data': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Array': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('component1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('component2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('data': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component1': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component2': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('component1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('component2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('component1': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('component2': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
deleted file mode 100644
index 41767b841dd..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('data': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.data': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.data': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('component1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('data': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('component1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component1': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
deleted file mode 100644
index a0633ec5068..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
deleted file mode 100644
index c1d4d4ebad0..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('data': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.data': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.data': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('component1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('component2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('data': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('component1': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('component2': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('component1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
deleted file mode 100644
index 3058d62b23f..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('D': FqName@9) = null
-    packageFragments('E': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('data': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.D': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.data': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.D': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.data': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('data': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
deleted file mode 100644
index 3231f444761..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Long']
-    <name not found> = JetTypeImpl@2['String']
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('Long': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('data': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.Long': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.data': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.Long': FqName@26) = null
-    packageFragments('kotlin.String': FqName@27) = null
-    packageFragments('kotlin.data': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Long': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('component1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('component2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('component3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('data': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component1': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component2': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component3': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('component1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('component2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('component3': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component1': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component2': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component3': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
deleted file mode 100644
index bec0cc93ffe..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
deleted file mode 100644
index dbca714059c..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
deleted file mode 100644
index 185d75b2632..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
deleted file mode 100644
index 80e9e0465ac..00000000000
--- a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['data']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('data': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.data': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('data': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component1': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('component2': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
deleted file mode 100644
index 74a9ee3cb77..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
deleted file mode 100644
index 9de9f966998..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
+++ /dev/null
@@ -1,156 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.Number': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.Number': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
-}
-
-null {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
deleted file mode 100644
index e1e8cf80dab..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
+++ /dev/null
@@ -1,119 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Boolean': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Boolean': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Boolean': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
deleted file mode 100644
index 36098d79439..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('BinOp': FqName@3) = null
-    packageFragments('Expr': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.BinOp': FqName@10) = null
-    packageFragments('java.lang.Expr': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.BinOp': FqName@14) = null
-    packageFragments('kotlin.Expr': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
deleted file mode 100644
index ad5b4e0607a..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Base': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Base': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
deleted file mode 100644
index 003931b6818..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
deleted file mode 100644
index 9de3981d766..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
+++ /dev/null
@@ -1,301 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Del': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('PropertyMetadata': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Del': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Del': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('df': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('df': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('df': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('df': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
deleted file mode 100644
index 2eff08812a1..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('D': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.D': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.D': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
deleted file mode 100644
index 20322e9d284..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.D': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.D': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
deleted file mode 100644
index 08e7a9f7573..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
deleted file mode 100644
index cb51d7821a2..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('X': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.X': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.X': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
deleted file mode 100644
index 5909d251005..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
+++ /dev/null
@@ -1,69 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
deleted file mode 100644
index 44687f6fe2b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = DeserializedType@3['kotlin.Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Any': FqName@7) = null
-    packageFragments('Base': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
deleted file mode 100644
index 78d14a210f4..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
deleted file mode 100644
index b67c287e1f7..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
deleted file mode 100644
index ec51742fa23..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
+++ /dev/null
@@ -1,67 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('String': FqName@5) = null
-    packageFragments('X': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.X': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.X': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
deleted file mode 100644
index 7bf387652af..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
+++ /dev/null
@@ -1,335 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@176[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@177[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
deleted file mode 100644
index 11686daf27f..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
+++ /dev/null
@@ -1,323 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('get': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('Array': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('get': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('get': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Array': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('get': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-}
-
-null {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
deleted file mode 100644
index 7d249bbe164..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Number': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
deleted file mode 100644
index 5bb4bc79403..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
+++ /dev/null
@@ -1,178 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.G': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.G': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@145[8] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
deleted file mode 100644
index ec2dd5682f0..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Array': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Array': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
deleted file mode 100644
index 689c548f36d..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('id': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('id': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('id': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('id': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
deleted file mode 100644
index 358553e289b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('baz': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('baz': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('baz': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('baz': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
deleted file mode 100644
index 1163fe26054..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
+++ /dev/null
@@ -1,228 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('java.lang.y': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Array': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.Number': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.y': FqName@20) = null
-    packageFragments('y': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Number': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plusAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plusAssign': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('y': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('plusAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plusAssign': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('y': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@105[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
deleted file mode 100644
index 549707d83d2..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Array': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Array': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@45 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
deleted file mode 100644
index a9ad9948fe2..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[14] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[14] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[16] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-}
-
-null {
-    <name not found> = ArrayList@124[14] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-    <name not found> = ArrayList@125[14] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = ArrayList@126[16] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-    <name not found> = ArrayList@127[16] { ResolutionCandidate@40, ResolutionCandidate@41, ResolutionCandidate@42, ... }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@152[8] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
deleted file mode 100644
index 276e1cdf6ca..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
+++ /dev/null
@@ -1,133 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Boolean': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Boolean': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Number': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
deleted file mode 100644
index 62c32afe062..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
+++ /dev/null
@@ -1,119 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Boolean': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('compareTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('compareTo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('compareTo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
deleted file mode 100644
index 4d7267fa743..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Boolean': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Boolean': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Number': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
deleted file mode 100644
index e41b74c688f..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
+++ /dev/null
@@ -1,118 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Number': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
deleted file mode 100644
index b09b960ff20..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.Boolean': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
deleted file mode 100644
index 379ae72b16e..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Number': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Number': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@63[7] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@64[7] { ResolutionCandidate@53, ResolutionCandidate@54, ResolutionCandidate@55, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
deleted file mode 100644
index 655c724568b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[2] { ResolutionCandidate@71, ResolutionCandidate@72 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@85[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@71, ResolutionCandidate@72 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
deleted file mode 100644
index 264959f3351..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Boolean': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Boolean': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
deleted file mode 100644
index 532b0795fb1..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
+++ /dev/null
@@ -1,211 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-null {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
deleted file mode 100644
index 75e85d16579..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
+++ /dev/null
@@ -1,466 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[2] { ResolutionCandidate@195, ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[2] { ResolutionCandidate@203, ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[7] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[7] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-}
-
-null {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@289[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
-    <name not found> = ArrayList@290[2] { ResolutionCandidate@207, ResolutionCandidate@208 }
-    <name not found> = ArrayList@291[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
-    <name not found> = ArrayList@292[2] { ResolutionCandidate@195, ResolutionCandidate@196 }
-    <name not found> = ArrayList@293[2] { ResolutionCandidate@203, ResolutionCandidate@204 }
-    <name not found> = ArrayList@294[7] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = ArrayList@295[7] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@296[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-    <name not found> = ArrayList@297[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
deleted file mode 100644
index ee7d8e6c263..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
+++ /dev/null
@@ -1,181 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
deleted file mode 100644
index 5e1f7c768d7..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
+++ /dev/null
@@ -1,125 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@102[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
deleted file mode 100644
index c1b6864cb22..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
+++ /dev/null
@@ -1,139 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@68, ResolutionCandidate@69, ResolutionCandidate@70, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
deleted file mode 100644
index 00a0247b7cd..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
+++ /dev/null
@@ -1,328 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[8] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-}
-
-null {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
deleted file mode 100644
index b1ad05bf986..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
+++ /dev/null
@@ -1,277 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('Array': Name@15) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Array': Name@15) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@168[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
deleted file mode 100644
index d984922ad60..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Array': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Array': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
deleted file mode 100644
index 6396f66ab1e..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
+++ /dev/null
@@ -1,161 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('baz': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('baz': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
deleted file mode 100644
index 3051a7c763e..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
+++ /dev/null
@@ -1,139 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Boolean': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Boolean': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
deleted file mode 100644
index 0adcc882607..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
+++ /dev/null
@@ -1,333 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-}
-
-null {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@190[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
deleted file mode 100644
index 90917c110c8..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
+++ /dev/null
@@ -1,149 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-}
-
-null {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@97[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-    <name not found> = ArrayList@100[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
deleted file mode 100644
index 93123a48267..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Number': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Number': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
deleted file mode 100644
index 42578e78e4b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
+++ /dev/null
@@ -1,1078 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Number': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Number': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-}
-
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-}
-
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-}
-
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-}
-
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-}
-
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-}
-
-ResolutionTaskHolder@479 {
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@481 }
-}
-
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
-}
-
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-}
-
-ResolutionTaskHolder@488 {
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-}
-
-ResolutionTaskHolder@491 {
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
-}
-
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-}
-
-ResolutionTaskHolder@500 {
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-}
-
-ResolutionTaskHolder@503 {
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
-}
-
-ResolutionTaskHolder@506 {
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
-}
-
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-}
-
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-}
-
-ResolutionTaskHolder@515 {
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@517 }
-}
-
-ResolutionTaskHolder@518 {
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
-}
-
-ResolutionTaskHolder@521 {
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-}
-
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-}
-
-ResolutionTaskHolder@527 {
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
-}
-
-ResolutionTaskHolder@530 {
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
-}
-
-ResolutionTaskHolder@533 {
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-}
-
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-}
-
-ResolutionTaskHolder@539 {
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@541 }
-}
-
-ResolutionTaskHolder@542 {
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@544 }
-}
-
-ResolutionTaskHolder@545 {
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
-}
-
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-}
-
-ResolutionTaskHolder@551 {
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
-}
-
-ResolutionTaskHolder@554 {
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
-}
-
-ResolutionTaskHolder@557 {
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
-}
-
-ResolutionTaskHolder@560 {
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-}
-
-ResolutionTaskHolder@563 {
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@565 }
-}
-
-ResolutionTaskHolder@566 {
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
-}
-
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-}
-
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-}
-
-ResolutionTaskHolder@575 {
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
-}
-
-ResolutionTaskHolder@578 {
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
-}
-
-ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-}
-
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = ArrayList@591[1] { ResolutionCandidate@592 }
-}
-
-ResolutionTaskHolder@593 {
-    <name not found> = ArrayList@594[1] { ResolutionCandidate@595 }
-}
-
-ResolutionTaskHolder@596 {
-    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
-}
-
-ResolutionTaskHolder@599 {
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@601 }
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@604 }
-}
-
-ResolutionTaskHolder@605 {
-    <name not found> = ArrayList@606[1] { ResolutionCandidate@607 }
-}
-
-ResolutionTaskHolder@608 {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@610 }
-}
-
-ResolutionTaskHolder@611 {
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@613 }
-}
-
-ResolutionTaskHolder@614 {
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@616 }
-}
-
-ResolutionTaskHolder@617 {
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@619 }
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@622 }
-}
-
-ResolutionTaskHolder@623 {
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@625 }
-}
-
-ResolutionTaskHolder@626 {
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@628 }
-}
-
-ResolutionTaskHolder@629 {
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@631 }
-}
-
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@634 }
-}
-
-ResolutionTaskHolder@635 {
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@637 }
-}
-
-ResolutionTaskHolder@638 {
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@640 }
-}
-
-ResolutionTaskHolder@641 {
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@643 }
-}
-
-ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@646 }
-}
-
-ResolutionTaskHolder@647 {
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@649 }
-}
-
-ResolutionTaskHolder@650 {
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@652 }
-}
-
-ResolutionTaskHolder@653 {
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@655 }
-}
-
-null {
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@604 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@607 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@598 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@493 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@592 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@517 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@649 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@556 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@625 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@577 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@646 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@616 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@505 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@565 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@568 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@580 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@637 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@640 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@610 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@484 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@655 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@771[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@643 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@481 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@496 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@541 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@628 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@529 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@553 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@544 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@547 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@634 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@652 }
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@589 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@601 }
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@559 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@619 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@532 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@595 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@613 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@855[1] { ResolutionCandidate@622 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@857[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@631 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@861[1] { ResolutionCandidate@520 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@863[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@334 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
deleted file mode 100644
index 636ae6f7164..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Number': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.Number': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.Number': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Number': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('component1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('component1': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('component1': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('component1': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
deleted file mode 100644
index 17ce57e4492..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
+++ /dev/null
@@ -1,140 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-DescriptorResolver@4 {
-    <name not found> = NullValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
deleted file mode 100644
index 9b66bbf3f95..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
+++ /dev/null
@@ -1,170 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('baz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('baz': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('baz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('baz': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
deleted file mode 100644
index 0e735000b3b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@129[2] { ResolutionCandidate@98, ResolutionCandidate@99 }
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
deleted file mode 100644
index 17f9ba70cca..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.Number': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.Number': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Number': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@55 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
deleted file mode 100644
index 3678682a875..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
+++ /dev/null
@@ -1,299 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Derived': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Base': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Base': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('baz': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('baz': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@105, ResolutionCandidate@106, ResolutionCandidate@107, ... }
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
deleted file mode 100644
index fcc8f1b5051..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
+++ /dev/null
@@ -1,259 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['RuntimeException'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['RuntimeException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@11['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@47['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@52['Throwable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@55['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Int': FqName@59) = null
-    packageFragments('RuntimeException': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Int': FqName@65) = null
-    packageFragments('java.lang.RuntimeException': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.RuntimeException': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@19['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@72['RuntimeException']) = LazyJavaClassDescriptor@4['RuntimeException']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('RuntimeException': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('RuntimeException': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('bar': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('RuntimeException': Name@75) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('RuntimeException': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('bar': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@136[5] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
deleted file mode 100644
index a7c3cf6942f..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@4[empty]
-    supertypes = ArrayList@5[1] { LazyJavaClassifierType@6['Throwable'] }
-}
-
-LazyJavaClassifierType@6['Throwable'] {
-    arguments = ArrayList@7[empty]
-    classifier = JavaClassImpl@8['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@9
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('Exception': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Exception': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Exception': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    topLevelClasses(JavaClassImpl@26['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('Exception': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('Exception': Name@27) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bar': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
deleted file mode 100644
index 8ef1d8f1410..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Throwable'] }
-}
-
-LazyJavaClassifierType@4['Throwable'] {
-    arguments = ArrayList@5[empty]
-    classifier = JavaClassImpl@6['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Exception': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Exception': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Exception': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    topLevelClasses(JavaClassImpl@24['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Exception': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Exception': Name@25) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@46 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
deleted file mode 100644
index 7a690154735..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
+++ /dev/null
@@ -1,288 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Boolean': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Boolean': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Boolean': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('not': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('bar': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('baz': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('minus': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('not': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('not': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('baz': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('minus': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('not': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-}
-
-null {
-    <name not found> = ArrayList@117[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@138[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@139[8] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@140[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
deleted file mode 100644
index d408ee1ba2c..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@91[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
deleted file mode 100644
index 5de1589e33c..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Number': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Number': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
deleted file mode 100644
index 7899943e823..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Number': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Number': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
deleted file mode 100644
index 856fc9976c9..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.List': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.List': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('List': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
deleted file mode 100644
index be6d2b254fe..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Number': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Number': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Number': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
deleted file mode 100644
index 20bf5aeb7ee..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
+++ /dev/null
@@ -1,238 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-null {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
deleted file mode 100644
index 1fb187c86ec..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@50 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
deleted file mode 100644
index f67077431c8..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
+++ /dev/null
@@ -1,98 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@75[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
deleted file mode 100644
index 6dafb706fad..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.String': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
deleted file mode 100644
index eb95b280242..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
deleted file mode 100644
index 1b6b9e3af6b..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
deleted file mode 100644
index f45b23a6fe4..00000000000
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
+++ /dev/null
@@ -1,895 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('AClass': FqName@8) = null
-    packageFragments('Any': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('Obj': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('example': FqName@13) = null
-    packageFragments('example.AClass': FqName@14) = null
-    packageFragments('example.Any': FqName@15) = null
-    packageFragments('example.C': FqName@16) = null
-    packageFragments('example.Int': FqName@17) = null
-    packageFragments('example.Obj': FqName@18) = null
-    packageFragments('example.T': FqName@19) = null
-    packageFragments('example.example': FqName@20) = null
-    packageFragments('example.ns': FqName@21) = null
-    packageFragments('example.ns.Any': FqName@22) = null
-    packageFragments('example.ns.y': FqName@23) = null
-    packageFragments('example.x': FqName@24) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.AClass': FqName@29) = null
-    packageFragments('java.lang.Any': FqName@30) = null
-    packageFragments('java.lang.Int': FqName@31) = null
-    packageFragments('java.lang.Obj': FqName@32) = null
-    packageFragments('java.lang.T': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = null
-    packageFragments('kotlin.AClass': FqName@35) = null
-    packageFragments('kotlin.Any': FqName@36) = null
-    packageFragments('kotlin.Int': FqName@37) = null
-    packageFragments('kotlin.Obj': FqName@38) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-}
-
-LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@28['lang'] {
-    classes('example': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('ns': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('x': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-null {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
deleted file mode 100644
index d4291d86435..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.lazy.log
deleted file mode 100644
index ae0528feced..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/ConflictingAndRedundantProjections.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('In': FqName@3) = null
-    packageFragments('Inv': FqName@4) = null
-    packageFragments('Out': FqName@5) = null
-    packageFragments('X': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.In': FqName@11) = null
-    packageFragments('java.lang.Inv': FqName@12) = null
-    packageFragments('java.lang.Out': FqName@13) = null
-    packageFragments('java.lang.X': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.In': FqName@16) = null
-    packageFragments('kotlin.Inv': FqName@17) = null
-    packageFragments('kotlin.Out': FqName@18) = null
-    packageFragments('kotlin.X': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
deleted file mode 100644
index a6444b126af..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('d': FqName@7) = null
-    packageFragments('d.A': FqName@8) = null
-    packageFragments('d.List': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.List': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.List': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
deleted file mode 100644
index e4aa88b350f..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Any': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = ArrayList@72[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/LocalVariableWithNoTypeInformation.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
deleted file mode 100644
index 4c0cf18cea1..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
+++ /dev/null
@@ -1,166 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['Double']
-    <name not found> = JetTypeImpl@2['Double']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('MyClass': FqName@8) = null
-    packageFragments('MyClass2': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Any': FqName@11) = null
-    packageFragments('a.Int': FqName@12) = null
-    packageFragments('a.MyClass': FqName@13) = null
-    packageFragments('a.MyClass2': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Any': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('java.lang.MyClass': FqName@21) = null
-    packageFragments('java.lang.MyClass2': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.MyClass': FqName@26) = null
-    packageFragments('kotlin.MyClass2': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('component1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('component2': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('use': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('component1': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('component2': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('use': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@81[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = ArrayList@82[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
deleted file mode 100644
index 7da5dcd1c17..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
+++ /dev/null
@@ -1,121 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Any': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.lazy.log
deleted file mode 100644
index f5d71cd41e8..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/VarianceOnFunctionAndPropertyTypeParameters.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('x': FqName@16) = null
-    packageFragments('y': FqName@17) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
deleted file mode 100644
index fca1349caf8..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
+++ /dev/null
@@ -1,590 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@4 {
-    <name not found> = JetTypeImpl@5['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@6 {
-    <name not found> = JetTypeImpl@7['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@8 {
-    <name not found> = JetTypeImpl@9['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@10 {
-    <name not found> = JetTypeImpl@11['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@12 {
-    <name not found> = JetTypeImpl@13['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@14 {
-    <name not found> = JetTypeImpl@15['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@16 {
-    <name not found> = JetTypeImpl@17['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@18 {
-    <name not found> = JetTypeImpl@19['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@20 {
-    <name not found> = JetTypeImpl@21['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@22 {
-    <name not found> = JetTypeImpl@23['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@24 {
-    <name not found> = JetTypeImpl@25['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@26 {
-    <name not found> = JetTypeImpl@27['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@28 {
-    <name not found> = JetTypeImpl@29['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@30 {
-    <name not found> = JetTypeImpl@31['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@32 {
-    <name not found> = JetTypeImpl@33['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@34 {
-    <name not found> = JetTypeImpl@35['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@36 {
-    <name not found> = JetTypeImpl@37['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@38 {
-    <name not found> = JetTypeImpl@39['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@40 {
-    <name not found> = JetTypeImpl@41['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@42 {
-    <name not found> = JetTypeImpl@43['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@44 {
-    <name not found> = JetTypeImpl@45['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@46 {
-    <name not found> = JetTypeImpl@47['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@48 {
-    <name not found> = JetTypeImpl@49['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@50 {
-    <name not found> = JetTypeImpl@51['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@52 {
-    <name not found> = JetTypeImpl@53['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@54 {
-    <name not found> = JetTypeImpl@55['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@56 {
-    <name not found> = JetTypeImpl@57['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@58 {
-    <name not found> = JetTypeImpl@59['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@60 {
-    <name not found> = JetTypeImpl@61['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@62 {
-    <name not found> = JetTypeImpl@63['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@64 {
-    <name not found> = JetTypeImpl@65['<no name provided>']
-}
-
-DescriptorResolver@66 {
-    <name not found> = DeferredType@67
-    <name not found> = DeferredType@68
-    <name not found> = DeferredType@69
-    <name not found> = DeferredType@70
-    <name not found> = DeferredType@71
-    <name not found> = DeferredType@72
-    <name not found> = DeferredType@73
-    <name not found> = DeferredType@74
-    <name not found> = DeferredType@75
-    <name not found> = DeferredType@76
-    <name not found> = DeferredType@77
-    <name not found> = DeferredType@78
-    <name not found> = DeferredType@79
-    <name not found> = DeferredType@80
-    <name not found> = DeferredType@81
-    <name not found> = DeferredType@82
-    <name not found> = DeferredType@83
-    <name not found> = DeferredType@84
-    <name not found> = DeferredType@85
-    <name not found> = DeferredType@86
-    <name not found> = DeferredType@87
-    <name not found> = DeferredType@88
-    <name not found> = DeferredType@89
-    <name not found> = DeferredType@90
-    <name not found> = DeferredType@91
-    <name not found> = DeferredType@92
-    <name not found> = DeferredType@93
-    <name not found> = DeferredType@94
-    <name not found> = DeferredType@95
-    <name not found> = DeferredType@96
-    <name not found> = DeferredType@97
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@98 {
-    packageFragments('<root>': FqName@99) = LazyJavaPackageFragment@100['<root>']
-    packageFragments('Foo': FqName@101) = null
-    packageFragments('MyClass': FqName@102) = null
-    packageFragments('MyTrait': FqName@103) = null
-    packageFragments('java': FqName@104) = LazyJavaPackageFragment@105['java']
-    packageFragments('java.lang': FqName@106) = LazyJavaPackageFragment@107['lang']
-    packageFragments('java.lang.MyClass': FqName@108) = null
-    packageFragments('java.lang.MyTrait': FqName@109) = null
-    packageFragments('kotlin': FqName@110) = null
-    packageFragments('kotlin.MyClass': FqName@111) = null
-    packageFragments('kotlin.MyTrait': FqName@112) = null
-    packageFragments('kotlin.io': FqName@113) = null
-    packageFragments('kotlin.jvm': FqName@114) = null
-    packageFragments('packageInternal2Property': FqName@115) = null
-    packageFragments('packageInternalProperty': FqName@116) = null
-    packageFragments('packagePrivateProperty': FqName@117) = null
-    packageFragments('packageProtectedProperty': FqName@118) = null
-    packageFragments('packagePublicProperty': FqName@119) = null
-}
-
-LazyJavaPackageFragment@100['<root>'] {
-    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaPackageFragment@105['java'] {
-    classes('lang': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('lang': Name@132) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaPackageFragment@107['lang'] {
-    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@128[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-}
-
-null {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-    <name not found> = EmptyList@128[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.lazy.log
deleted file mode 100644
index f68d2634d23..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/illegalModifiersOnClass.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B1': FqName@4) = null
-    packageFragments('B2': FqName@5) = null
-    packageFragments('B3': FqName@6) = null
-    packageFragments('B4': FqName@7) = null
-    packageFragments('C': FqName@8) = null
-    packageFragments('D': FqName@9) = null
-    packageFragments('E': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
deleted file mode 100644
index 8efecb72ff4..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaClassDescriptor@4['Runnable'] {
-    allDescriptors = ArrayList@5[4] { DeserializedSimpleFunctionDescriptor@6['hashCode'], DeserializedSimpleFunctionDescriptor@7['toString'], JavaMethodDescriptor@8['run'], ... } // through LazyJavaClassMemberScope@9
-    constructors = stdlib_emptyListClass@10[empty] // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@11['Runnable']
-    enumEntryIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@9
-    functions('clone': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('equals': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['equals'] } // through LazyJavaClassMemberScope@9
-    functions('finalize': Name@18) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('getClass': Name@19) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('hashCode': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@9
-    functions('notify': Name@22) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('notifyAll': Name@23) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('run': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@8['run'] } // through LazyJavaClassMemberScope@9
-    functions('toString': Name@26) = ArrayList@27[1] { DeserializedSimpleFunctionDescriptor@7['toString'] } // through LazyJavaClassMemberScope@9
-    functions('wait': Name@28) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['Runnable']
-}
-
-LazyJavaClassTypeConstructor@32['Runnable'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassifierType@36['Object'] {
-    classifier = JavaClassImpl@37['Object']
-    typeConstructor = DeserializedClassTypeConstructor@38
-}
-
-LazyJavaPackageFragmentProvider@39 {
-    packageFragments('<root>': FqName@40) = LazyJavaPackageFragment@41['<root>']
-    packageFragments('Runnable': FqName@42) = null
-    packageFragments('SomeTrait': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.Runnable': FqName@48) = null
-    packageFragments('java.lang.SomeTrait': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Runnable': FqName@51) = null
-    packageFragments('kotlin.SomeTrait': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('kt1141': FqName@55) = null
-    packageFragments('kt1141.C': FqName@56) = null
-    packageFragments('kt1141.Rr': FqName@57) = null
-    packageFragments('kt1141.Runnable': FqName@58) = null
-    packageFragments('kt1141.SomeTrait': FqName@59) = null
-    topLevelClasses(JavaClassImpl@60['Runnable']) = LazyJavaClassDescriptor@4['Runnable']
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@64) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    classes('Runnable': Name@66) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@73 }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
deleted file mode 100644
index 715d275eddb..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('MyEnum': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.MyEnum': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.MyEnum': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1193': FqName@16) = null
-    packageFragments('kt1193.Int': FqName@17) = null
-    packageFragments('kt1193.MyEnum': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2096.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2096.lazy.log
deleted file mode 100644
index a2c13692c05..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2096.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('c': FqName@3) = null
-    packageFragments('c.Foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
deleted file mode 100644
index b2d62a2ded1..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('Foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Foo': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-null {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2397.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2397.lazy.log
deleted file mode 100644
index 1f8ded645dc..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2397.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('a.A': FqName@7) = null
-    packageFragments('a.Int': FqName@8) = null
-    packageFragments('a.T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
deleted file mode 100644
index 5555673e99a..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
+++ /dev/null
@@ -1,115 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Double']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['String']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Double': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('MyClass': FqName@10) = null
-    packageFragments('MyClass2': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('a': FqName@13) = null
-    packageFragments('a.Boolean': FqName@14) = null
-    packageFragments('a.Double': FqName@15) = null
-    packageFragments('a.Int': FqName@16) = null
-    packageFragments('a.MyClass': FqName@17) = null
-    packageFragments('a.MyClass2': FqName@18) = null
-    packageFragments('a.String': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Boolean': FqName@24) = null
-    packageFragments('java.lang.Double': FqName@25) = null
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('java.lang.MyClass': FqName@27) = null
-    packageFragments('java.lang.MyClass2': FqName@28) = null
-    packageFragments('java.lang.String': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.Boolean': FqName@31) = null
-    packageFragments('kotlin.Double': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.MyClass': FqName@34) = null
-    packageFragments('kotlin.MyClass2': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component1': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
deleted file mode 100644
index 529e0a58f3f..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
+++ /dev/null
@@ -1,118 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('n': FqName@15) = null
-    packageFragments('n.C': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@97[8] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
deleted file mode 100644
index c1e47577818..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.D': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.D': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt559': FqName@21) = null
-    packageFragments('kt559.A': FqName@22) = null
-    packageFragments('kt559.B': FqName@23) = null
-    packageFragments('kt559.C': FqName@24) = null
-    packageFragments('kt559.D': FqName@25) = null
-    packageFragments('kt559.Int': FqName@26) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.lazy.log
deleted file mode 100644
index ed56c4d66bd..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/localDeclarationModifiers.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('T': FqName@5) = null
-    packageFragments('d': FqName@6) = null
-    packageFragments('d.T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
deleted file mode 100644
index fe182debeb4..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('T': FqName@5) = null
-    packageFragments('d': FqName@6) = null
-    packageFragments('d.T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('zzz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('zzz': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
deleted file mode 100644
index 5fcb8477004..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
deleted file mode 100644
index edeef452cac..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Double']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Double': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Iterator': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.Double': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Iterator': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Double': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Iterator': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
deleted file mode 100644
index 7f4298e49f7..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
deleted file mode 100644
index e41d9354300..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
+++ /dev/null
@@ -1,115 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
deleted file mode 100644
index 2cba6f9a17d..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
deleted file mode 100644
index 6486e768140..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Double']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Double': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Iterator': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.Double': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Iterator': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Double': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Iterator': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
deleted file mode 100644
index 6b7fba8e8cd..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
deleted file mode 100644
index 701d1831050..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Iterator': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Iterator': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
deleted file mode 100644
index 24415a09850..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
+++ /dev/null
@@ -1,170 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['data']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('Any': FqName@9) = null
-    packageFragments('B': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('data': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.B': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.data': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.B': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.data': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('test': FqName@30) = null
-    packageFragments('test.A': FqName@31) = null
-    packageFragments('test.Any': FqName@32) = null
-    packageFragments('test.B': FqName@33) = null
-    packageFragments('test.Pair': FqName@34) = null
-    packageFragments('test.String': FqName@35) = null
-    packageFragments('test.data': FqName@36) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Pair': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component2': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('println': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('Pair': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component1': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component2': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('println': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.lazy.log
deleted file mode 100644
index e6cdd4987fb..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/packageDeclarationModifiers.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('d': FqName@9) = null
-    packageFragments('d.Int': FqName@10) = null
-    packageFragments('d.T': FqName@11) = null
-    packageFragments('d.a': FqName@12) = null
-    packageFragments('d.c': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
deleted file mode 100644
index c11806ca8c9..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('d': FqName@4) = null
-    packageFragments('d.Int': FqName@5) = null
-    packageFragments('d.f': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
deleted file mode 100644
index 357405212e1..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
+++ /dev/null
@@ -1,2786 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@4 {
-    <name not found> = JetTypeImpl@5['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@6 {
-    <name not found> = JetTypeImpl@7['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@8 {
-    <name not found> = JetTypeImpl@9['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@10 {
-    <name not found> = JetTypeImpl@11['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@12 {
-    <name not found> = JetTypeImpl@13['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@14 {
-    <name not found> = JetTypeImpl@15['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@16 {
-    <name not found> = JetTypeImpl@17['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@18 {
-    <name not found> = JetTypeImpl@19['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@20 {
-    <name not found> = JetTypeImpl@21['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@22 {
-    <name not found> = JetTypeImpl@23['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@24 {
-    <name not found> = JetTypeImpl@25['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@26 {
-    <name not found> = JetTypeImpl@27['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@28 {
-    <name not found> = JetTypeImpl@29['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@30 {
-    <name not found> = JetTypeImpl@31['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@32 {
-    <name not found> = JetTypeImpl@33['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@34 {
-    <name not found> = JetTypeImpl@35['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@36 {
-    <name not found> = JetTypeImpl@37['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@38 {
-    <name not found> = JetTypeImpl@39['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@40 {
-    <name not found> = JetTypeImpl@41['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@42 {
-    <name not found> = JetTypeImpl@43['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@44 {
-    <name not found> = JetTypeImpl@45['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@46 {
-    <name not found> = JetTypeImpl@47['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@48 {
-    <name not found> = JetTypeImpl@49['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@50 {
-    <name not found> = JetTypeImpl@51['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@52 {
-    <name not found> = JetTypeImpl@53['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@54 {
-    <name not found> = JetTypeImpl@55['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@56 {
-    <name not found> = JetTypeImpl@57['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@58 {
-    <name not found> = JetTypeImpl@59['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@60 {
-    <name not found> = JetTypeImpl@61['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@62 {
-    <name not found> = JetTypeImpl@63['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@64 {
-    <name not found> = JetTypeImpl@65['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@66 {
-    <name not found> = JetTypeImpl@67['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@68 {
-    <name not found> = JetTypeImpl@69['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@70 {
-    <name not found> = JetTypeImpl@71['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@72 {
-    <name not found> = JetTypeImpl@73['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@74 {
-    <name not found> = JetTypeImpl@75['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@76 {
-    <name not found> = JetTypeImpl@77['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@78 {
-    <name not found> = JetTypeImpl@79['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@80 {
-    <name not found> = JetTypeImpl@81['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@82 {
-    <name not found> = JetTypeImpl@83['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@84 {
-    <name not found> = JetTypeImpl@85['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@86 {
-    <name not found> = JetTypeImpl@87['<no name provided>']
-}
-
-DescriptorResolver@88 {
-    <name not found> = DeferredType@89
-    <name not found> = DeferredType@90
-    <name not found> = DeferredType@91
-    <name not found> = DeferredType@92
-    <name not found> = DeferredType@93
-    <name not found> = DeferredType@94
-    <name not found> = DeferredType@95
-    <name not found> = DeferredType@96
-    <name not found> = DeferredType@97
-    <name not found> = DeferredType@98
-    <name not found> = DeferredType@99
-    <name not found> = DeferredType@100
-    <name not found> = DeferredType@101
-    <name not found> = DeferredType@102
-    <name not found> = DeferredType@103
-    <name not found> = DeferredType@104
-    <name not found> = DeferredType@105
-    <name not found> = DeferredType@106
-    <name not found> = JetTypeImpl@107['MyClass']
-    <name not found> = JetTypeImpl@108['MyClass']
-    <name not found> = JetTypeImpl@109['MyClass']
-    <name not found> = JetTypeImpl@110['MyClass']
-    <name not found> = JetTypeImpl@111['MyClass']
-    <name not found> = JetTypeImpl@112['MyClass']
-    <name not found> = JetTypeImpl@113['MyClass']
-    <name not found> = JetTypeImpl@114['MyClass']
-    <name not found> = JetTypeImpl@115['MyClass']
-    <name not found> = JetTypeImpl@116['MyClass']
-    <name not found> = JetTypeImpl@117['MyClass']
-    <name not found> = JetTypeImpl@118['MyClass']
-    <name not found> = JetTypeImpl@119['MyClass']
-    <name not found> = JetTypeImpl@120['MyClass']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@121 {
-    packageFragments('<root>': FqName@122) = LazyJavaPackageFragment@123['<root>']
-    packageFragments('Foo': FqName@124) = null
-    packageFragments('MyClass': FqName@125) = null
-    packageFragments('java': FqName@126) = LazyJavaPackageFragment@127['java']
-    packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
-    packageFragments('java.lang.MyClass': FqName@130) = null
-    packageFragments('kotlin': FqName@131) = null
-    packageFragments('kotlin.MyClass': FqName@132) = null
-    packageFragments('kotlin.io': FqName@133) = null
-    packageFragments('kotlin.jvm': FqName@134) = null
-    packageFragments('packageInternal2Property': FqName@135) = null
-    packageFragments('packageInternalProperty': FqName@136) = null
-    packageFragments('packagePrivateProperty': FqName@137) = null
-    packageFragments('packageProtectedProperty': FqName@138) = null
-    packageFragments('packagePublic2Property': FqName@139) = null
-    packageFragments('packagePublicProperty': FqName@140) = null
-}
-
-LazyJavaPackageFragment@123['<root>'] {
-    classes('foo2': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('fooPackageLocal': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internal2Function': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internal2Property': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internalFunction': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internalProperty': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('invisible': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packageInternal2Property': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packageInternalProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packagePrivateProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packagePublic2Property': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('privateFunction': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('privateProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('protected2Function': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('protected2Property': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('public2Function': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('public2Property': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('foo2': Name@141) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('fooPackageLocal': Name@143) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('internal2Function': Name@144) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('internalFunction': Name@146) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('invisible': Name@148) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('privateFunction': Name@153) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('protected2Function': Name@155) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('public2Function': Name@157) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaPackageFragment@127['java'] {
-    classes('lang': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('lang': Name@164) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@163
-}
-
-LazyJavaPackageFragment@129['lang'] {
-    classes('foo2': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('fooPackageLocal': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('internal2Function': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('internal2Property': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('internalFunction': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('internalProperty': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('invisible': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('packageInternal2Property': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('packageInternalProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('packagePrivateProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('packagePublic2Property': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('privateFunction': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('privateProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('protected2Function': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('protected2Property': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('public2Function': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('public2Property': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('foo2': Name@141) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('fooPackageLocal': Name@143) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('internal2Function': Name@144) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('internalFunction': Name@146) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('invisible': Name@148) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('privateFunction': Name@153) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('protected2Function': Name@155) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('public2Function': Name@157) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@166
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-}
-
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-}
-
-ResolutionTaskHolder@483 {
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
-}
-
-ResolutionTaskHolder@510 {
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
-}
-
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-}
-
-ResolutionTaskHolder@519 {
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
-}
-
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
-}
-
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-}
-
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-}
-
-ResolutionTaskHolder@531 {
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-}
-
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-}
-
-ResolutionTaskHolder@543 {
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-}
-
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-}
-
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@601 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@604 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@605 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@607 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@608 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@610 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@611 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@613 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@614 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@616 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@617 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@619 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@622 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@623 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@625 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@626 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@628 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@629 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@631 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@632 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@634 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@635 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@637 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@638 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@640 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@641 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@643 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@644 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@646 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-ResolutionTaskHolder@647 {
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
-
-null {
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@524 }
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@512 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@521 }
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@771[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@509 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-    <name not found> = EmptyList@160[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
deleted file mode 100644
index 48228eaf5d9..00000000000
--- a/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[8] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@82[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
-    <name not found> = ArrayList@83[8] { ResolutionCandidate@70, ResolutionCandidate@71, ResolutionCandidate@72, ... }
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
-    <name not found> = ArrayList@86[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
deleted file mode 100644
index ab0e66bdd4f..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
deleted file mode 100644
index 9e70b881e1b..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
+++ /dev/null
@@ -1,148 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Delegate': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('PropertyMetadata': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
deleted file mode 100644
index 682f8f800d6..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
deleted file mode 100644
index fa268831d76..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
+++ /dev/null
@@ -1,203 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Delegate': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('PropertyMetadata': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('a': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('a': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
deleted file mode 100644
index f2c3c8fb317..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
+++ /dev/null
@@ -1,215 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('AImpl': FqName@6) = null
-    packageFragments('Any': FqName@7) = null
-    packageFragments('Delegate': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('PropertyMetadata': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('AImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Any': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Delegate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('PropertyMetadata': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('PropertyMetadataImpl': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('AImpl': Name@26) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Delegate': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('PropertyMetadataImpl': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('propertyDelegated': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('AImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Delegate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('PropertyMetadataImpl': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('AImpl': Name@26) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Delegate': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('PropertyMetadataImpl': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('equals': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('propertyDelegated': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
deleted file mode 100644
index 7259c42d110..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('AImpl': FqName@6) = null
-    packageFragments('Any': FqName@7) = null
-    packageFragments('Delegate': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('PropertyMetadata': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.Any': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('AImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('PropertyMetadata': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('AImpl': Name@29) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Delegate': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('PropertyMetadataImpl': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('propertyDelegated': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('AImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('AImpl': Name@29) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('Delegate': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('PropertyMetadataImpl': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('equals': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('propertyDelegated': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
deleted file mode 100644
index c701e4951f3..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
+++ /dev/null
@@ -1,289 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A': FqName@50) = null
-    packageFragments('Any': FqName@51) = null
-    packageFragments('Int': FqName@52) = null
-    packageFragments('PropertyMetadata': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('a': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Any': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@67) = null
-    packageFragments('kotlin.T': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Int': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('PropertyMetadata': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('PropertyMetadataImpl': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('equals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('propertyDelegated': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@72) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@75) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('PropertyMetadataImpl': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('equals': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('propertyDelegated': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('PropertyMetadataImpl': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('equals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('propertyDelegated': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('A': Name@72) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('Exception': Name@75) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('PropertyMetadataImpl': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('equals': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('propertyDelegated': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@135[5] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
deleted file mode 100644
index e36689fcd49..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Derived': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.Derived': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.Derived': FqName@20) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
deleted file mode 100644
index b89bfd4f522..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
deleted file mode 100644
index e1d1eb42f8d..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
+++ /dev/null
@@ -1,259 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('IncorrectThis': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('PropertyMetadata': FqName@8) = null
-    packageFragments('cTopLevel': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('IncorrectThis': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('IncorrectThis': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('IncorrectThis': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('IncorrectThis': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
deleted file mode 100644
index 0c87f37f7d4..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
+++ /dev/null
@@ -1,2193 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MyProperty<2>']
-    <name not found> = JetTypeImpl@2['MyProperty<2>']
-    <name not found> = JetTypeImpl@3['MyProperty<2>']
-    <name not found> = JetTypeImpl@4['MyProperty<2>']
-    <name not found> = JetTypeImpl@5['MyProperty<2>']
-    <name not found> = JetTypeImpl@6['MyProperty<2>']
-    <name not found> = NullableType@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('A': FqName@11) = null
-    packageFragments('Any': FqName@12) = null
-    packageFragments('B': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('MyProperty': FqName@15) = null
-    packageFragments('MyPropertyContainer': FqName@16) = null
-    packageFragments('O': FqName@17) = null
-    packageFragments('Outer': FqName@18) = null
-    packageFragments('PropertyMetadata': FqName@19) = null
-    packageFragments('R': FqName@20) = null
-    packageFragments('String': FqName@21) = null
-    packageFragments('T': FqName@22) = null
-    packageFragments('baz': FqName@23) = null
-    packageFragments('baz.A': FqName@24) = null
-    packageFragments('baz.Any': FqName@25) = null
-    packageFragments('baz.B': FqName@26) = null
-    packageFragments('baz.Int': FqName@27) = null
-    packageFragments('baz.MyProperty': FqName@28) = null
-    packageFragments('baz.MyPropertyContainer': FqName@29) = null
-    packageFragments('baz.O': FqName@30) = null
-    packageFragments('baz.Outer': FqName@31) = null
-    packageFragments('baz.PropertyMetadata': FqName@32) = null
-    packageFragments('baz.R': FqName@33) = null
-    packageFragments('baz.String': FqName@34) = null
-    packageFragments('baz.T': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.A': FqName@40) = null
-    packageFragments('java.lang.Any': FqName@41) = null
-    packageFragments('java.lang.B': FqName@42) = null
-    packageFragments('java.lang.Int': FqName@43) = null
-    packageFragments('java.lang.MyProperty': FqName@44) = null
-    packageFragments('java.lang.MyPropertyContainer': FqName@45) = null
-    packageFragments('java.lang.O': FqName@46) = null
-    packageFragments('java.lang.Outer': FqName@47) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@48) = null
-    packageFragments('java.lang.R': FqName@49) = null
-    packageFragments('java.lang.String': FqName@50) = null
-    packageFragments('java.lang.T': FqName@51) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.A': FqName@53) = null
-    packageFragments('kotlin.Any': FqName@54) = null
-    packageFragments('kotlin.B': FqName@55) = null
-    packageFragments('kotlin.Int': FqName@56) = null
-    packageFragments('kotlin.MyProperty': FqName@57) = null
-    packageFragments('kotlin.MyPropertyContainer': FqName@58) = null
-    packageFragments('kotlin.O': FqName@59) = null
-    packageFragments('kotlin.Outer': FqName@60) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@61) = null
-    packageFragments('kotlin.R': FqName@62) = null
-    packageFragments('kotlin.String': FqName@63) = null
-    packageFragments('kotlin.T': FqName@64) = null
-    packageFragments('kotlin.io': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = null
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@70) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('get': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getMyConcreteProperty': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getMyProperty': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('minus': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('plus': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('println': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('propertyDelegated': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('set': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('MyProperty': Name@73) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('PropertyMetadataImpl': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('foo': Name@76) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('get': Name@77) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getMyConcreteProperty': Name@78) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getMyProperty': Name@79) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('minus': Name@80) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('plus': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('println': Name@82) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('propertyDelegated': Name@83) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('set': Name@84) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-null {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@504[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
deleted file mode 100644
index 0899205956d..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
+++ /dev/null
@@ -1,696 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('MyProperty1': FqName@51) = null
-    packageFragments('MyProperty2': FqName@52) = null
-    packageFragments('MyProperty3': FqName@53) = null
-    packageFragments('PropertyMetadata': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('foo': FqName@57) = null
-    packageFragments('foo.A1': FqName@58) = null
-    packageFragments('foo.A2': FqName@59) = null
-    packageFragments('foo.A3': FqName@60) = null
-    packageFragments('foo.Any': FqName@61) = null
-    packageFragments('foo.MyProperty1': FqName@62) = null
-    packageFragments('foo.MyProperty2': FqName@63) = null
-    packageFragments('foo.MyProperty3': FqName@64) = null
-    packageFragments('foo.PropertyMetadata': FqName@65) = null
-    packageFragments('foo.String': FqName@66) = null
-    packageFragments('foo.T': FqName@67) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.Any': FqName@72) = null
-    packageFragments('java.lang.MyProperty1': FqName@73) = null
-    packageFragments('java.lang.MyProperty2': FqName@74) = null
-    packageFragments('java.lang.MyProperty3': FqName@75) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@76) = null
-    packageFragments('java.lang.String': FqName@77) = null
-    packageFragments('java.lang.T': FqName@78) = null
-    packageFragments('kotlin': FqName@79) = null
-    packageFragments('kotlin.Any': FqName@80) = null
-    packageFragments('kotlin.MyProperty1': FqName@81) = null
-    packageFragments('kotlin.MyProperty2': FqName@82) = null
-    packageFragments('kotlin.MyProperty3': FqName@83) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@84) = null
-    packageFragments('kotlin.String': FqName@85) = null
-    packageFragments('kotlin.T': FqName@86) = null
-    packageFragments('kotlin.io': FqName@87) = null
-    packageFragments('kotlin.jvm': FqName@88) = null
-    topLevelClasses(JavaClassImpl@89['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@71['lang'] {
-    classes('Exception': Name@96) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('MyProperty1': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('MyProperty2': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('MyProperty3': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('PropertyMetadataImpl': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('get': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('propertyDelegated': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('Exception': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('MyProperty1': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('MyProperty2': Name@99) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('MyProperty3': Name@100) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('PropertyMetadataImpl': Name@101) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('get': Name@102) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('propertyDelegated': Name@103) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[4] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[4] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[4] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-null {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@211[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = ArrayList@212[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = ArrayList@213[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = ArrayList@214[5] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = ArrayList@215[5] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@216[5] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
deleted file mode 100644
index 0705ce4545d..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
+++ /dev/null
@@ -1,945 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A': FqName@50) = null
-    packageFragments('B': FqName@51) = null
-    packageFragments('Int': FqName@52) = null
-    packageFragments('PropertyMetadata': FqName@53) = null
-    packageFragments('R': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('foo': FqName@56) = null
-    packageFragments('foo.A': FqName@57) = null
-    packageFragments('foo.B': FqName@58) = null
-    packageFragments('foo.Int': FqName@59) = null
-    packageFragments('foo.MyProperty': FqName@60) = null
-    packageFragments('foo.PropertyMetadata': FqName@61) = null
-    packageFragments('foo.R': FqName@62) = null
-    packageFragments('foo.T': FqName@63) = null
-    packageFragments('foo.e': FqName@64) = null
-    packageFragments('foo.r': FqName@65) = null
-    packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
-    packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
-    packageFragments('java.lang.A': FqName@70) = null
-    packageFragments('java.lang.B': FqName@71) = null
-    packageFragments('java.lang.Int': FqName@72) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@73) = null
-    packageFragments('java.lang.R': FqName@74) = null
-    packageFragments('java.lang.T': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.A': FqName@77) = null
-    packageFragments('kotlin.B': FqName@78) = null
-    packageFragments('kotlin.Int': FqName@79) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@80) = null
-    packageFragments('kotlin.R': FqName@81) = null
-    packageFragments('kotlin.T': FqName@82) = null
-    packageFragments('kotlin.io': FqName@83) = null
-    packageFragments('kotlin.jvm': FqName@84) = null
-    topLevelClasses(JavaClassImpl@85['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@89) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@69['lang'] {
-    classes('Exception': Name@92) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('MyProperty': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('PropertyMetadataImpl': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('get': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('propertyDelegated': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('Exception': Name@92) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('MyProperty': Name@94) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('PropertyMetadataImpl': Name@95) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('get': Name@96) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('propertyDelegated': Name@97) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[4] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-null {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@218[5] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
deleted file mode 100644
index 9950c9265cd..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/labeledDelegatedExpression.lazy.log
+++ /dev/null
@@ -1,362 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A3': FqName@50) = null
-    packageFragments('Any': FqName@51) = null
-    packageFragments('MyProperty': FqName@52) = null
-    packageFragments('PropertyMetadata': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.MyProperty': FqName@61) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('java.lang.T': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Any': FqName@66) = null
-    packageFragments('kotlin.MyProperty': FqName@67) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@68) = null
-    packageFragments('kotlin.String': FqName@69) = null
-    packageFragments('kotlin.T': FqName@70) = null
-    packageFragments('kotlin.io': FqName@71) = null
-    packageFragments('kotlin.jvm': FqName@72) = null
-    topLevelClasses(JavaClassImpl@73['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Exception': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('MyProperty': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('PropertyMetadata': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('PropertyMetadataImpl': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('Exception': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('MyProperty': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('PropertyMetadataImpl': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@76) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('MyProperty': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('PropertyMetadataImpl': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('MyProperty': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('PropertyMetadataImpl': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@129[5] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
deleted file mode 100644
index a7aff13eae2..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
+++ /dev/null
@@ -1,1354 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MyProperty1<2>']
-    <name not found> = JetTypeImpl@2['MyProperty2<2>']
-    <name not found> = NullableType@3
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['Exception']
-}
-
-LazyJavaClassTypeConstructor@11['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassifierType@15['String'] {
-    arguments = ArrayList@16[empty]
-    classifier = JavaClassImpl@17['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@23['String'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@17['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@25['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['Throwable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@40['Throwable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@39['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('A': FqName@54) = null
-    packageFragments('Any': FqName@55) = null
-    packageFragments('B': FqName@56) = null
-    packageFragments('Int': FqName@57) = null
-    packageFragments('PropertyMetadata': FqName@58) = null
-    packageFragments('R': FqName@59) = null
-    packageFragments('String': FqName@60) = null
-    packageFragments('T': FqName@61) = null
-    packageFragments('foo': FqName@62) = null
-    packageFragments('foo.A': FqName@63) = null
-    packageFragments('foo.Any': FqName@64) = null
-    packageFragments('foo.B': FqName@65) = null
-    packageFragments('foo.Int': FqName@66) = null
-    packageFragments('foo.MyProperty1': FqName@67) = null
-    packageFragments('foo.MyProperty2': FqName@68) = null
-    packageFragments('foo.PropertyMetadata': FqName@69) = null
-    packageFragments('foo.R': FqName@70) = null
-    packageFragments('foo.String': FqName@71) = null
-    packageFragments('foo.T': FqName@72) = null
-    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
-    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
-    packageFragments('java.lang.A': FqName@77) = null
-    packageFragments('java.lang.Any': FqName@78) = null
-    packageFragments('java.lang.B': FqName@79) = null
-    packageFragments('java.lang.Int': FqName@80) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@81) = null
-    packageFragments('java.lang.R': FqName@82) = null
-    packageFragments('java.lang.String': FqName@83) = null
-    packageFragments('java.lang.T': FqName@84) = null
-    packageFragments('kotlin': FqName@85) = null
-    packageFragments('kotlin.A': FqName@86) = null
-    packageFragments('kotlin.Any': FqName@87) = null
-    packageFragments('kotlin.B': FqName@88) = null
-    packageFragments('kotlin.Int': FqName@89) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@90) = null
-    packageFragments('kotlin.R': FqName@91) = null
-    packageFragments('kotlin.String': FqName@92) = null
-    packageFragments('kotlin.T': FqName@93) = null
-    packageFragments('kotlin.io': FqName@94) = null
-    packageFragments('kotlin.jvm': FqName@95) = null
-    topLevelClasses(JavaClassImpl@96['Exception']) = LazyJavaClassDescriptor@4['Exception']
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@99 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@100) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@76['lang'] {
-    classes('Exception': Name@103) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('MyProperty1': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('MyProperty2': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('PropertyMetadataImpl': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('get': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('getMyProperty1': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('getMyProperty2': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('println': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('propertyDelegated': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('set': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@99 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('Exception': Name@103) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('MyProperty1': Name@105) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('MyProperty2': Name@106) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('PropertyMetadataImpl': Name@107) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('get': Name@108) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('getMyProperty1': Name@109) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('getMyProperty2': Name@110) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('println': Name@111) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('propertyDelegated': Name@112) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('set': Name@113) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[4] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[4] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
-
-null {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@315[5] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@316[5] { ResolutionCandidate@263, ResolutionCandidate@264, ResolutionCandidate@265, ... }
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-    <name not found> = EmptyList@101[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
deleted file mode 100644
index 5bee2af45c7..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
+++ /dev/null
@@ -1,393 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('MyProperty': FqName@53) = null
-    packageFragments('PropertyMetadata': FqName@54) = null
-    packageFragments('R': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.PropertyMetadata': FqName@61) = null
-    packageFragments('java.lang.R': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@65) = null
-    packageFragments('kotlin.R': FqName@66) = null
-    packageFragments('kotlin.T': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@70['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('PropertyMetadata': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('get': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('MyProperty': Name@73) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('PropertyMetadataImpl': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('get': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('get': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('MyProperty': Name@73) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('PropertyMetadataImpl': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('get': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[4] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
-
-null {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@152[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = ArrayList@153[5] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137, ... }
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-    <name not found> = EmptyList@78[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
deleted file mode 100644
index 0297d95aed3..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
+++ /dev/null
@@ -1,383 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('MyProperty': FqName@54) = null
-    packageFragments('PropertyMetadata': FqName@55) = null
-    packageFragments('R': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@62) = null
-    packageFragments('java.lang.R': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@66) = null
-    packageFragments('kotlin.R': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@70['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('MyProperty': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('PropertyMetadata': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('PropertyMetadataImpl': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('a': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('propertyDelegated': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('Exception': Name@71) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('MyProperty': Name@74) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('PropertyMetadataImpl': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('get': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('propertyDelegated': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('MyProperty': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('PropertyMetadataImpl': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('a': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('get': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('propertyDelegated': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@71) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('MyProperty': Name@74) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('PropertyMetadataImpl': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('get': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('propertyDelegated': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-null {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@131[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
deleted file mode 100644
index 2fbec7f5204..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
+++ /dev/null
@@ -1,2939 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MyProperty1<2>']
-    <name not found> = JetTypeImpl@2['MyProperty2<1>']
-    <name not found> = JetTypeImpl@3['MyProperty3<1>']
-    <name not found> = NullableType@4
-}
-
-LazyJavaClassDescriptor@5['Exception'] {
-    constructors = ArrayList@6[5] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['Exception']
-}
-
-LazyJavaClassTypeConstructor@12['Exception'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Throwable'] }
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@34['Throwable'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@36['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@15['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@51['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('A': FqName@55) = null
-    packageFragments('Any': FqName@56) = null
-    packageFragments('B': FqName@57) = null
-    packageFragments('PropertyMetadata': FqName@58) = null
-    packageFragments('R': FqName@59) = null
-    packageFragments('String': FqName@60) = null
-    packageFragments('T': FqName@61) = null
-    packageFragments('foo': FqName@62) = null
-    packageFragments('foo.A': FqName@63) = null
-    packageFragments('foo.A1': FqName@64) = null
-    packageFragments('foo.A2': FqName@65) = null
-    packageFragments('foo.A3': FqName@66) = null
-    packageFragments('foo.Any': FqName@67) = null
-    packageFragments('foo.B': FqName@68) = null
-    packageFragments('foo.MyProperty1': FqName@69) = null
-    packageFragments('foo.MyProperty2': FqName@70) = null
-    packageFragments('foo.MyProperty3': FqName@71) = null
-    packageFragments('foo.PropertyMetadata': FqName@72) = null
-    packageFragments('foo.R': FqName@73) = null
-    packageFragments('foo.String': FqName@74) = null
-    packageFragments('foo.T': FqName@75) = null
-    packageFragments('foo.c1': FqName@76) = null
-    packageFragments('foo.c2': FqName@77) = null
-    packageFragments('foo.c3': FqName@78) = null
-    packageFragments('foo.d1': FqName@79) = null
-    packageFragments('foo.d2': FqName@80) = null
-    packageFragments('foo.d3': FqName@81) = null
-    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    packageFragments('java.lang': FqName@84) = LazyJavaPackageFragment@85['lang']
-    packageFragments('java.lang.A': FqName@86) = null
-    packageFragments('java.lang.Any': FqName@87) = null
-    packageFragments('java.lang.B': FqName@88) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@89) = null
-    packageFragments('java.lang.R': FqName@90) = null
-    packageFragments('java.lang.String': FqName@91) = null
-    packageFragments('java.lang.T': FqName@92) = null
-    packageFragments('kotlin': FqName@93) = null
-    packageFragments('kotlin.A': FqName@94) = null
-    packageFragments('kotlin.Any': FqName@95) = null
-    packageFragments('kotlin.B': FqName@96) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@97) = null
-    packageFragments('kotlin.R': FqName@98) = null
-    packageFragments('kotlin.String': FqName@99) = null
-    packageFragments('kotlin.T': FqName@100) = null
-    packageFragments('kotlin.io': FqName@101) = null
-    packageFragments('kotlin.jvm': FqName@102) = null
-    topLevelClasses(JavaClassImpl@103['Exception']) = LazyJavaClassDescriptor@5['Exception']
-}
-
-LazyJavaPackageFragment@83['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@107) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@85['lang'] {
-    classes('Exception': Name@110) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty1': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty2': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty3': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('PropertyMetadataImpl': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('get': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty1': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty2': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty3': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('println': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('propertyDelegated': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('set': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('Exception': Name@110) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty1': Name@112) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty2': Name@113) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty3': Name@114) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('PropertyMetadataImpl': Name@115) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('get': Name@116) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty1': Name@117) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty2': Name@118) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty3': Name@119) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('println': Name@120) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('propertyDelegated': Name@121) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('set': Name@122) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-}
-
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-}
-
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-}
-
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-}
-
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-}
-
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-}
-
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-}
-
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-}
-
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@477 }
-}
-
-ResolutionTaskHolder@478 {
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-}
-
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-}
-
-ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@489 }
-}
-
-ResolutionTaskHolder@490 {
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
-}
-
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-}
-
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-}
-
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
-}
-
-ResolutionTaskHolder@502 {
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@504 }
-}
-
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-}
-
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-}
-
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
-}
-
-ResolutionTaskHolder@514 {
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@516 }
-}
-
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
-}
-
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-}
-
-ResolutionTaskHolder@523 {
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
-}
-
-ResolutionTaskHolder@526 {
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
-}
-
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
-}
-
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-}
-
-ResolutionTaskHolder@535 {
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@537 }
-}
-
-ResolutionTaskHolder@538 {
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
-}
-
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-}
-
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-}
-
-ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[1] { ResolutionCandidate@549 }
-}
-
-ResolutionTaskHolder@550 {
-    <name not found> = ArrayList@551[1] { ResolutionCandidate@552 }
-}
-
-ResolutionTaskHolder@553 {
-    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
-}
-
-ResolutionTaskHolder@556 {
-    <name not found> = ArrayList@557[1] { ResolutionCandidate@558 }
-}
-
-ResolutionTaskHolder@559 {
-    <name not found> = ArrayList@560[1] { ResolutionCandidate@561 }
-}
-
-ResolutionTaskHolder@562 {
-    <name not found> = ArrayList@563[1] { ResolutionCandidate@564 }
-}
-
-ResolutionTaskHolder@565 {
-    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
-}
-
-ResolutionTaskHolder@568 {
-    <name not found> = ArrayList@569[1] { ResolutionCandidate@570 }
-}
-
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[1] { ResolutionCandidate@573 }
-}
-
-ResolutionTaskHolder@574 {
-    <name not found> = ArrayList@575[1] { ResolutionCandidate@576 }
-}
-
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[4] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[4] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@589 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@592 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@593 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@595 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@596 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@598 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-null {
-    <name not found> = ArrayList@599[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@600[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@602[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@603[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@605[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@606[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@549 }
-    <name not found> = ArrayList@608[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@567 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@525 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@537 }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@492 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@564 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@516 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@513 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@531 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@501 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@552 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@540 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@528 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@489 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@558 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@570 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@573 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@576 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@555 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@477 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@519 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@561 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@465 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@504 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@750[5] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = ArrayList@751[5] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
deleted file mode 100644
index 133064eea79..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
+++ /dev/null
@@ -1,1938 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MyProperty1<2>']
-    <name not found> = JetTypeImpl@2['MyProperty2<1>']
-    <name not found> = JetTypeImpl@3['MyProperty3<1>']
-    <name not found> = NullableType@4
-}
-
-LazyJavaClassDescriptor@5['Exception'] {
-    constructors = ArrayList@6[5] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['Exception']
-}
-
-LazyJavaClassTypeConstructor@12['Exception'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Throwable'] }
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@34['Throwable'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@43['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@36['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@15['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@51['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('A': FqName@55) = null
-    packageFragments('Any': FqName@56) = null
-    packageFragments('B': FqName@57) = null
-    packageFragments('PropertyMetadata': FqName@58) = null
-    packageFragments('R': FqName@59) = null
-    packageFragments('String': FqName@60) = null
-    packageFragments('T': FqName@61) = null
-    packageFragments('foo': FqName@62) = null
-    packageFragments('foo.A': FqName@63) = null
-    packageFragments('foo.A1': FqName@64) = null
-    packageFragments('foo.A2': FqName@65) = null
-    packageFragments('foo.A3': FqName@66) = null
-    packageFragments('foo.Any': FqName@67) = null
-    packageFragments('foo.B': FqName@68) = null
-    packageFragments('foo.MyProperty1': FqName@69) = null
-    packageFragments('foo.MyProperty2': FqName@70) = null
-    packageFragments('foo.MyProperty3': FqName@71) = null
-    packageFragments('foo.PropertyMetadata': FqName@72) = null
-    packageFragments('foo.R': FqName@73) = null
-    packageFragments('foo.String': FqName@74) = null
-    packageFragments('foo.T': FqName@75) = null
-    packageFragments('foo.c1': FqName@76) = null
-    packageFragments('foo.c2': FqName@77) = null
-    packageFragments('foo.c3': FqName@78) = null
-    packageFragments('foo.d1': FqName@79) = null
-    packageFragments('foo.d2': FqName@80) = null
-    packageFragments('foo.d3': FqName@81) = null
-    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    packageFragments('java.lang': FqName@84) = LazyJavaPackageFragment@85['lang']
-    packageFragments('java.lang.A': FqName@86) = null
-    packageFragments('java.lang.Any': FqName@87) = null
-    packageFragments('java.lang.B': FqName@88) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@89) = null
-    packageFragments('java.lang.R': FqName@90) = null
-    packageFragments('java.lang.String': FqName@91) = null
-    packageFragments('java.lang.T': FqName@92) = null
-    packageFragments('kotlin': FqName@93) = null
-    packageFragments('kotlin.A': FqName@94) = null
-    packageFragments('kotlin.Any': FqName@95) = null
-    packageFragments('kotlin.B': FqName@96) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@97) = null
-    packageFragments('kotlin.R': FqName@98) = null
-    packageFragments('kotlin.String': FqName@99) = null
-    packageFragments('kotlin.T': FqName@100) = null
-    packageFragments('kotlin.io': FqName@101) = null
-    packageFragments('kotlin.jvm': FqName@102) = null
-    topLevelClasses(JavaClassImpl@103['Exception']) = LazyJavaClassDescriptor@5['Exception']
-}
-
-LazyJavaPackageFragment@83['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@107) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@85['lang'] {
-    classes('Exception': Name@110) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty1': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty2': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MyProperty3': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('PropertyMetadataImpl': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('get': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty1': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty2': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('getMyProperty3': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('println': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('propertyDelegated': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('Exception': Name@110) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty1': Name@112) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty2': Name@113) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MyProperty3': Name@114) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('PropertyMetadataImpl': Name@115) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('get': Name@116) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty1': Name@117) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty2': Name@118) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('getMyProperty3': Name@119) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('println': Name@120) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('propertyDelegated': Name@121) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[4] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[4] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
-
-null {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@497[5] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
-    <name not found> = ArrayList@498[5] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-    <name not found> = EmptyList@108[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
deleted file mode 100644
index 67135bf1fff..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
+++ /dev/null
@@ -1,169 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('ValueWrapper': FqName@7) = null
-    packageFragments('foo': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('PropertyMetadataImpl': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('ValueWrapper': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('propertyDelegated': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('value': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('PropertyMetadataImpl': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('ValueWrapper': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('get': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('propertyDelegated': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('PropertyMetadataImpl': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('ValueWrapper': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('propertyDelegated': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('value': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('PropertyMetadataImpl': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('ValueWrapper': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('get': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('propertyDelegated': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
deleted file mode 100644
index d2cd80fc369..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Local': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('Delegate': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
deleted file mode 100644
index c66db4b368f..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
+++ /dev/null
@@ -1,143 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('PropertyMetadataImpl': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('propertyDelegated': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('A': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('PropertyMetadataImpl': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('propertyDelegated': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('A': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('PropertyMetadataImpl': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('propertyDelegated': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('A': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('PropertyMetadataImpl': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('propertyDelegated': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
deleted file mode 100644
index 9a1babd0a4f..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('A': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('set': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('A': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('set': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
deleted file mode 100644
index 60d78f39646..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
+++ /dev/null
@@ -1,412 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('B': FqName@53) = null
-    packageFragments('Delegate': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('PropertyMetadata': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('ag': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Any': FqName@63) = null
-    packageFragments('java.lang.Int': FqName@64) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@65) = null
-    packageFragments('java.lang.T': FqName@66) = null
-    packageFragments('java.lang.ag': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.Any': FqName@69) = null
-    packageFragments('kotlin.Int': FqName@70) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.ag': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    topLevelClasses(JavaClassImpl@76['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Delegate': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Exception': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('PropertyMetadata': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('PropertyMetadataImpl': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('ag': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Delegate': Name@79) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Exception': Name@80) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('PropertyMetadataImpl': Name@83) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('ag': Name@88) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('equals': Name@85) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('Delegate': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Exception': Name@80) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('PropertyMetadataImpl': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('ag': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('Delegate': Name@79) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('Exception': Name@80) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('PropertyMetadataImpl': Name@83) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('ag': Name@88) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('equals': Name@85) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@146[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
deleted file mode 100644
index 8943c0f9982..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
+++ /dev/null
@@ -1,146 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
-}
-
-null {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@84, ResolutionCandidate@85 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
deleted file mode 100644
index fe3ccd06029..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
+++ /dev/null
@@ -1,127 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('Delegate': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('equals': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
deleted file mode 100644
index 72263ba12d8..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
deleted file mode 100644
index cf0b4ace765..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
deleted file mode 100644
index 119b62e8e92..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
+++ /dev/null
@@ -1,193 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
deleted file mode 100644
index 294227030e9..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
+++ /dev/null
@@ -1,148 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Delegate': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('PropertyMetadata': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
deleted file mode 100644
index 19a5ff6bf1e..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
+++ /dev/null
@@ -1,274 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Any': FqName@8) = null
-    packageFragments('Delegate': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('PropertyMetadata': FqName@11) = null
-    packageFragments('a': FqName@12) = null
-    packageFragments('b': FqName@13) = null
-    packageFragments('c': FqName@14) = null
-    packageFragments('d': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Delegate': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('PropertyMetadata': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('PropertyMetadataImpl': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('a': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('b': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('c': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('d': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Delegate': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('PropertyMetadataImpl': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Delegate': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('PropertyMetadataImpl': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('a': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('b': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('c': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('d': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('Delegate': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('PropertyMetadataImpl': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('equals': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-null {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
deleted file mode 100644
index 580c920c50c..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
deleted file mode 100644
index 3f655eef0e9..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
+++ /dev/null
@@ -1,189 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
deleted file mode 100644
index 4bfd3febc1a..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
+++ /dev/null
@@ -1,394 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('Delegate': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('PropertyMetadata': FqName@8) = null
-    packageFragments('cTopLevel': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Delegate': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Delegate': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
deleted file mode 100644
index 09cf64f8117..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
+++ /dev/null
@@ -1,221 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Derived': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.Derived': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.Derived': FqName@20) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
deleted file mode 100644
index 6f1e8119c2e..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
+++ /dev/null
@@ -1,387 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Delegate': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('PropertyMetadata': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
deleted file mode 100644
index 1a9c7bc1993..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
+++ /dev/null
@@ -1,327 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('aTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
deleted file mode 100644
index 91dba9a736d..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
+++ /dev/null
@@ -1,380 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Nothing': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('aTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Nothing': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Nothing': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
deleted file mode 100644
index de2599fbe1d..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
+++ /dev/null
@@ -1,436 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Nothing': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('aTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Nothing': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Nothing': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
deleted file mode 100644
index befe8a912a1..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
+++ /dev/null
@@ -1,237 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
deleted file mode 100644
index c7916d93877..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
+++ /dev/null
@@ -1,148 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('c': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
deleted file mode 100644
index b37ebf27831..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
+++ /dev/null
@@ -1,502 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('Delegate': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Nothing': FqName@8) = null
-    packageFragments('PropertyMetadata': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('bTopLevel': FqName@11) = null
-    packageFragments('cTopLevel': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.C': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.Nothing': FqName@20) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.C': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.Nothing': FqName@27) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@28) = null
-    packageFragments('kotlin.T': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Nothing': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('PropertyMetadata': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('PropertyMetadataImpl': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('PropertyMetadataImpl': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
deleted file mode 100644
index f272757f048..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
+++ /dev/null
@@ -1,401 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('aTopLevel': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadata': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('equals': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
deleted file mode 100644
index ff945c4db0e..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
+++ /dev/null
@@ -1,315 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('bTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
deleted file mode 100644
index 59a7b281806..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
+++ /dev/null
@@ -1,331 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('aTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
deleted file mode 100644
index 2b1d0dc946c..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
+++ /dev/null
@@ -1,402 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Delegate': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('PropertyMetadata': FqName@7) = null
-    packageFragments('aTopLevel': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
deleted file mode 100644
index 50939fcbc04..00000000000
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
+++ /dev/null
@@ -1,184 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Delegate': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('PropertyMetadata': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
deleted file mode 100644
index 6153f6c4545..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
+++ /dev/null
@@ -1,87 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Br': FqName@3) = null
-    packageFragments('Br1': FqName@4) = null
-    packageFragments('G': FqName@5) = null
-    packageFragments('GC1': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Br': FqName@13) = null
-    packageFragments('java.lang.Br1': FqName@14) = null
-    packageFragments('java.lang.G': FqName@15) = null
-    packageFragments('java.lang.GC1': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Br': FqName@20) = null
-    packageFragments('kotlin.Br1': FqName@21) = null
-    packageFragments('kotlin.G': FqName@22) = null
-    packageFragments('kotlin.GC1': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('override': FqName@28) = null
-    packageFragments('override.Br': FqName@29) = null
-    packageFragments('override.Br1': FqName@30) = null
-    packageFragments('override.Br2': FqName@31) = null
-    packageFragments('override.Br3': FqName@32) = null
-    packageFragments('override.G': FqName@33) = null
-    packageFragments('override.GC': FqName@34) = null
-    packageFragments('override.GC1': FqName@35) = null
-    packageFragments('override.GC2': FqName@36) = null
-    packageFragments('override.Int': FqName@37) = null
-    packageFragments('override.T': FqName@38) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
deleted file mode 100644
index f617861466c..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
+++ /dev/null
@@ -1,150 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('AImpl': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('C': FqName@8) = null
-    packageFragments('D': FqName@9) = null
-    packageFragments('E': FqName@10) = null
-    packageFragments('F': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('String': FqName@13) = null
-    packageFragments('T': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.A': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.T': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('AImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('baz': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('boo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('AImpl': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('baz': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('boo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('AImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('baz': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('boo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('AImpl': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('baz': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('boo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
deleted file mode 100644
index 1c224458c02..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Barrr': FqName@3) = null
-    packageFragments('Br': FqName@4) = null
-    packageFragments('EN': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Test2': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.EN': FqName@13) = null
-    packageFragments('java.lang.Foo': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.EN': FqName@17) = null
-    packageFragments('kotlin.Foo': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Foo': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Foo': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
deleted file mode 100644
index 64371907769..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaClassDescriptor@0['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassDescriptor@2['Object'] {
-    allDescriptors = ArrayList@3[11] { JavaMethodDescriptor@4['notifyAll'], JavaMethodDescriptor@5['notify'], JavaMethodDescriptor@6['hashCode'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Object']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@7
-    functions('clone': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['clone'] } // through LazyJavaClassMemberScope@7
-    functions('equals': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['equals'] } // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['finalize'] } // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@19) = ArrayList@20[1] { JavaMethodDescriptor@21['getClass'] } // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@22) = ArrayList@23[1] { JavaMethodDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('notify': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@5['notify'] } // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@4['notifyAll'] } // through LazyJavaClassMemberScope@7
-    functions('toString': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@31) = ArrayList@32[3] { JavaMethodDescriptor@33['wait'], JavaMethodDescriptor@34['wait'], JavaMethodDescriptor@35['wait'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Object']
-}
-
-LazyJavaClassDescriptor@40['Runnable'] {
-    allDescriptors = ArrayList@41[4] { DeserializedSimpleFunctionDescriptor@42['hashCode'], DeserializedSimpleFunctionDescriptor@43['toString'], JavaMethodDescriptor@44['run'], ... } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@46['Runnable']
-    enumEntryIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@45
-    functions('clone': Name@48) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    functions('equals': Name@50) = ArrayList@51[1] { DeserializedSimpleFunctionDescriptor@52['equals'] } // through LazyJavaClassMemberScope@45
-    functions('finalize': Name@53) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    functions('getClass': Name@54) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    functions('hashCode': Name@55) = ArrayList@56[1] { DeserializedSimpleFunctionDescriptor@42['hashCode'] } // through LazyJavaClassMemberScope@45
-    functions('notify': Name@57) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    functions('notifyAll': Name@58) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    functions('run': Name@59) = ArrayList@60[1] { JavaMethodDescriptor@44['run'] } // through LazyJavaClassMemberScope@45
-    functions('toString': Name@61) = ArrayList@62[1] { DeserializedSimpleFunctionDescriptor@43['toString'] } // through LazyJavaClassMemberScope@45
-    functions('wait': Name@63) = EmptyList@49[empty] // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@64 // through LazyJavaClassMemberScope@45
-    nestedClassIndex = LinkedHashMap@65 // through LazyJavaClassMemberScope@45
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@66['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@67['Runnable']
-}
-
-LazyJavaClassTypeConstructor@1['Class'] {
-    parameters = ArrayList@68[1] { LazyJavaTypeParameterDescriptor@69['T'] }
-}
-
-LazyJavaClassTypeConstructor@39['Object'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[1] { JetTypeImpl@72['Any'] }
-}
-
-LazyJavaClassTypeConstructor@67['Runnable'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[1] { JetTypeImpl@72['Any'] }
-}
-
-LazyJavaClassifierType@75['Class<?>'] {
-    arguments = ArrayList@76[1] { LazyStarProjection@77 }
-    classifier = JavaClassImpl@78['Class']
-    nullable = 'false': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassifierType@80['Class<?>'] {
-    arguments = ArrayList@81[1] { LazyStarProjection@82 }
-    classifier = JavaClassImpl@78['Class']
-    nullable = 'true': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@1['Class']
-}
-
-LazyJavaClassifierType@84['Object'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['Object']
-    nullable = 'false': Boolean@79
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@88['Object'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['Object']
-    nullable = 'false': Boolean@79
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@91['Object'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@86['Object']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@93['Object'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@90['Object']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@95['Object'] {
-    classifier = JavaClassImpl@96['Object']
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@97['String'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['String']
-    nullable = 'false': Boolean@79
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@101['String'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@99['String']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('Object': FqName@106) = null
-    packageFragments('Runnable': FqName@107) = null
-    packageFragments('TestIface': FqName@108) = null
-    packageFragments('TestObject': FqName@109) = null
-    packageFragments('java': FqName@110) = LazyJavaPackageFragment@111['java']
-    packageFragments('java.lang': FqName@112) = LazyJavaPackageFragment@113['lang']
-    packageFragments('java.lang.Object': FqName@114) = null
-    packageFragments('java.lang.Runnable': FqName@115) = null
-    packageFragments('kotlin': FqName@116) = null
-    packageFragments('kotlin.Object': FqName@117) = null
-    packageFragments('kotlin.Runnable': FqName@118) = null
-    packageFragments('kotlin.io': FqName@119) = null
-    packageFragments('kotlin.jvm': FqName@120) = null
-    topLevelClasses(JavaClassImpl@78['Class']) = LazyJavaClassDescriptor@0['Class']
-    topLevelClasses(JavaClassImpl@121['Object']) = LazyJavaClassDescriptor@2['Object']
-    topLevelClasses(JavaClassImpl@122['Runnable']) = LazyJavaClassDescriptor@40['Runnable']
-}
-
-LazyJavaPackageFragment@105['<root>'] {
-    classes('Object': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Runnable': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-LazyJavaPackageFragment@111['java'] {
-    classes('lang': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@128 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('lang': Name@129) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
-}
-
-LazyJavaPackageFragment@113['lang'] {
-    classes('Object': Name@123) = LazyJavaClassDescriptor@2['Object'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Runnable': Name@125) = LazyJavaClassDescriptor@40['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaTypeParameterDescriptor@69['T'] {
-    upperBounds = LinkedHashSet@132[1] { NullableType@133 }
-    upperBoundsAsType = NullableType@133
-}
-
-LazyJavaTypeParameterResolver@134 {
-    resolve(JavaTypeParameterImpl@135['T']) = LazyJavaTypeParameterDescriptor@69['T']
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-null {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@141 }
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
deleted file mode 100644
index fcd70412e4d..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('One': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('Test123': FqName@6) = null
-    packageFragments('Test132': FqName@7) = null
-    packageFragments('Test213': FqName@8) = null
-    packageFragments('Test231': FqName@9) = null
-    packageFragments('Test312': FqName@10) = null
-    packageFragments('Test321': FqName@11) = null
-    packageFragments('Three': FqName@12) = null
-    packageFragments('Two': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.One': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.Three': FqName@21) = null
-    packageFragments('java.lang.Two': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.One': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.Three': FqName@27) = null
-    packageFragments('kotlin.Two': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
deleted file mode 100644
index d53ceacdd9c..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
deleted file mode 100644
index 3d353ee6e47..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('One': FqName@6) = null
-    packageFragments('OneImpl': FqName@7) = null
-    packageFragments('Test1': FqName@8) = null
-    packageFragments('Test2': FqName@9) = null
-    packageFragments('Test3': FqName@10) = null
-    packageFragments('Two': FqName@11) = null
-    packageFragments('TwoImpl': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.One': FqName@18) = null
-    packageFragments('java.lang.OneImpl': FqName@19) = null
-    packageFragments('java.lang.Two': FqName@20) = null
-    packageFragments('java.lang.TwoImpl': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.One': FqName@24) = null
-    packageFragments('kotlin.OneImpl': FqName@25) = null
-    packageFragments('kotlin.Two': FqName@26) = null
-    packageFragments('kotlin.TwoImpl': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
deleted file mode 100644
index c96784838c5..00000000000
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log b/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
deleted file mode 100644
index 16228b78ff7..00000000000
--- a/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Array': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Array': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('t': FqName@16) = null
-    packageFragments('t.Array': FqName@17) = null
-    packageFragments('t.Int': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
deleted file mode 100644
index f26c4e02ddc..00000000000
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
+++ /dev/null
@@ -1,234 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Long': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Long': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('m': FqName@22) = null
-    packageFragments('m.Any': FqName@23) = null
-    packageFragments('m.Int': FqName@24) = null
-    packageFragments('m.Long': FqName@25) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('use': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('use': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
deleted file mode 100644
index e8c0c22bff9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
deleted file mode 100644
index e8c0c22bff9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
deleted file mode 100644
index d8100e4ebde..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
deleted file mode 100644
index e8c0c22bff9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
deleted file mode 100644
index b084a22f453..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Base': FqName@3) = null
-    packageFragments('Derived': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Base': FqName@10) = null
-    packageFragments('java.lang.Derived': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Base': FqName@14) = null
-    packageFragments('kotlin.Derived': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
deleted file mode 100644
index 5799c7b75c1..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('D': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.D': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.D': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
deleted file mode 100644
index 53298de5e98..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.List': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.List': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('List': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.lazy.log
deleted file mode 100644
index 67628202437..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/overridesNothing.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
deleted file mode 100644
index d8f4e6761a1..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
+++ /dev/null
@@ -1,119 +0,0 @@
-LazyJavaClassDescriptor@0['Foo'] {
-    allDescriptors = ArrayList@1[5] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['foo'], SamAdapterFunctionDescriptor@4['foo'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['Foo']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@15) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@16) = ArrayList@17[2] { JavaMethodDescriptor@3['foo'], SamAdapterFunctionDescriptor@4['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@21) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@25['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@26) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Foo']
-}
-
-LazyJavaClassDescriptor@31['Sam'] {
-    functionTypeForSamInterface = JetTypeImpl@32['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['Sam']
-}
-
-LazyJavaClassTypeConstructor@30['Foo'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Sam'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Object'] {
-    classifier = JavaClassImpl@44['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@45['Sam'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Sam']
-    nullable = 'false': Boolean@48
-    typeConstructor = LazyJavaClassTypeConstructor@34['Sam']
-}
-
-LazyJavaClassifierType@49['Sam'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@47['Sam']
-    nullable = 'true': Boolean@51
-    typeConstructor = LazyJavaClassTypeConstructor@34['Sam']
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('Foo': FqName@55) = null
-    packageFragments('K': FqName@56) = null
-    packageFragments('K0': FqName@57) = null
-    packageFragments('Unit': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Foo': FqName@63) = null
-    packageFragments('java.lang.K0': FqName@64) = null
-    packageFragments('java.lang.Unit': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Foo': FqName@67) = null
-    packageFragments('kotlin.K0': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    packageFragments('p': FqName@72) = LazyJavaPackageFragment@73['p']
-    packageFragments('p.Foo': FqName@74) = null
-    packageFragments('p.K0': FqName@75) = null
-    packageFragments('p.Unit': FqName@76) = null
-    topLevelClasses(JavaClassImpl@77['Foo']) = LazyJavaClassDescriptor@0['Foo']
-    topLevelClasses(JavaClassImpl@47['Sam']) = LazyJavaClassDescriptor@31['Sam']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('Foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Unit': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@73['p'] {
-    classes('Foo': Name@78) = LazyJavaClassDescriptor@0['Foo'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('Unit': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-null {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@92 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
deleted file mode 100644
index e8c0c22bff9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.lazy.log
deleted file mode 100644
index 9f2611334f7..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('C': FqName@6) = null
-    packageFragments('Tr': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.C': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.lazy.log
deleted file mode 100644
index d1100575414..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.lazy.log
deleted file mode 100644
index d1100575414..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyInTrait.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.lazy.log
deleted file mode 100644
index 3041a23ab72..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.lazy.log
deleted file mode 100644
index d1100575414..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.lazy.log
deleted file mode 100644
index d1100575414..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionInTrait.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.lazy.log
deleted file mode 100644
index d1100575414..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
deleted file mode 100644
index d8c63ebf633..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.lazy.log
deleted file mode 100644
index d28d33a5c4f..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/fakeOverrideTrait.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.lazy.log
deleted file mode 100644
index d28d33a5c4f..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/trait.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.lazy.log
deleted file mode 100644
index 4472e84cd26..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/caseInProperties.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Aa': FqName@7) = null
-    packageFragments('aa': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.lazy.log
deleted file mode 100644
index e885830480a..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/collections.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('List': FqName@3) = null
-    packageFragments('MutableList': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.List': FqName@10) = null
-    packageFragments('java.lang.MutableList': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.List': FqName@14) = null
-    packageFragments('kotlin.MutableList': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('List': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('MutableList': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
deleted file mode 100644
index 418fa5d2d1b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Baz': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Bar': FqName@14) = null
-    packageFragments('java.lang.Foo': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.List': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Bar': FqName@21) = null
-    packageFragments('kotlin.Foo': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.List': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.T': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('List': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
deleted file mode 100644
index 142711908f9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Foo': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.List': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Foo': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.List': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('List': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.lazy.log
deleted file mode 100644
index c2702032d38..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/extensionProperties.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('foo': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.G': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.G': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
deleted file mode 100644
index 520b12d800f..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.G': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.G': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.lazy.log
deleted file mode 100644
index 4d0b877b90f..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/inheritFromTwoTraits.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Baz': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Bar': FqName@14) = null
-    packageFragments('java.lang.Foo': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.List': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Bar': FqName@21) = null
-    packageFragments('kotlin.Foo': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.List': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.T': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('List': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.lazy.log
deleted file mode 100644
index 70da21256ea..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/kotlinAndJavaCollections.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaClassDescriptor@0['List'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['List']
-}
-
-LazyJavaClassTypeConstructor@1['List'] {
-    parameters = ArrayList@2[1] { LazyJavaTypeParameterDescriptor@3['E'] }
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('List': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.util': FqName@15) = LazyJavaPackageFragment@16['util']
-    packageFragments('java.util.List': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.List': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    topLevelClasses(JavaClassImpl@23['List']) = LazyJavaClassDescriptor@0['List']
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('List': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('java': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('util': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('java': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@16['util'] {
-    classes('List': Name@36) = LazyJavaClassDescriptor@0['List'] // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaTypeParameterDescriptor@3['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@38
-    upperBounds = LinkedHashSet@39[1] { NullableType@40 }
-}
-
-LazyJavaTypeParameterResolver@41 {
-    resolve(JavaTypeParameterImpl@42['E']) = LazyJavaTypeParameterDescriptor@3['E']
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.lazy.log
deleted file mode 100644
index 51584706d9b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/nullableType.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.lazy.log
deleted file mode 100644
index 1cf4474b368..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Baz': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Bar': FqName@15) = null
-    packageFragments('java.lang.Foo': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.List': FqName@18) = null
-    packageFragments('java.lang.Long': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Bar': FqName@23) = null
-    packageFragments('kotlin.Foo': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.List': FqName@26) = null
-    packageFragments('kotlin.Long': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.T': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('List': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Long': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.lazy.log
deleted file mode 100644
index 0edea525473..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeMappedToJava.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-LazyJavaClassDescriptor@0['String'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['String']
-}
-
-LazyJavaClassTypeConstructor@1['String'] {
-    parameters = ArrayList@2[empty]
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    topLevelClasses(JavaClassImpl@16['String']) = LazyJavaClassDescriptor@0['String']
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('java': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('String': Name@26) = LazyJavaClassDescriptor@0['String'] // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('java': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
deleted file mode 100644
index edc51d278c0..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
deleted file mode 100644
index 6f595162625..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Foo': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Foo': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
deleted file mode 100644
index 69d4d95a801..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Bar': FqName@10) = null
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Bar': FqName@14) = null
-    packageFragments('kotlin.Foo': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
deleted file mode 100644
index 8e7b123b236..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Bar': FqName@10) = null
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Bar': FqName@14) = null
-    packageFragments('kotlin.Foo': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.lazy.log
deleted file mode 100644
index 4f526361b40..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/class.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('C': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.lazy.log
deleted file mode 100644
index 4f526361b40..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classObject.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('C': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.lazy.log
deleted file mode 100644
index b9785d3fd72..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/classPropertyInConstructor.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.lazy.log
deleted file mode 100644
index f0bf08e1258..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionFunctionAndNormalFunction.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Any': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.lazy.log
deleted file mode 100644
index dcc501f151b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/extensionPropertyAndFunction.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Any': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.lazy.log
deleted file mode 100644
index b588a62047c..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndSetter.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.lazy.log
deleted file mode 100644
index b588a62047c..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/functionAndVar.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.lazy.log
deleted file mode 100644
index 97f9d893e29..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClass.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.lazy.log
deleted file mode 100644
index b7c498aa8bb..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/localClassInClass.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Outer': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.lazy.log
deleted file mode 100644
index 000a45ff1b5..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/nestedClass.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.lazy.log
deleted file mode 100644
index 4f526361b40..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/object.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('C': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.lazy.log
deleted file mode 100644
index 9c1afb05c59..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpression.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Any']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.lazy.log
deleted file mode 100644
index f89e79b7169..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/objectExpressionInConstructor.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Any']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Outer': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
deleted file mode 100644
index 3d9cf9aff0b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], JavaMethodDescriptor@4['getFoo'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['A']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@15) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getFoo': Name@17) = ArrayList@18[1] { JavaMethodDescriptor@4['getFoo'] } // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@21) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['A']
-}
-
-LazyJavaClassTypeConstructor@29['A'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'false': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@41['String'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@43
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('B': FqName@48) = null
-    packageFragments('String': FqName@49) = null
-    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    packageFragments('java.lang.A': FqName@54) = null
-    packageFragments('java.lang.String': FqName@55) = null
-    packageFragments('kotlin': FqName@56) = null
-    packageFragments('kotlin.A': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    topLevelClasses(JavaClassImpl@61['A']) = LazyJavaClassDescriptor@0['A']
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('A': Name@62) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('String': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@51['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@69) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@53['lang'] {
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.lazy.log
deleted file mode 100644
index 1ce659b0243..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevel.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('x': FqName@13) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.lazy.log
deleted file mode 100644
index 1ce659b0243..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelDifferentFiles.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('x': FqName@13) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.lazy.log
deleted file mode 100644
index cbbc391a636..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/topLevelGetter.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('x': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.lazy.log
deleted file mode 100644
index bd710d3ea36..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.lazy.log
deleted file mode 100644
index fd4a04d63b1..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('ErrorType': FqName@3) = null
-    packageFragments('ErrorType1': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.ErrorType': FqName@10) = null
-    packageFragments('java.lang.ErrorType1': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.ErrorType': FqName@13) = null
-    packageFragments('kotlin.ErrorType1': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('ErrorType': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('ErrorType1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('ErrorType': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('ErrorType1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.lazy.log
deleted file mode 100644
index 26e010c48cb..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/missingNames.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Outer': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
deleted file mode 100644
index 1211bb85f2b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['<class-object-for-C>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.lazy.log
deleted file mode 100644
index 47209fbc3f8..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedField.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
deleted file mode 100644
index 34808fffef2..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['<class-object-for-C>']
-    <name not found> = JetTypeImpl@1['<class-object-for-C>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
deleted file mode 100644
index 27d701dffc4..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['data']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('data': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.C': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.data': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.data': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('C': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('data': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('C': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('C': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('C': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.lazy.log
deleted file mode 100644
index bb24a54a07a..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/defaults.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
deleted file mode 100644
index 408fbff7c77..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Bar': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
deleted file mode 100644
index 55780c8035d..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.E': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.E': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.lazy.log
deleted file mode 100644
index 52c217d7aa9..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/innerClassField.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
deleted file mode 100644
index 29e803fff76..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('O': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.O': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.O': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-ResolutionTaskHolder@19 {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-}
-
-null {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
deleted file mode 100644
index 8a4ce8c4912..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
+++ /dev/null
@@ -1,231 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Any']
-    <name not found> = JetTypeImpl@1['Any']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('$propertyMetadata': FqName@3) = null
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('C': FqName@8) = null
-    packageFragments('PropertyMetadata': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Array': FqName@15) = null
-    packageFragments('java.lang.PropertyMetadata': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.PropertyMetadata': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('x': FqName@23) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
deleted file mode 100644
index 2827927211b..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('valueOf': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('valueOf': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('valueOf': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('valueOf': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.lazy.log
deleted file mode 100644
index 6f6e8ea3ec7..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/oneTrait.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('C': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.lazy.log
deleted file mode 100644
index 138dc8576cb..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl/twoTraits.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T1': FqName@7) = null
-    packageFragments('T2': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.T1': FqName@14) = null
-    packageFragments('java.lang.T2': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.T1': FqName@18) = null
-    packageFragments('kotlin.T2': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.lazy.log
deleted file mode 100644
index 634493886c8..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/vararg.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('IntArray': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.IntArray': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.IntArray': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('IntArray': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/AbstractEnum.lazy.log
deleted file mode 100644
index 37b4e052dba..00000000000
--- a/compiler/testData/diagnostics/tests/enum/AbstractEnum.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('abstract': FqName@3) = null
-    packageFragments('abstract.MyAbstractEnum': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
deleted file mode 100644
index 4202d5dc3fc..00000000000
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
+++ /dev/null
@@ -1,131 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Int': FqName@8) = null
-    packageFragments('abstract': FqName@9) = null
-    packageFragments('abstract.Int': FqName@10) = null
-    packageFragments('abstract.MyEnum': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c1': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c2': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c3': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.lazy.log
deleted file mode 100644
index e5e891f9f41..00000000000
--- a/compiler/testData/diagnostics/tests/enum/AbstractOverrideInEnum.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.T': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.T': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
deleted file mode 100644
index 842751d710c..00000000000
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['E']
-    <name not found> = JetTypeImpl@1['E']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('E': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.E': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.E': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
deleted file mode 100644
index 5733530a499..00000000000
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
+++ /dev/null
@@ -1,157 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['<class-object-for-E>']
-    <name not found> = JetTypeImpl@2['Array<1>']
-    <name not found> = JetTypeImpl@3['E']
-    <name not found> = JetTypeImpl@3['E']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('E': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.E': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.E': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('valueOf': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('values': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('valueOf': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('values': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('valueOf': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('values': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('valueOf': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('values': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log b/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
deleted file mode 100644
index ead13fe430e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Enum<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('x': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
deleted file mode 100644
index a0e75661f13..00000000000
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
+++ /dev/null
@@ -1,355 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Unit']
-    <name not found> = JetTypeImpl@2['Unit']
-    <name not found> = JetTypeImpl@2['Unit']
-    <name not found> = JetTypeImpl@2['Unit']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('foo': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.E': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.E': FqName@19) = null
-    packageFragments('kotlin.Unit': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Unit': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
deleted file mode 100644
index 31c181c4378..00000000000
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.E': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.E': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
deleted file mode 100644
index daab533aa80..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('E': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.E': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.E': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.lazy.log
deleted file mode 100644
index 6a77243ed78..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumEntryInAbstractEnum.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = StringValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('EnumClass': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.lazy.log b/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.lazy.log
deleted file mode 100644
index e6fbe7f457f..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumImplementingTrait.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('EnumImplementingTraitWithFun': FqName@6) = null
-    packageFragments('EnumImplementingTraitWithVal': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('T1': FqName@9) = null
-    packageFragments('T2': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.T1': FqName@16) = null
-    packageFragments('java.lang.T2': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.T1': FqName@20) = null
-    packageFragments('kotlin.T2': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log b/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
deleted file mode 100644
index 5a6fd032d2e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('MyClass': FqName@3) = null
-    packageFragments('MyEnum': FqName@4) = null
-    packageFragments('MyEnum2': FqName@5) = null
-    packageFragments('MyEnum3': FqName@6) = null
-    packageFragments('MyEnumBase': FqName@7) = null
-    packageFragments('MyTrait': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.MyClass': FqName@13) = null
-    packageFragments('java.lang.MyEnumBase': FqName@14) = null
-    packageFragments('java.lang.MyTrait': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.MyClass': FqName@17) = null
-    packageFragments('kotlin.MyEnumBase': FqName@18) = null
-    packageFragments('kotlin.MyTrait': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
deleted file mode 100644
index a880c06b2f1..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
+++ /dev/null
@@ -1,167 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-RUNTIME>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@2['RUNTIME'] {
-    defaultType = JetTypeImpl@3['enum entry']
-}
-
-LazyJavaClassDescriptor@4['RetentionPolicy'] {
-    defaultType = JetTypeImpl@5['RetentionPolicy']
-    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
-    functionTypeForSamInterface = null
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
-    nestedClasses('RUNTIME': Name@12) = EnumEntrySyntheticClassDescriptor@2['RUNTIME'] // through LazyJavaClassMemberScope@7
-    properties('RUNTIME': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    properties('RUNTIME': Name@12) = EmptyList@13[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
-}
-
-LazyJavaClassTypeConstructor@14['RetentionPolicy'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Enum<RetentionPolicy>'] }
-}
-
-LazyJavaClassifierType@17['Enum<RetentionPolicy>'] {
-    arguments = ArrayList@18[1] { TypeProjectionImpl@19 }
-    classifier = JavaClassImpl@20['Enum']
-    memberScope = SubstitutingScope@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@23['RetentionPolicy'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['RetentionPolicy']
-    nullable = 'false': Boolean@26
-    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
-}
-
-LazyJavaClassifierType@27['RetentionPolicy'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@25['RetentionPolicy']
-    nullable = 'true': Boolean@29
-    typeConstructor = LazyJavaClassTypeConstructor@14['RetentionPolicy']
-}
-
-LazyJavaPackageFragmentProvider@30 {
-    packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
-    packageFragments('E': FqName@33) = null
-    packageFragments('Enum': FqName@34) = null
-    packageFragments('InlineOption': FqName@35) = null
-    packageFragments('RetentionPolicy': FqName@36) = null
-    packageFragments('a': FqName@37) = null
-    packageFragments('b': FqName@38) = null
-    packageFragments('c': FqName@39) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.E': FqName@44) = null
-    packageFragments('java.lang.Enum': FqName@45) = null
-    packageFragments('java.lang.InlineOption': FqName@46) = null
-    packageFragments('java.lang.RetentionPolicy': FqName@47) = null
-    packageFragments('java.lang.annotation': FqName@48) = LazyJavaPackageFragment@49['annotation']
-    packageFragments('java.lang.annotation.RetentionPolicy': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.E': FqName@52) = null
-    packageFragments('kotlin.Enum': FqName@53) = null
-    packageFragments('kotlin.InlineOption': FqName@54) = null
-    packageFragments('kotlin.RetentionPolicy': FqName@55) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    topLevelClasses(JavaClassImpl@58['RetentionPolicy']) = LazyJavaClassDescriptor@4['RetentionPolicy']
-}
-
-LazyJavaPackageFragment@32['<root>'] {
-    classes('Enum': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('InlineOption': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('RetentionPolicy': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('java': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('java': Name@65) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@49['annotation'] {
-    classes('RetentionPolicy': Name@67) = LazyJavaClassDescriptor@4['RetentionPolicy'] // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('RetentionPolicy': Name@69) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('annotation': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('annotation': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumModifier.lazy.log b/compiler/testData/diagnostics/tests/enum/enumModifier.lazy.log
deleted file mode 100644
index a9d839ea0c4..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumModifier.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('O': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('x': FqName@17) = null
-    packageFragments('y': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log b/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
deleted file mode 100644
index d0195c7aa11..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
+++ /dev/null
@@ -1,186 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('HappyEnum': FqName@54) = null
-    packageFragments('enum': FqName@55) = null
-    packageFragments('enum.HappyEnum': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.HappyEnum': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.HappyEnum': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@66['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('CASE1': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('CASE2': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('HappyEnum': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('UnsupportedOperationException': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('enum': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('UnsupportedOperationException': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('enum': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('lang': Name@79) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('UnsupportedOperationException': Name@71) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('UnsupportedOperationException': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@105[4] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.lazy.log b/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/enum/enumWithEmptyName.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
deleted file mode 100644
index 6e67a31419e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['E']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('E': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Long': FqName@7) = null
-    packageFragments('e': FqName@8) = null
-    packageFragments('entry': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.E': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.Long': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.E': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.Long': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Long': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log b/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
deleted file mode 100644
index f31fd51ec68..00000000000
--- a/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['TimeUnit']
-}
-
-EnumEntrySyntheticClassDescriptor@2['<class-object-for-SECONDS>'] {
-    defaultType = JetTypeImpl@3['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@4['SECONDS'] {
-    defaultType = JetTypeImpl@5['enum entry']
-}
-
-LazyJavaClassDescriptor@6['TimeUnit'] {
-    defaultType = JetTypeImpl@1['TimeUnit']
-    enumEntryIndex = LinkedHashMap@7 // through LazyJavaClassMemberScope@8
-    functionTypeForSamInterface = null
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@8
-    nestedClasses('SECONDS': Name@13) = EnumEntrySyntheticClassDescriptor@4['SECONDS'] // through LazyJavaClassMemberScope@8
-    properties('SECONDS': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@8
-    properties('SECONDS': Name@13) = EmptyList@14[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
-}
-
-LazyJavaClassTypeConstructor@15['TimeUnit'] {
-    parameters = ArrayList@16[empty]
-    supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['Enum<TimeUnit>'] }
-}
-
-LazyJavaClassifierType@18['Enum<TimeUnit>'] {
-    arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
-    classifier = JavaClassImpl@21['Enum']
-    memberScope = SubstitutingScope@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@24['TimeUnit'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['TimeUnit']
-    nullable = 'false': Boolean@27
-    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
-}
-
-LazyJavaClassifierType@28['TimeUnit'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@26['TimeUnit']
-    nullable = 'true': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@15['TimeUnit']
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.util': FqName@38) = LazyJavaPackageFragment@39['util']
-    packageFragments('java.util.concurrent': FqName@40) = LazyJavaPackageFragment@41['concurrent']
-    packageFragments('java.util.concurrent.TimeUnit': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    packageFragments('test': FqName@46) = null
-    packageFragments('test.c': FqName@47) = null
-    topLevelClasses(JavaClassImpl@48['TimeUnit']) = LazyJavaClassDescriptor@6['TimeUnit']
-}
-
-LazyJavaPackageFragment@41['concurrent'] {
-    classes('TimeUnit': Name@49) = LazyJavaClassDescriptor@6['TimeUnit'] // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('TimeUnit': Name@52) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('util': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@57) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('util': Name@58) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@39['util'] {
-    classes('concurrent': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('concurrent': Name@63) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@14[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@14[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.lazy.log
deleted file mode 100644
index ba96a6ec757..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inheritFromEnumEntry.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.E': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.E': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
deleted file mode 100644
index e8064b3ce7b..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-LazyJavaClassDescriptor@0['MyJavaEnum'] {
-    allDescriptors = ArrayList@1[6] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['compareTo'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['MyJavaEnum']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('compareTo': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@4['compareTo'] } // through LazyJavaClassMemberScope@5
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getDeclaringClass': Name@19) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('name': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['name'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@26) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('ordinal': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['ordinal'] } // through LazyJavaClassMemberScope@5
-    functions('readObject': Name@30) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('readObjectNoData': Name@31) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@32) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@34) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@5
-    properties('name': Name@37) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    properties('ordinal': Name@38) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
-}
-
-LazyJavaClassTypeConstructor@39['MyJavaEnum'] {
-    parameters = ArrayList@40[empty]
-    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Enum<MyJavaEnum>'] }
-}
-
-LazyJavaClassifierType@42['Enum<MyJavaEnum>'] {
-    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    classifier = JavaClassImpl@45['Enum']
-    memberScope = SubstitutingScope@46
-    nullable = 'false': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@49['MyJavaEnum'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@51['MyJavaEnum']
-    nullable = 'false': Boolean@47
-    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
-}
-
-LazyJavaClassifierType@52['MyJavaEnum'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@51['MyJavaEnum']
-    nullable = 'true': Boolean@54
-    typeConstructor = LazyJavaClassTypeConstructor@39['MyJavaEnum']
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('MyClass': FqName@58) = null
-    packageFragments('MyClass2': FqName@59) = null
-    packageFragments('MyEnum': FqName@60) = null
-    packageFragments('MyEnum2': FqName@61) = null
-    packageFragments('MyJavaEnum': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.MyEnum': FqName@67) = null
-    packageFragments('java.lang.MyEnum2': FqName@68) = null
-    packageFragments('java.lang.MyJavaEnum': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.MyEnum': FqName@71) = null
-    packageFragments('kotlin.MyEnum2': FqName@72) = null
-    packageFragments('kotlin.MyJavaEnum': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    topLevelClasses(JavaClassImpl@76['MyJavaEnum']) = LazyJavaClassDescriptor@0['MyJavaEnum']
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('MyJavaEnum': Name@77) = LazyJavaClassDescriptor@0['MyJavaEnum'] // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@64['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@92 }
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.lazy.log
deleted file mode 100644
index 4e65237a80f..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/existingClassObject.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClass.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideClass.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClass.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideClassObject.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideEnum.lazy.log
deleted file mode 100644
index 0518844728e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnum.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.lazy.log
deleted file mode 100644
index 0518844728e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideObject.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideObject.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideObject.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/insideTrait.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/insideTrait.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/redeclarationInClassObject.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/twoEnums.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnums.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.lazy.log b/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
deleted file mode 100644
index ada0ecc47e2..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
+++ /dev/null
@@ -1,98 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    defaultType = JetTypeImpl@1['A']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('valueOf': Name@4) = ArrayList@5[1] { SimpleFunctionDescriptorImpl@6['valueOf'] } // through LazyJavaStaticClassScope@7
-    functions('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
-    nestedClasses('valueOf': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    properties('valueOf': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassTypeConstructor@12['A'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
-}
-
-LazyJavaClassifierType@16['A'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassifierType@20['A'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassifierType@15['Enum<A>'] {
-    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
-    classifier = JavaClassImpl@25['Enum']
-    memberScope = SubstitutingScope@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('A': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.A': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.A': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = null
-    packageFragments('kotlin.jvm': FqName@40) = null
-    topLevelClasses(JavaClassImpl@41['A']) = LazyJavaClassDescriptor@0['A']
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('A': Name@42) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@35['lang'] {
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
deleted file mode 100644
index 37773b6eafc..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    defaultType = JetTypeImpl@1['A']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('values': Name@4) = ArrayList@5[1] { SimpleFunctionDescriptorImpl@6['values'] } // through LazyJavaStaticClassScope@7
-    functions('values': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
-    nestedClasses('values': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('values': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    properties('values': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassTypeConstructor@12['A'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Enum<A>'] }
-}
-
-LazyJavaClassifierType@16['A'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassifierType@20['A'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassifierType@15['Enum<A>'] {
-    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
-    classifier = JavaClassImpl@25['Enum']
-    memberScope = SubstitutingScope@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('A': FqName@31) = null
-    packageFragments('Array': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.A': FqName@37) = null
-    packageFragments('java.lang.Array': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.A': FqName@40) = null
-    packageFragments('kotlin.Array': FqName@41) = null
-    packageFragments('kotlin.io': FqName@42) = null
-    packageFragments('kotlin.jvm': FqName@43) = null
-    topLevelClasses(JavaClassImpl@44['A']) = LazyJavaClassDescriptor@0['A']
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('A': Name@45) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Array': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@51) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@36['lang'] {
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
deleted file mode 100644
index 6dbfdfcddcb..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
+++ /dev/null
@@ -1,137 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-ENTRY>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-    functions('s': Name@2) = HashSet@3[1] { JavaMethodDescriptor@4['s'] } // through EnumEntryScope@5
-    properties('s': Name@2) = HashSet@6[empty] // through EnumEntryScope@5
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@7
-}
-
-EnumEntrySyntheticClassDescriptor@8['ENTRY'] {
-    defaultType = JetTypeImpl@9['enum entry']
-    functions('s': Name@2) = HashSet@10[1] { JavaMethodDescriptor@11['s'] } // through EnumEntryScope@12
-    properties('s': Name@2) = HashSet@13[empty] // through EnumEntryScope@12
-}
-
-LazyJavaClassDescriptor@14['A'] {
-    defaultType = JetTypeImpl@15['A']
-    enumEntryIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@17
-    functions('s': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['s'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@17
-    nestedClasses('ENTRY': Name@24) = EnumEntrySyntheticClassDescriptor@8['ENTRY'] // through LazyJavaClassMemberScope@17
-    nestedClasses('s': Name@2) = null // through LazyJavaClassMemberScope@17
-    properties('ENTRY': Name@24) = EmptyList@25[empty] // through LazyJavaClassMemberScope@17
-    properties('ENTRY': Name@24) = EmptyList@25[empty] // through LazyJavaStaticClassScope@22
-    properties('s': Name@2) = EmptyList@25[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@26['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@27['A']
-}
-
-LazyJavaClassTypeConstructor@27['A'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Enum<A>'] }
-}
-
-LazyJavaClassifierType@31['A'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['A']
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@27['A']
-}
-
-LazyJavaClassifierType@35['A'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@33['A']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@27['A']
-}
-
-LazyJavaClassifierType@30['Enum<A>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['Enum']
-    memberScope = SubstitutingScope@41
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@47['String'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('String': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.A': FqName@58) = null
-    packageFragments('java.lang.String': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.A': FqName@61) = null
-    packageFragments('kotlin.String': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['A']) = LazyJavaClassDescriptor@14['A']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('A': Name@66) = LazyJavaClassDescriptor@14['A'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('String': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
deleted file mode 100644
index 146669a75ea..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-ENTRY>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@2['ENTRY'] {
-    defaultType = JetTypeImpl@3['enum entry']
-}
-
-LazyJavaClassDescriptor@4['A'] {
-    defaultType = JetTypeImpl@5['A']
-    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
-    functions('s': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['s'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaStaticClassScope@13
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@7
-    nestedClasses('ENTRY': Name@15) = EnumEntrySyntheticClassDescriptor@2['ENTRY'] // through LazyJavaClassMemberScope@7
-    nestedClasses('s': Name@8) = null // through LazyJavaClassMemberScope@7
-    properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
-    properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaStaticClassScope@13
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['A']
-}
-
-LazyJavaClassTypeConstructor@18['A'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Enum<A>'] }
-}
-
-LazyJavaClassifierType@22['A'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['A']
-    nullable = 'false': Boolean@25
-    typeConstructor = LazyJavaClassTypeConstructor@18['A']
-}
-
-LazyJavaClassifierType@26['A'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@24['A']
-    nullable = 'true': Boolean@28
-    typeConstructor = LazyJavaClassTypeConstructor@18['A']
-}
-
-LazyJavaClassifierType@21['Enum<A>'] {
-    arguments = ArrayList@29[1] { TypeProjectionImpl@30 }
-    classifier = JavaClassImpl@31['Enum']
-    memberScope = SubstitutingScope@32
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaPackageFragmentProvider@40 {
-    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    packageFragments('A': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.A': FqName@48) = null
-    packageFragments('kotlin': FqName@49) = null
-    packageFragments('kotlin.A': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-    topLevelClasses(JavaClassImpl@53['A']) = LazyJavaClassDescriptor@4['A']
-}
-
-LazyJavaPackageFragment@42['<root>'] {
-    classes('A': Name@54) = LazyJavaClassDescriptor@4['A'] // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@16[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
deleted file mode 100644
index 73f154e3190..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
+++ /dev/null
@@ -1,169 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-ANOTHER>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-    properties('ENTRY': Name@2) = HashSet@3[1] { PropertyDescriptorImpl@4['ENTRY'] } // through EnumEntryScope@5
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@6
-}
-
-EnumEntrySyntheticClassDescriptor@7['<class-object-for-ENTRY>'] {
-    defaultType = JetTypeImpl@8['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@9['ANOTHER'] {
-    defaultType = JetTypeImpl@10['enum entry']
-    properties('ENTRY': Name@2) = HashSet@11[1] { PropertyDescriptorImpl@12['ENTRY'] } // through EnumEntryScope@13
-}
-
-EnumEntrySyntheticClassDescriptor@14['ENTRY'] {
-    defaultType = JetTypeImpl@15['enum entry']
-}
-
-LazyJavaClassDescriptor@16['A'] {
-    defaultType = JetTypeImpl@17['A']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@19
-    nestedClasses('ANOTHER': Name@24) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
-    nestedClasses('ENTRY': Name@25) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
-    properties('ANOTHER': Name@24) = EmptyList@26[empty] // through LazyJavaClassMemberScope@19
-    properties('ANOTHER': Name@24) = EmptyList@26[empty] // through LazyJavaStaticClassScope@22
-    properties('ENTRY': Name@25) = ArrayList@27[1] { JavaPropertyDescriptor@28['ENTRY'] } // through LazyJavaClassMemberScope@19
-    properties('ENTRY': Name@25) = EmptyList@26[empty] // through LazyJavaStaticClassScope@22
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['A']
-}
-
-LazyJavaClassTypeConstructor@30['A'] {
-    parameters = ArrayList@31[empty]
-    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Enum<A>'] }
-}
-
-LazyJavaClassifierType@34['A'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['A']
-    nullable = 'false': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@30['A']
-}
-
-LazyJavaClassifierType@38['A'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@36['A']
-    nullable = 'true': Boolean@40
-    typeConstructor = LazyJavaClassTypeConstructor@30['A']
-}
-
-LazyJavaClassifierType@33['Enum<A>'] {
-    arguments = ArrayList@41[1] { TypeProjectionImpl@42 }
-    classifier = JavaClassImpl@43['Enum']
-    memberScope = SubstitutingScope@44
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['String'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['String']
-    nullable = 'false': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['String'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@48['String']
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('A': FqName@55) = null
-    packageFragments('String': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.A': FqName@61) = null
-    packageFragments('java.lang.String': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = null
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.String': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['A']) = LazyJavaClassDescriptor@16['A']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('A': Name@69) = LazyJavaClassDescriptor@16['A'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@75) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = ArrayList@101[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
deleted file mode 100644
index 5dfbc6e1583..00000000000
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
+++ /dev/null
@@ -1,167 +0,0 @@
-EnumEntrySyntheticClassDescriptor@0['<class-object-for-ANOTHER>'] {
-    defaultType = JetTypeImpl@1['enum entry']
-    properties('s': Name@2) = HashSet@3[1] { PropertyDescriptorImpl@4['s'] } // through EnumEntryScope@5
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@6
-}
-
-EnumEntrySyntheticClassDescriptor@7['<class-object-for-ENTRY>'] {
-    defaultType = JetTypeImpl@8['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@9['ANOTHER'] {
-    defaultType = JetTypeImpl@10['enum entry']
-    properties('s': Name@2) = HashSet@11[1] { PropertyDescriptorImpl@12['s'] } // through EnumEntryScope@13
-}
-
-EnumEntrySyntheticClassDescriptor@14['ENTRY'] {
-    defaultType = JetTypeImpl@15['enum entry']
-}
-
-LazyJavaClassDescriptor@16['A'] {
-    defaultType = JetTypeImpl@17['A']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@22
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@19
-    nestedClasses('ANOTHER': Name@24) = EnumEntrySyntheticClassDescriptor@9['ANOTHER'] // through LazyJavaClassMemberScope@19
-    nestedClasses('ENTRY': Name@25) = EnumEntrySyntheticClassDescriptor@14['ENTRY'] // through LazyJavaClassMemberScope@19
-    nestedClasses('s': Name@26) = null // through LazyJavaClassMemberScope@19
-    properties('ANOTHER': Name@24) = EmptyList@27[empty] // through LazyJavaClassMemberScope@19
-    properties('ANOTHER': Name@24) = EmptyList@27[empty] // through LazyJavaStaticClassScope@22
-    properties('ENTRY': Name@25) = EmptyList@27[empty] // through LazyJavaClassMemberScope@19
-    properties('ENTRY': Name@25) = EmptyList@27[empty] // through LazyJavaStaticClassScope@22
-    properties('s': Name@26) = ArrayList@28[1] { JavaPropertyDescriptor@29['s'] } // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['A']
-}
-
-LazyJavaClassTypeConstructor@31['A'] {
-    parameters = ArrayList@32[empty]
-    supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Enum<A>'] }
-}
-
-LazyJavaClassifierType@35['A'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['A']
-    nullable = 'false': Boolean@38
-    typeConstructor = LazyJavaClassTypeConstructor@31['A']
-}
-
-LazyJavaClassifierType@39['A'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@37['A']
-    nullable = 'true': Boolean@41
-    typeConstructor = LazyJavaClassTypeConstructor@31['A']
-}
-
-LazyJavaClassifierType@34['Enum<A>'] {
-    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    classifier = JavaClassImpl@44['Enum']
-    memberScope = SubstitutingScope@45
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@47['String'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['String']
-    nullable = 'false': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@51['String'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@49['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('A': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.A': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.A': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['A']) = LazyJavaClassDescriptor@16['A']
-}
-
-LazyJavaPackageFragment@55['<root>'] {
-    classes('A': Name@67) = LazyJavaClassDescriptor@16['A'] // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log b/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
deleted file mode 100644
index 295e668bac4..00000000000
--- a/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('MethodKind': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.MethodKind': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.MethodKind': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log b/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
deleted file mode 100644
index a365be76806..00000000000
--- a/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.lazy.log b/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.lazy.log
deleted file mode 100644
index 0518844728e..00000000000
--- a/compiler/testData/diagnostics/tests/enum/modifiersOnEnumEntry.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/openMemberInEnum.lazy.log
deleted file mode 100644
index 7a6f42ba54d..00000000000
--- a/compiler/testData/diagnostics/tests/enum/openMemberInEnum.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = StringValue@4
-    <name not found> = StringValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('EnumWithOpenMembers': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
deleted file mode 100644
index 75b4b2c532f..00000000000
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.E': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.E': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[8] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[8] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-}
-
-null {
-    <name not found> = ArrayList@45[8] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-    <name not found> = ArrayList@46[8] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
deleted file mode 100644
index a04739355ec..00000000000
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['E']
-    <name not found> = JetTypeImpl@2['E']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = MutableClassDescriptor$1@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Nested': FqName@8) = null
-    packageFragments('bar': FqName@9) = null
-    packageFragments('bar.Nested': FqName@10) = null
-    packageFragments('foo': FqName@11) = null
-    packageFragments('foo.E': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Nested': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nested': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Nested': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('values': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Nested': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('values': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
deleted file mode 100644
index 89f31f66146..00000000000
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('bug': FqName@5) = null
-    packageFragments('bug.Foo': FqName@6) = null
-    packageFragments('bug.String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Foo': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Foo': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
deleted file mode 100644
index a461a662717..00000000000
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
+++ /dev/null
@@ -1,526 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['E']
-    <name not found> = JetTypeImpl@2['E']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Array': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.E': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Array': FqName@15) = null
-    packageFragments('kotlin.E': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('valueOf': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('values': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('valueOf': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('values': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('valueOf': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('values': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('valueOf': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('values': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
deleted file mode 100644
index 17ebe0a42c7..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
+++ /dev/null
@@ -1,615 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Byte']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Long']
-    <name not found> = JetTypeImpl@4['Short']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Byte': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('Short': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Byte': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Long': FqName@18) = null
-    packageFragments('java.lang.Short': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Byte': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Long': FqName@23) = null
-    packageFragments('kotlin.Short': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Byte': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-null {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@305[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-    <name not found> = ArrayList@306[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@307[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = ArrayList@308[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@309[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@310[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@311[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@312[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = ArrayList@313[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@314[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@315[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = ArrayList@316[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@317[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@318[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@319[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@320[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-    <name not found> = ArrayList@321[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-    <name not found> = ArrayList@322[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@323[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@324[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
deleted file mode 100644
index 90cab6455a9..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
+++ /dev/null
@@ -1,687 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = JetTypeImpl@5['Byte']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@8['Long']
-    <name not found> = JetTypeImpl@9['Long']
-    <name not found> = JetTypeImpl@10['Short']
-    <name not found> = LongValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('Byte': FqName@15) = null
-    packageFragments('Int': FqName@16) = null
-    packageFragments('Long': FqName@17) = null
-    packageFragments('Short': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Byte': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.Long': FqName@25) = null
-    packageFragments('java.lang.Short': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Byte': FqName@28) = null
-    packageFragments('kotlin.Int': FqName@29) = null
-    packageFragments('kotlin.Long': FqName@30) = null
-    packageFragments('kotlin.Short': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('p1': FqName@34) = null
-    packageFragments('p2': FqName@35) = null
-    packageFragments('p3': FqName@36) = null
-    packageFragments('p4': FqName@37) = null
-    packageFragments('p5': FqName@38) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Byte': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Int': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Long': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Short': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('fooByte': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('fooInt': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('fooLong': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('fooShort': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p2': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p3': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p4': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p5': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooByte': Name@44) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooInt': Name@45) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooLong': Name@46) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooShort': Name@47) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('fooByte': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('fooInt': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('fooLong': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('fooShort': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p2': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p3': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p4': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p5': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('fooByte': Name@44) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('fooInt': Name@45) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('fooLong': Name@46) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('fooShort': Name@47) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[8] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-}
-
-null {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@281[8] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@282[8] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@283[8] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
deleted file mode 100644
index 808615069e9..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
+++ /dev/null
@@ -1,260 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ByteValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = IntValue@13
-    <name not found> = IntValue@14
-    <name not found> = LongValue@15
-    <name not found> = LongValue@16
-    <name not found> = LongValue@17
-    <name not found> = LongValue@18
-    <name not found> = LongValue@19
-    <name not found> = ShortValue@20
-}
-
-LazyJavaPackageFragmentProvider@21 {
-    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    packageFragments('Byte': FqName@24) = null
-    packageFragments('Int': FqName@25) = null
-    packageFragments('Long': FqName@26) = null
-    packageFragments('Short': FqName@27) = null
-    packageFragments('b1': FqName@28) = null
-    packageFragments('b2': FqName@29) = null
-    packageFragments('b3': FqName@30) = null
-    packageFragments('b4': FqName@31) = null
-    packageFragments('i1': FqName@32) = null
-    packageFragments('i2': FqName@33) = null
-    packageFragments('i3': FqName@34) = null
-    packageFragments('i4': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.Byte': FqName@40) = null
-    packageFragments('java.lang.Int': FqName@41) = null
-    packageFragments('java.lang.Long': FqName@42) = null
-    packageFragments('java.lang.Short': FqName@43) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.Byte': FqName@45) = null
-    packageFragments('kotlin.Int': FqName@46) = null
-    packageFragments('kotlin.Long': FqName@47) = null
-    packageFragments('kotlin.Short': FqName@48) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-    packageFragments('l1': FqName@51) = null
-    packageFragments('l2': FqName@52) = null
-    packageFragments('l3': FqName@53) = null
-    packageFragments('l4': FqName@54) = null
-    packageFragments('p1': FqName@55) = null
-    packageFragments('p2': FqName@56) = null
-    packageFragments('p3': FqName@57) = null
-    packageFragments('p4': FqName@58) = null
-    packageFragments('s1': FqName@59) = null
-    packageFragments('s2': FqName@60) = null
-    packageFragments('s3': FqName@61) = null
-    packageFragments('s4': FqName@62) = null
-}
-
-LazyJavaPackageFragment@23['<root>'] {
-    classes('Byte': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Long': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Short': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@71) = EmptyList@72[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[8] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-}
-
-null {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@238[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = ArrayList@239[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-    <name not found> = ArrayList@240[8] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@242[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@243[8] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = ArrayList@244[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@245[8] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@246[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = ArrayList@247[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@248[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@249[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@252[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@253[8] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@255[8] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@257[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/float.lazy.log b/compiler/testData/diagnostics/tests/evaluate/float.lazy.log
deleted file mode 100644
index 7b5af7619ff..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/float.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = FloatValue@1
-    <name not found> = FloatValue@2
-    <name not found> = FloatValue@3
-    <name not found> = FloatValue@4
-    <name not found> = FloatValue@5
-    <name not found> = FloatValue@6
-    <name not found> = FloatValue@7
-    <name not found> = FloatValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Float': FqName@12) = null
-    packageFragments('a1': FqName@13) = null
-    packageFragments('a2': FqName@14) = null
-    packageFragments('a3': FqName@15) = null
-    packageFragments('a4': FqName@16) = null
-    packageFragments('b5': FqName@17) = null
-    packageFragments('b6': FqName@18) = null
-    packageFragments('b7': FqName@19) = null
-    packageFragments('b8': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.Float': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Float': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Float': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
deleted file mode 100644
index 976448353b0..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
+++ /dev/null
@@ -1,1154 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = IntValue@13
-    <name not found> = IntValue@14
-    <name not found> = IntValue@15
-    <name not found> = IntValue@16
-    <name not found> = IntValue@17
-    <name not found> = IntValue@18
-    <name not found> = IntValue@19
-    <name not found> = IntValue@20
-}
-
-LazyJavaPackageFragmentProvider@21 {
-    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    packageFragments('A': FqName@24) = null
-    packageFragments('Int': FqName@25) = null
-    packageFragments('a3': FqName@26) = null
-    packageFragments('a4': FqName@27) = null
-    packageFragments('i10': FqName@28) = null
-    packageFragments('i11': FqName@29) = null
-    packageFragments('i12': FqName@30) = null
-    packageFragments('i13': FqName@31) = null
-    packageFragments('i15': FqName@32) = null
-    packageFragments('i2': FqName@33) = null
-    packageFragments('i3': FqName@34) = null
-    packageFragments('i4': FqName@35) = null
-    packageFragments('i5': FqName@36) = null
-    packageFragments('i6': FqName@37) = null
-    packageFragments('i7': FqName@38) = null
-    packageFragments('i8': FqName@39) = null
-    packageFragments('intMaxValue': FqName@40) = null
-    packageFragments('intMinValue': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.Int': FqName@46) = null
-    packageFragments('kotlin': FqName@47) = null
-    packageFragments('kotlin.Int': FqName@48) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-    packageFragments('l20': FqName@51) = null
-    packageFragments('l21': FqName@52) = null
-    packageFragments('l22': FqName@53) = null
-    packageFragments('l23': FqName@54) = null
-}
-
-LazyJavaPackageFragment@23['<root>'] {
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('intMaxValue': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('intMinValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@45['lang'] {
-    classes('intMaxValue': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('intMinValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[7] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[7] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[7] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[7] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[7] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[7] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[7] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[7] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[7] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[7] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[7] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[7] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[7] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[7] { ResolutionCandidate@404, ResolutionCandidate@405, ResolutionCandidate@406, ... }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[7] { ResolutionCandidate@409, ResolutionCandidate@410, ResolutionCandidate@411, ... }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[7] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416, ... }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[7] { ResolutionCandidate@419, ResolutionCandidate@420, ResolutionCandidate@421, ... }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[7] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426, ... }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[7] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[7] { ResolutionCandidate@439, ResolutionCandidate@440, ResolutionCandidate@441, ... }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[7] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[7] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[8] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[8] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
-}
-
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[8] { ResolutionCandidate@469, ResolutionCandidate@470, ResolutionCandidate@471, ... }
-}
-
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
-}
-
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[8] { ResolutionCandidate@484, ResolutionCandidate@485, ResolutionCandidate@486, ... }
-}
-
-ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[8] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[8] { ResolutionCandidate@494, ResolutionCandidate@495, ResolutionCandidate@496, ... }
-}
-
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[8] { ResolutionCandidate@499, ResolutionCandidate@500, ResolutionCandidate@501, ... }
-}
-
-ResolutionTaskHolder@502 {
-    <name not found> = ArrayList@503[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[8] { ResolutionCandidate@509, ResolutionCandidate@510, ResolutionCandidate@511, ... }
-}
-
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[8] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516, ... }
-}
-
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[8] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
-}
-
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[8] { ResolutionCandidate@524, ResolutionCandidate@525, ResolutionCandidate@526, ... }
-}
-
-ResolutionTaskHolder@527 {
-    <name not found> = ArrayList@528[8] { ResolutionCandidate@529, ResolutionCandidate@530, ResolutionCandidate@531, ... }
-}
-
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[8] { ResolutionCandidate@534, ResolutionCandidate@535, ResolutionCandidate@536, ... }
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[8] { ResolutionCandidate@539, ResolutionCandidate@540, ResolutionCandidate@541, ... }
-}
-
-ResolutionTaskHolder@542 {
-    <name not found> = ArrayList@543[8] { ResolutionCandidate@544, ResolutionCandidate@545, ResolutionCandidate@546, ... }
-}
-
-ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[8] { ResolutionCandidate@554, ResolutionCandidate@555, ResolutionCandidate@556, ... }
-}
-
-ResolutionTaskHolder@557 {
-    <name not found> = ArrayList@558[8] { ResolutionCandidate@559, ResolutionCandidate@560, ResolutionCandidate@561, ... }
-}
-
-ResolutionTaskHolder@562 {
-    <name not found> = ArrayList@563[8] { ResolutionCandidate@564, ResolutionCandidate@565, ResolutionCandidate@566, ... }
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[8] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
-}
-
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[8] { ResolutionCandidate@574, ResolutionCandidate@575, ResolutionCandidate@576, ... }
-}
-
-ResolutionTaskHolder@577 {
-    <name not found> = ArrayList@578[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[8] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = ArrayList@588[8] { ResolutionCandidate@589, ResolutionCandidate@590, ResolutionCandidate@591, ... }
-}
-
-ResolutionTaskHolder@592 {
-    <name not found> = ArrayList@593[8] { ResolutionCandidate@594, ResolutionCandidate@595, ResolutionCandidate@596, ... }
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[8] { ResolutionCandidate@599, ResolutionCandidate@600, ResolutionCandidate@601, ... }
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[8] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606, ... }
-}
-
-ResolutionTaskHolder@607 {
-    <name not found> = ArrayList@608[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[8] { ResolutionCandidate@614, ResolutionCandidate@615, ResolutionCandidate@616, ... }
-}
-
-ResolutionTaskHolder@617 {
-    <name not found> = ArrayList@618[8] { ResolutionCandidate@619, ResolutionCandidate@620, ResolutionCandidate@621, ... }
-}
-
-ResolutionTaskHolder@622 {
-    <name not found> = ArrayList@623[8] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626, ... }
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = ArrayList@628[8] { ResolutionCandidate@629, ResolutionCandidate@630, ResolutionCandidate@631, ... }
-}
-
-ResolutionTaskHolder@632 {
-    <name not found> = ArrayList@633[8] { ResolutionCandidate@634, ResolutionCandidate@635, ResolutionCandidate@636, ... }
-}
-
-ResolutionTaskHolder@637 {
-    <name not found> = ArrayList@638[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[8] { ResolutionCandidate@644, ResolutionCandidate@645, ResolutionCandidate@646, ... }
-}
-
-ResolutionTaskHolder@647 {
-    <name not found> = ArrayList@648[8] { ResolutionCandidate@649, ResolutionCandidate@650, ResolutionCandidate@651, ... }
-}
-
-ResolutionTaskHolder@652 {
-    <name not found> = ArrayList@653[8] { ResolutionCandidate@654, ResolutionCandidate@655, ResolutionCandidate@656, ... }
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[8] { ResolutionCandidate@659, ResolutionCandidate@660, ResolutionCandidate@661, ... }
-}
-
-ResolutionTaskHolder@662 {
-    <name not found> = ArrayList@663[8] { ResolutionCandidate@664, ResolutionCandidate@665, ResolutionCandidate@666, ... }
-}
-
-ResolutionTaskHolder@667 {
-    <name not found> = ArrayList@668[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[8] { ResolutionCandidate@674, ResolutionCandidate@675, ResolutionCandidate@676, ... }
-}
-
-ResolutionTaskHolder@677 {
-    <name not found> = ArrayList@678[8] { ResolutionCandidate@679, ResolutionCandidate@680, ResolutionCandidate@681, ... }
-}
-
-ResolutionTaskHolder@682 {
-    <name not found> = ArrayList@683[8] { ResolutionCandidate@684, ResolutionCandidate@685, ResolutionCandidate@686, ... }
-}
-
-ResolutionTaskHolder@687 {
-    <name not found> = ArrayList@688[8] { ResolutionCandidate@689, ResolutionCandidate@690, ResolutionCandidate@691, ... }
-}
-
-ResolutionTaskHolder@692 {
-    <name not found> = ArrayList@693[8] { ResolutionCandidate@694, ResolutionCandidate@695, ResolutionCandidate@696, ... }
-}
-
-ResolutionTaskHolder@697 {
-    <name not found> = ArrayList@698[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
-}
-
-ResolutionTaskHolder@702 {
-    <name not found> = ArrayList@703[8] { ResolutionCandidate@704, ResolutionCandidate@705, ResolutionCandidate@706, ... }
-}
-
-ResolutionTaskHolder@707 {
-    <name not found> = ArrayList@708[8] { ResolutionCandidate@709, ResolutionCandidate@710, ResolutionCandidate@711, ... }
-}
-
-ResolutionTaskHolder@712 {
-    <name not found> = ArrayList@713[8] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
-}
-
-ResolutionTaskHolder@717 {
-    <name not found> = ArrayList@718[8] { ResolutionCandidate@719, ResolutionCandidate@720, ResolutionCandidate@721, ... }
-}
-
-ResolutionTaskHolder@722 {
-    <name not found> = ArrayList@723[8] { ResolutionCandidate@724, ResolutionCandidate@725, ResolutionCandidate@726, ... }
-}
-
-ResolutionTaskHolder@727 {
-    <name not found> = ArrayList@728[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[8] { ResolutionCandidate@734, ResolutionCandidate@735, ResolutionCandidate@736, ... }
-}
-
-ResolutionTaskHolder@737 {
-    <name not found> = ArrayList@738[8] { ResolutionCandidate@739, ResolutionCandidate@740, ResolutionCandidate@741, ... }
-}
-
-ResolutionTaskHolder@742 {
-    <name not found> = ArrayList@743[8] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = ArrayList@748[8] { ResolutionCandidate@749, ResolutionCandidate@750, ResolutionCandidate@751, ... }
-}
-
-ResolutionTaskHolder@752 {
-    <name not found> = ArrayList@753[8] { ResolutionCandidate@754, ResolutionCandidate@755, ResolutionCandidate@756, ... }
-}
-
-ResolutionTaskHolder@757 {
-    <name not found> = ArrayList@758[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
-}
-
-ResolutionTaskHolder@762 {
-    <name not found> = ArrayList@763[8] { ResolutionCandidate@764, ResolutionCandidate@765, ResolutionCandidate@766, ... }
-}
-
-ResolutionTaskHolder@767 {
-    <name not found> = ArrayList@768[8] { ResolutionCandidate@769, ResolutionCandidate@770, ResolutionCandidate@771, ... }
-}
-
-null {
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@855[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@857[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@861[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@863[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@865[7] { ResolutionCandidate@334, ResolutionCandidate@335, ResolutionCandidate@336, ... }
-    <name not found> = ArrayList@866[7] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
-    <name not found> = ArrayList@867[7] { ResolutionCandidate@449, ResolutionCandidate@450, ResolutionCandidate@451, ... }
-    <name not found> = ArrayList@868[7] { ResolutionCandidate@439, ResolutionCandidate@440, ResolutionCandidate@441, ... }
-    <name not found> = ArrayList@869[7] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-    <name not found> = ArrayList@870[7] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
-    <name not found> = ArrayList@871[7] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
-    <name not found> = ArrayList@872[7] { ResolutionCandidate@394, ResolutionCandidate@395, ResolutionCandidate@396, ... }
-    <name not found> = ArrayList@873[7] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-    <name not found> = ArrayList@874[7] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
-    <name not found> = ArrayList@875[7] { ResolutionCandidate@339, ResolutionCandidate@340, ResolutionCandidate@341, ... }
-    <name not found> = ArrayList@876[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = ArrayList@877[7] { ResolutionCandidate@414, ResolutionCandidate@415, ResolutionCandidate@416, ... }
-    <name not found> = ArrayList@878[7] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426, ... }
-    <name not found> = ArrayList@879[7] { ResolutionCandidate@419, ResolutionCandidate@420, ResolutionCandidate@421, ... }
-    <name not found> = ArrayList@880[7] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = ArrayList@881[7] { ResolutionCandidate@324, ResolutionCandidate@325, ResolutionCandidate@326, ... }
-    <name not found> = ArrayList@882[7] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
-    <name not found> = ArrayList@883[7] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
-    <name not found> = ArrayList@884[7] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
-    <name not found> = ArrayList@885[7] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-    <name not found> = ArrayList@886[7] { ResolutionCandidate@444, ResolutionCandidate@445, ResolutionCandidate@446, ... }
-    <name not found> = ArrayList@887[7] { ResolutionCandidate@404, ResolutionCandidate@405, ResolutionCandidate@406, ... }
-    <name not found> = ArrayList@888[7] { ResolutionCandidate@389, ResolutionCandidate@390, ResolutionCandidate@391, ... }
-    <name not found> = ArrayList@889[7] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-    <name not found> = ArrayList@890[7] { ResolutionCandidate@454, ResolutionCandidate@455, ResolutionCandidate@456, ... }
-    <name not found> = ArrayList@891[7] { ResolutionCandidate@409, ResolutionCandidate@410, ResolutionCandidate@411, ... }
-    <name not found> = ArrayList@892[8] { ResolutionCandidate@684, ResolutionCandidate@685, ResolutionCandidate@686, ... }
-    <name not found> = ArrayList@893[8] { ResolutionCandidate@614, ResolutionCandidate@615, ResolutionCandidate@616, ... }
-    <name not found> = ArrayList@894[8] { ResolutionCandidate@484, ResolutionCandidate@485, ResolutionCandidate@486, ... }
-    <name not found> = ArrayList@895[8] { ResolutionCandidate@674, ResolutionCandidate@675, ResolutionCandidate@676, ... }
-    <name not found> = ArrayList@896[8] { ResolutionCandidate@664, ResolutionCandidate@665, ResolutionCandidate@666, ... }
-    <name not found> = ArrayList@897[8] { ResolutionCandidate@464, ResolutionCandidate@465, ResolutionCandidate@466, ... }
-    <name not found> = ArrayList@898[8] { ResolutionCandidate@724, ResolutionCandidate@725, ResolutionCandidate@726, ... }
-    <name not found> = ArrayList@899[8] { ResolutionCandidate@504, ResolutionCandidate@505, ResolutionCandidate@506, ... }
-    <name not found> = ArrayList@900[8] { ResolutionCandidate@494, ResolutionCandidate@495, ResolutionCandidate@496, ... }
-    <name not found> = ArrayList@901[8] { ResolutionCandidate@769, ResolutionCandidate@770, ResolutionCandidate@771, ... }
-    <name not found> = ArrayList@902[8] { ResolutionCandidate@604, ResolutionCandidate@605, ResolutionCandidate@606, ... }
-    <name not found> = ArrayList@903[8] { ResolutionCandidate@654, ResolutionCandidate@655, ResolutionCandidate@656, ... }
-    <name not found> = ArrayList@904[8] { ResolutionCandidate@524, ResolutionCandidate@525, ResolutionCandidate@526, ... }
-    <name not found> = ArrayList@905[8] { ResolutionCandidate@574, ResolutionCandidate@575, ResolutionCandidate@576, ... }
-    <name not found> = ArrayList@906[8] { ResolutionCandidate@744, ResolutionCandidate@745, ResolutionCandidate@746, ... }
-    <name not found> = ArrayList@907[8] { ResolutionCandidate@509, ResolutionCandidate@510, ResolutionCandidate@511, ... }
-    <name not found> = ArrayList@908[8] { ResolutionCandidate@599, ResolutionCandidate@600, ResolutionCandidate@601, ... }
-    <name not found> = ArrayList@909[8] { ResolutionCandidate@729, ResolutionCandidate@730, ResolutionCandidate@731, ... }
-    <name not found> = ArrayList@910[8] { ResolutionCandidate@704, ResolutionCandidate@705, ResolutionCandidate@706, ... }
-    <name not found> = ArrayList@911[8] { ResolutionCandidate@734, ResolutionCandidate@735, ResolutionCandidate@736, ... }
-    <name not found> = ArrayList@912[8] { ResolutionCandidate@559, ResolutionCandidate@560, ResolutionCandidate@561, ... }
-    <name not found> = ArrayList@913[8] { ResolutionCandidate@634, ResolutionCandidate@635, ResolutionCandidate@636, ... }
-    <name not found> = ArrayList@914[8] { ResolutionCandidate@514, ResolutionCandidate@515, ResolutionCandidate@516, ... }
-    <name not found> = ArrayList@915[8] { ResolutionCandidate@759, ResolutionCandidate@760, ResolutionCandidate@761, ... }
-    <name not found> = ArrayList@916[8] { ResolutionCandidate@644, ResolutionCandidate@645, ResolutionCandidate@646, ... }
-    <name not found> = ArrayList@917[8] { ResolutionCandidate@579, ResolutionCandidate@580, ResolutionCandidate@581, ... }
-    <name not found> = ArrayList@918[8] { ResolutionCandidate@659, ResolutionCandidate@660, ResolutionCandidate@661, ... }
-    <name not found> = ArrayList@919[8] { ResolutionCandidate@564, ResolutionCandidate@565, ResolutionCandidate@566, ... }
-    <name not found> = ArrayList@920[8] { ResolutionCandidate@739, ResolutionCandidate@740, ResolutionCandidate@741, ... }
-    <name not found> = ArrayList@921[8] { ResolutionCandidate@719, ResolutionCandidate@720, ResolutionCandidate@721, ... }
-    <name not found> = ArrayList@922[8] { ResolutionCandidate@554, ResolutionCandidate@555, ResolutionCandidate@556, ... }
-    <name not found> = ArrayList@923[8] { ResolutionCandidate@479, ResolutionCandidate@480, ResolutionCandidate@481, ... }
-    <name not found> = ArrayList@924[8] { ResolutionCandidate@584, ResolutionCandidate@585, ResolutionCandidate@586, ... }
-    <name not found> = ArrayList@925[8] { ResolutionCandidate@609, ResolutionCandidate@610, ResolutionCandidate@611, ... }
-    <name not found> = ArrayList@926[8] { ResolutionCandidate@519, ResolutionCandidate@520, ResolutionCandidate@521, ... }
-    <name not found> = ArrayList@927[8] { ResolutionCandidate@474, ResolutionCandidate@475, ResolutionCandidate@476, ... }
-    <name not found> = ArrayList@928[8] { ResolutionCandidate@594, ResolutionCandidate@595, ResolutionCandidate@596, ... }
-    <name not found> = ArrayList@929[8] { ResolutionCandidate@679, ResolutionCandidate@680, ResolutionCandidate@681, ... }
-    <name not found> = ArrayList@930[8] { ResolutionCandidate@709, ResolutionCandidate@710, ResolutionCandidate@711, ... }
-    <name not found> = ArrayList@931[8] { ResolutionCandidate@469, ResolutionCandidate@470, ResolutionCandidate@471, ... }
-    <name not found> = ArrayList@932[8] { ResolutionCandidate@749, ResolutionCandidate@750, ResolutionCandidate@751, ... }
-    <name not found> = ArrayList@933[8] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626, ... }
-    <name not found> = ArrayList@934[8] { ResolutionCandidate@589, ResolutionCandidate@590, ResolutionCandidate@591, ... }
-    <name not found> = ArrayList@935[8] { ResolutionCandidate@639, ResolutionCandidate@640, ResolutionCandidate@641, ... }
-    <name not found> = ArrayList@936[8] { ResolutionCandidate@549, ResolutionCandidate@550, ResolutionCandidate@551, ... }
-    <name not found> = ArrayList@937[8] { ResolutionCandidate@669, ResolutionCandidate@670, ResolutionCandidate@671, ... }
-    <name not found> = ArrayList@938[8] { ResolutionCandidate@529, ResolutionCandidate@530, ResolutionCandidate@531, ... }
-    <name not found> = ArrayList@939[8] { ResolutionCandidate@629, ResolutionCandidate@630, ResolutionCandidate@631, ... }
-    <name not found> = ArrayList@940[8] { ResolutionCandidate@534, ResolutionCandidate@535, ResolutionCandidate@536, ... }
-    <name not found> = ArrayList@941[8] { ResolutionCandidate@714, ResolutionCandidate@715, ResolutionCandidate@716, ... }
-    <name not found> = ArrayList@942[8] { ResolutionCandidate@619, ResolutionCandidate@620, ResolutionCandidate@621, ... }
-    <name not found> = ArrayList@943[8] { ResolutionCandidate@754, ResolutionCandidate@755, ResolutionCandidate@756, ... }
-    <name not found> = ArrayList@944[8] { ResolutionCandidate@499, ResolutionCandidate@500, ResolutionCandidate@501, ... }
-    <name not found> = ArrayList@945[8] { ResolutionCandidate@699, ResolutionCandidate@700, ResolutionCandidate@701, ... }
-    <name not found> = ArrayList@946[8] { ResolutionCandidate@569, ResolutionCandidate@570, ResolutionCandidate@571, ... }
-    <name not found> = ArrayList@947[8] { ResolutionCandidate@649, ResolutionCandidate@650, ResolutionCandidate@651, ... }
-    <name not found> = ArrayList@948[8] { ResolutionCandidate@689, ResolutionCandidate@690, ResolutionCandidate@691, ... }
-    <name not found> = ArrayList@949[8] { ResolutionCandidate@694, ResolutionCandidate@695, ResolutionCandidate@696, ... }
-    <name not found> = ArrayList@950[8] { ResolutionCandidate@539, ResolutionCandidate@540, ResolutionCandidate@541, ... }
-    <name not found> = ArrayList@951[8] { ResolutionCandidate@489, ResolutionCandidate@490, ResolutionCandidate@491, ... }
-    <name not found> = ArrayList@952[8] { ResolutionCandidate@544, ResolutionCandidate@545, ResolutionCandidate@546, ... }
-    <name not found> = ArrayList@953[8] { ResolutionCandidate@459, ResolutionCandidate@460, ResolutionCandidate@461, ... }
-    <name not found> = ArrayList@954[8] { ResolutionCandidate@764, ResolutionCandidate@765, ResolutionCandidate@766, ... }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
deleted file mode 100644
index 293eabc3716..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
+++ /dev/null
@@ -1,173 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@3['Test'] {
-    <name not found> = IntValue@4 // through LazyJavaClassMemberScope@5
-    <name not found> = IntValue@6 // through LazyJavaStaticClassScope@7
-    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@10['Test']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = null
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@5
-    nestedClasses('i1': Name@15) = null // through LazyJavaClassMemberScope@5
-    nestedClasses('i2': Name@16) = null // through LazyJavaClassMemberScope@5
-    nestedClasses('i3': Name@17) = null // through LazyJavaClassMemberScope@5
-    nestedClasses('i4': Name@18) = null // through LazyJavaClassMemberScope@5
-    properties('i1': Name@15) = ArrayList@19[1] { JavaPropertyDescriptor@20['i1'] } // through LazyJavaStaticClassScope@7
-    properties('i1': Name@15) = EmptyList@21[empty] // through LazyJavaClassMemberScope@5
-    properties('i2': Name@16) = ArrayList@22[1] { JavaPropertyDescriptor@23['i2'] } // through LazyJavaStaticClassScope@7
-    properties('i2': Name@16) = EmptyList@21[empty] // through LazyJavaClassMemberScope@5
-    properties('i3': Name@17) = ArrayList@24[1] { JavaPropertyDescriptor@25['i3'] } // through LazyJavaClassMemberScope@5
-    properties('i4': Name@18) = ArrayList@26[1] { JavaPropertyDescriptor@27['i4'] } // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Test']
-}
-
-LazyJavaClassTypeConstructor@29['Test'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('Int': FqName@39) = null
-    packageFragments('Test': FqName@40) = null
-    packageFragments('a1': FqName@41) = null
-    packageFragments('a2': FqName@42) = null
-    packageFragments('a3': FqName@43) = null
-    packageFragments('a4': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.Int': FqName@49) = null
-    packageFragments('java.lang.Test': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.Int': FqName@52) = null
-    packageFragments('kotlin.Test': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    topLevelClasses(JavaClassImpl@56['Test']) = LazyJavaClassDescriptor@3['Test']
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Test': Name@59) = LazyJavaClassDescriptor@3['Test'] // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Test': Name@61) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@65) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('Test': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Test': Name@61) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@116[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@117[8] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/integer.lazy.log b/compiler/testData/diagnostics/tests/evaluate/integer.lazy.log
deleted file mode 100644
index 0af1a8f8dba..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/integer.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = LongValue@1
-    <name not found> = LongValue@2
-    <name not found> = LongValue@3
-    <name not found> = LongValue@4
-    <name not found> = LongValue@5
-    <name not found> = LongValue@6
-    <name not found> = LongValue@7
-    <name not found> = LongValue@8
-    <name not found> = LongValue@9
-    <name not found> = LongValue@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Int': FqName@14) = null
-    packageFragments('Long': FqName@15) = null
-    packageFragments('a1': FqName@16) = null
-    packageFragments('a10': FqName@17) = null
-    packageFragments('a2': FqName@18) = null
-    packageFragments('a3': FqName@19) = null
-    packageFragments('a4': FqName@20) = null
-    packageFragments('a5': FqName@21) = null
-    packageFragments('a6': FqName@22) = null
-    packageFragments('a7': FqName@23) = null
-    packageFragments('a8': FqName@24) = null
-    packageFragments('a9': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Int': FqName@30) = null
-    packageFragments('java.lang.Long': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.Long': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Long': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
deleted file mode 100644
index 497d461b70b..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
+++ /dev/null
@@ -1,1035 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = LongValue@3
-    <name not found> = LongValue@4
-    <name not found> = LongValue@5
-    <name not found> = LongValue@6
-    <name not found> = LongValue@7
-    <name not found> = LongValue@8
-    <name not found> = LongValue@9
-    <name not found> = LongValue@10
-    <name not found> = LongValue@11
-    <name not found> = LongValue@12
-    <name not found> = LongValue@13
-    <name not found> = LongValue@14
-    <name not found> = LongValue@15
-    <name not found> = LongValue@16
-    <name not found> = LongValue@17
-    <name not found> = LongValue@18
-    <name not found> = LongValue@19
-    <name not found> = LongValue@20
-    <name not found> = LongValue@21
-}
-
-LazyJavaPackageFragmentProvider@22 {
-    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('A': FqName@25) = null
-    packageFragments('Int': FqName@26) = null
-    packageFragments('Long': FqName@27) = null
-    packageFragments('a2': FqName@28) = null
-    packageFragments('intMaxValue': FqName@29) = null
-    packageFragments('intMinValue': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.Int': FqName@35) = null
-    packageFragments('java.lang.Long': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.Int': FqName@38) = null
-    packageFragments('kotlin.Long': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('l1': FqName@42) = null
-    packageFragments('l10': FqName@43) = null
-    packageFragments('l11': FqName@44) = null
-    packageFragments('l12': FqName@45) = null
-    packageFragments('l13': FqName@46) = null
-    packageFragments('l14': FqName@47) = null
-    packageFragments('l15': FqName@48) = null
-    packageFragments('l16': FqName@49) = null
-    packageFragments('l19': FqName@50) = null
-    packageFragments('l2': FqName@51) = null
-    packageFragments('l3': FqName@52) = null
-    packageFragments('l4': FqName@53) = null
-    packageFragments('l5': FqName@54) = null
-    packageFragments('l6': FqName@55) = null
-    packageFragments('l7': FqName@56) = null
-    packageFragments('l8': FqName@57) = null
-    packageFragments('longMaxValue': FqName@58) = null
-    packageFragments('longMinValue': FqName@59) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('Int': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Long': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('intMinValue': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('longMaxValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('longMinValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('intMinValue': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('longMaxValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('longMinValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = EmptyList@70[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[7] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[7] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[7] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[7] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[7] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[7] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[7] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[7] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[7] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[7] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[7] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[7] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[7] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[8] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[8] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428, ... }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[8] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433, ... }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[8] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[8] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
-}
-
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[8] { ResolutionCandidate@466, ResolutionCandidate@467, ResolutionCandidate@468, ... }
-}
-
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[8] { ResolutionCandidate@476, ResolutionCandidate@477, ResolutionCandidate@478, ... }
-}
-
-ResolutionTaskHolder@479 {
-    <name not found> = ArrayList@480[8] { ResolutionCandidate@481, ResolutionCandidate@482, ResolutionCandidate@483, ... }
-}
-
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[8] { ResolutionCandidate@491, ResolutionCandidate@492, ResolutionCandidate@493, ... }
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[8] { ResolutionCandidate@496, ResolutionCandidate@497, ResolutionCandidate@498, ... }
-}
-
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[8] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[8] { ResolutionCandidate@506, ResolutionCandidate@507, ResolutionCandidate@508, ... }
-}
-
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[8] { ResolutionCandidate@511, ResolutionCandidate@512, ResolutionCandidate@513, ... }
-}
-
-ResolutionTaskHolder@514 {
-    <name not found> = ArrayList@515[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
-}
-
-ResolutionTaskHolder@519 {
-    <name not found> = ArrayList@520[8] { ResolutionCandidate@521, ResolutionCandidate@522, ResolutionCandidate@523, ... }
-}
-
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[8] { ResolutionCandidate@526, ResolutionCandidate@527, ResolutionCandidate@528, ... }
-}
-
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[8] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
-}
-
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[8] { ResolutionCandidate@536, ResolutionCandidate@537, ResolutionCandidate@538, ... }
-}
-
-ResolutionTaskHolder@539 {
-    <name not found> = ArrayList@540[8] { ResolutionCandidate@541, ResolutionCandidate@542, ResolutionCandidate@543, ... }
-}
-
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[8] { ResolutionCandidate@546, ResolutionCandidate@547, ResolutionCandidate@548, ... }
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[8] { ResolutionCandidate@551, ResolutionCandidate@552, ResolutionCandidate@553, ... }
-}
-
-ResolutionTaskHolder@554 {
-    <name not found> = ArrayList@555[8] { ResolutionCandidate@556, ResolutionCandidate@557, ResolutionCandidate@558, ... }
-}
-
-ResolutionTaskHolder@559 {
-    <name not found> = ArrayList@560[8] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[8] { ResolutionCandidate@566, ResolutionCandidate@567, ResolutionCandidate@568, ... }
-}
-
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[8] { ResolutionCandidate@571, ResolutionCandidate@572, ResolutionCandidate@573, ... }
-}
-
-ResolutionTaskHolder@574 {
-    <name not found> = ArrayList@575[8] { ResolutionCandidate@576, ResolutionCandidate@577, ResolutionCandidate@578, ... }
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[8] { ResolutionCandidate@581, ResolutionCandidate@582, ResolutionCandidate@583, ... }
-}
-
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[8] { ResolutionCandidate@586, ResolutionCandidate@587, ResolutionCandidate@588, ... }
-}
-
-ResolutionTaskHolder@589 {
-    <name not found> = ArrayList@590[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[8] { ResolutionCandidate@596, ResolutionCandidate@597, ResolutionCandidate@598, ... }
-}
-
-ResolutionTaskHolder@599 {
-    <name not found> = ArrayList@600[8] { ResolutionCandidate@601, ResolutionCandidate@602, ResolutionCandidate@603, ... }
-}
-
-ResolutionTaskHolder@604 {
-    <name not found> = ArrayList@605[8] { ResolutionCandidate@606, ResolutionCandidate@607, ResolutionCandidate@608, ... }
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[8] { ResolutionCandidate@611, ResolutionCandidate@612, ResolutionCandidate@613, ... }
-}
-
-ResolutionTaskHolder@614 {
-    <name not found> = ArrayList@615[8] { ResolutionCandidate@616, ResolutionCandidate@617, ResolutionCandidate@618, ... }
-}
-
-ResolutionTaskHolder@619 {
-    <name not found> = ArrayList@620[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[8] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
-}
-
-ResolutionTaskHolder@629 {
-    <name not found> = ArrayList@630[8] { ResolutionCandidate@631, ResolutionCandidate@632, ResolutionCandidate@633, ... }
-}
-
-ResolutionTaskHolder@634 {
-    <name not found> = ArrayList@635[8] { ResolutionCandidate@636, ResolutionCandidate@637, ResolutionCandidate@638, ... }
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = ArrayList@640[8] { ResolutionCandidate@641, ResolutionCandidate@642, ResolutionCandidate@643, ... }
-}
-
-ResolutionTaskHolder@644 {
-    <name not found> = ArrayList@645[8] { ResolutionCandidate@646, ResolutionCandidate@647, ResolutionCandidate@648, ... }
-}
-
-ResolutionTaskHolder@649 {
-    <name not found> = ArrayList@650[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[8] { ResolutionCandidate@656, ResolutionCandidate@657, ResolutionCandidate@658, ... }
-}
-
-ResolutionTaskHolder@659 {
-    <name not found> = ArrayList@660[8] { ResolutionCandidate@661, ResolutionCandidate@662, ResolutionCandidate@663, ... }
-}
-
-ResolutionTaskHolder@664 {
-    <name not found> = ArrayList@665[8] { ResolutionCandidate@666, ResolutionCandidate@667, ResolutionCandidate@668, ... }
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[8] { ResolutionCandidate@671, ResolutionCandidate@672, ResolutionCandidate@673, ... }
-}
-
-null {
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@766[7] { ResolutionCandidate@411, ResolutionCandidate@412, ResolutionCandidate@413, ... }
-    <name not found> = ArrayList@767[7] { ResolutionCandidate@331, ResolutionCandidate@332, ResolutionCandidate@333, ... }
-    <name not found> = ArrayList@768[7] { ResolutionCandidate@346, ResolutionCandidate@347, ResolutionCandidate@348, ... }
-    <name not found> = ArrayList@769[7] { ResolutionCandidate@406, ResolutionCandidate@407, ResolutionCandidate@408, ... }
-    <name not found> = ArrayList@770[7] { ResolutionCandidate@391, ResolutionCandidate@392, ResolutionCandidate@393, ... }
-    <name not found> = ArrayList@771[7] { ResolutionCandidate@371, ResolutionCandidate@372, ResolutionCandidate@373, ... }
-    <name not found> = ArrayList@772[7] { ResolutionCandidate@416, ResolutionCandidate@417, ResolutionCandidate@418, ... }
-    <name not found> = ArrayList@773[7] { ResolutionCandidate@341, ResolutionCandidate@342, ResolutionCandidate@343, ... }
-    <name not found> = ArrayList@774[7] { ResolutionCandidate@401, ResolutionCandidate@402, ResolutionCandidate@403, ... }
-    <name not found> = ArrayList@775[7] { ResolutionCandidate@396, ResolutionCandidate@397, ResolutionCandidate@398, ... }
-    <name not found> = ArrayList@776[7] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-    <name not found> = ArrayList@777[7] { ResolutionCandidate@336, ResolutionCandidate@337, ResolutionCandidate@338, ... }
-    <name not found> = ArrayList@778[7] { ResolutionCandidate@351, ResolutionCandidate@352, ResolutionCandidate@353, ... }
-    <name not found> = ArrayList@779[7] { ResolutionCandidate@386, ResolutionCandidate@387, ResolutionCandidate@388, ... }
-    <name not found> = ArrayList@780[7] { ResolutionCandidate@356, ResolutionCandidate@357, ResolutionCandidate@358, ... }
-    <name not found> = ArrayList@781[7] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-    <name not found> = ArrayList@782[7] { ResolutionCandidate@361, ResolutionCandidate@362, ResolutionCandidate@363, ... }
-    <name not found> = ArrayList@783[7] { ResolutionCandidate@366, ResolutionCandidate@367, ResolutionCandidate@368, ... }
-    <name not found> = ArrayList@784[8] { ResolutionCandidate@476, ResolutionCandidate@477, ResolutionCandidate@478, ... }
-    <name not found> = ArrayList@785[8] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-    <name not found> = ArrayList@786[8] { ResolutionCandidate@521, ResolutionCandidate@522, ResolutionCandidate@523, ... }
-    <name not found> = ArrayList@787[8] { ResolutionCandidate@666, ResolutionCandidate@667, ResolutionCandidate@668, ... }
-    <name not found> = ArrayList@788[8] { ResolutionCandidate@426, ResolutionCandidate@427, ResolutionCandidate@428, ... }
-    <name not found> = ArrayList@789[8] { ResolutionCandidate@551, ResolutionCandidate@552, ResolutionCandidate@553, ... }
-    <name not found> = ArrayList@790[8] { ResolutionCandidate@591, ResolutionCandidate@592, ResolutionCandidate@593, ... }
-    <name not found> = ArrayList@791[8] { ResolutionCandidate@576, ResolutionCandidate@577, ResolutionCandidate@578, ... }
-    <name not found> = ArrayList@792[8] { ResolutionCandidate@516, ResolutionCandidate@517, ResolutionCandidate@518, ... }
-    <name not found> = ArrayList@793[8] { ResolutionCandidate@656, ResolutionCandidate@657, ResolutionCandidate@658, ... }
-    <name not found> = ArrayList@794[8] { ResolutionCandidate@441, ResolutionCandidate@442, ResolutionCandidate@443, ... }
-    <name not found> = ArrayList@795[8] { ResolutionCandidate@436, ResolutionCandidate@437, ResolutionCandidate@438, ... }
-    <name not found> = ArrayList@796[8] { ResolutionCandidate@581, ResolutionCandidate@582, ResolutionCandidate@583, ... }
-    <name not found> = ArrayList@797[8] { ResolutionCandidate@611, ResolutionCandidate@612, ResolutionCandidate@613, ... }
-    <name not found> = ArrayList@798[8] { ResolutionCandidate@671, ResolutionCandidate@672, ResolutionCandidate@673, ... }
-    <name not found> = ArrayList@799[8] { ResolutionCandidate@596, ResolutionCandidate@597, ResolutionCandidate@598, ... }
-    <name not found> = ArrayList@800[8] { ResolutionCandidate@601, ResolutionCandidate@602, ResolutionCandidate@603, ... }
-    <name not found> = ArrayList@801[8] { ResolutionCandidate@536, ResolutionCandidate@537, ResolutionCandidate@538, ... }
-    <name not found> = ArrayList@802[8] { ResolutionCandidate@631, ResolutionCandidate@632, ResolutionCandidate@633, ... }
-    <name not found> = ArrayList@803[8] { ResolutionCandidate@466, ResolutionCandidate@467, ResolutionCandidate@468, ... }
-    <name not found> = ArrayList@804[8] { ResolutionCandidate@451, ResolutionCandidate@452, ResolutionCandidate@453, ... }
-    <name not found> = ArrayList@805[8] { ResolutionCandidate@541, ResolutionCandidate@542, ResolutionCandidate@543, ... }
-    <name not found> = ArrayList@806[8] { ResolutionCandidate@456, ResolutionCandidate@457, ResolutionCandidate@458, ... }
-    <name not found> = ArrayList@807[8] { ResolutionCandidate@621, ResolutionCandidate@622, ResolutionCandidate@623, ... }
-    <name not found> = ArrayList@808[8] { ResolutionCandidate@626, ResolutionCandidate@627, ResolutionCandidate@628, ... }
-    <name not found> = ArrayList@809[8] { ResolutionCandidate@546, ResolutionCandidate@547, ResolutionCandidate@548, ... }
-    <name not found> = ArrayList@810[8] { ResolutionCandidate@501, ResolutionCandidate@502, ResolutionCandidate@503, ... }
-    <name not found> = ArrayList@811[8] { ResolutionCandidate@471, ResolutionCandidate@472, ResolutionCandidate@473, ... }
-    <name not found> = ArrayList@812[8] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433, ... }
-    <name not found> = ArrayList@813[8] { ResolutionCandidate@511, ResolutionCandidate@512, ResolutionCandidate@513, ... }
-    <name not found> = ArrayList@814[8] { ResolutionCandidate@566, ResolutionCandidate@567, ResolutionCandidate@568, ... }
-    <name not found> = ArrayList@815[8] { ResolutionCandidate@586, ResolutionCandidate@587, ResolutionCandidate@588, ... }
-    <name not found> = ArrayList@816[8] { ResolutionCandidate@616, ResolutionCandidate@617, ResolutionCandidate@618, ... }
-    <name not found> = ArrayList@817[8] { ResolutionCandidate@636, ResolutionCandidate@637, ResolutionCandidate@638, ... }
-    <name not found> = ArrayList@818[8] { ResolutionCandidate@561, ResolutionCandidate@562, ResolutionCandidate@563, ... }
-    <name not found> = ArrayList@819[8] { ResolutionCandidate@556, ResolutionCandidate@557, ResolutionCandidate@558, ... }
-    <name not found> = ArrayList@820[8] { ResolutionCandidate@461, ResolutionCandidate@462, ResolutionCandidate@463, ... }
-    <name not found> = ArrayList@821[8] { ResolutionCandidate@491, ResolutionCandidate@492, ResolutionCandidate@493, ... }
-    <name not found> = ArrayList@822[8] { ResolutionCandidate@641, ResolutionCandidate@642, ResolutionCandidate@643, ... }
-    <name not found> = ArrayList@823[8] { ResolutionCandidate@506, ResolutionCandidate@507, ResolutionCandidate@508, ... }
-    <name not found> = ArrayList@824[8] { ResolutionCandidate@481, ResolutionCandidate@482, ResolutionCandidate@483, ... }
-    <name not found> = ArrayList@825[8] { ResolutionCandidate@571, ResolutionCandidate@572, ResolutionCandidate@573, ... }
-    <name not found> = ArrayList@826[8] { ResolutionCandidate@496, ResolutionCandidate@497, ResolutionCandidate@498, ... }
-    <name not found> = ArrayList@827[8] { ResolutionCandidate@446, ResolutionCandidate@447, ResolutionCandidate@448, ... }
-    <name not found> = ArrayList@828[8] { ResolutionCandidate@486, ResolutionCandidate@487, ResolutionCandidate@488, ... }
-    <name not found> = ArrayList@829[8] { ResolutionCandidate@661, ResolutionCandidate@662, ResolutionCandidate@663, ... }
-    <name not found> = ArrayList@830[8] { ResolutionCandidate@646, ResolutionCandidate@647, ResolutionCandidate@648, ... }
-    <name not found> = ArrayList@831[8] { ResolutionCandidate@526, ResolutionCandidate@527, ResolutionCandidate@528, ... }
-    <name not found> = ArrayList@832[8] { ResolutionCandidate@651, ResolutionCandidate@652, ResolutionCandidate@653, ... }
-    <name not found> = ArrayList@833[8] { ResolutionCandidate@531, ResolutionCandidate@532, ResolutionCandidate@533, ... }
-    <name not found> = ArrayList@834[8] { ResolutionCandidate@606, ResolutionCandidate@607, ResolutionCandidate@608, ... }
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-    <name not found> = EmptyList@70[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
deleted file mode 100644
index 289cb0f8eff..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
+++ /dev/null
@@ -1,311 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Byte']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Long']
-    <name not found> = JetTypeImpl@4['Short']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Byte': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('Short': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Byte': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Long': FqName@18) = null
-    packageFragments('java.lang.Short': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Byte': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Long': FqName@23) = null
-    packageFragments('kotlin.Short': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Byte': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@205[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@206[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@207[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@208[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@209[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@210[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@211[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@212[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@213[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@214[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@215[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@216[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
deleted file mode 100644
index f68bea1a352..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
+++ /dev/null
@@ -1,311 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Byte']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Long']
-    <name not found> = JetTypeImpl@4['Short']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Byte': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('Short': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Byte': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Long': FqName@18) = null
-    packageFragments('java.lang.Short': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Byte': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Long': FqName@23) = null
-    packageFragments('kotlin.Short': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Byte': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@205[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@206[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@207[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@208[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@209[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@210[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@211[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@212[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@213[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@214[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@215[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@216[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
deleted file mode 100644
index 58ba338c798..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
+++ /dev/null
@@ -1,311 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Byte']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Long']
-    <name not found> = JetTypeImpl@4['Short']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Byte': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('Short': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Byte': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Long': FqName@18) = null
-    packageFragments('java.lang.Short': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Byte': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Long': FqName@23) = null
-    packageFragments('kotlin.Short': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Byte': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@205[7] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@206[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@207[7] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@208[7] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@209[7] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@210[7] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@211[7] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@212[7] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@213[7] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@214[7] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@215[7] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@216[7] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@217[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
deleted file mode 100644
index c11d2ebe0e7..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('a1': FqName@7) = null
-    packageFragments('a2': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[7] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@90[7] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = ArrayList@91[7] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = ArrayList@92[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log b/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
deleted file mode 100644
index 855104588db..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
+++ /dev/null
@@ -1,190 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ByteValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = LongValue@8
-    <name not found> = LongValue@9
-    <name not found> = ShortValue@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Byte': FqName@14) = null
-    packageFragments('Int': FqName@15) = null
-    packageFragments('Long': FqName@16) = null
-    packageFragments('Short': FqName@17) = null
-    packageFragments('b1': FqName@18) = null
-    packageFragments('b2': FqName@19) = null
-    packageFragments('b3': FqName@20) = null
-    packageFragments('b4': FqName@21) = null
-    packageFragments('i1': FqName@22) = null
-    packageFragments('i2': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.Byte': FqName@28) = null
-    packageFragments('java.lang.Int': FqName@29) = null
-    packageFragments('java.lang.Long': FqName@30) = null
-    packageFragments('java.lang.Short': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.Byte': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Long': FqName@35) = null
-    packageFragments('kotlin.Short': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('p1': FqName@39) = null
-    packageFragments('p2': FqName@40) = null
-    packageFragments('p3': FqName@41) = null
-    packageFragments('p4': FqName@42) = null
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('Byte': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Long': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Short': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-}
-
-null {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@178[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = ArrayList@179[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@180[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@181[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@182[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@183[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@184[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@185[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@186[7] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@187[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = ArrayList@188[8] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-    <name not found> = ArrayList@189[8] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131, ... }
-    <name not found> = ArrayList@190[8] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141, ... }
-    <name not found> = ArrayList@192[8] { ResolutionCandidate@124, ResolutionCandidate@125, ResolutionCandidate@126, ... }
-    <name not found> = ArrayList@193[8] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@194[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = ArrayList@195[8] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@196[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@197[8] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log b/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
deleted file mode 100644
index 281d8aed2fc..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('example': FqName@7) = null
-    packageFragments('example.Int': FqName@8) = null
-    packageFragments('example.ns': FqName@9) = null
-    packageFragments('example.ns.Any': FqName@10) = null
-    packageFragments('example.ns.y': FqName@11) = null
-    packageFragments('example.x': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('ns': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
deleted file mode 100644
index a9b74567805..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
+++ /dev/null
@@ -1,751 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Byte']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Long']
-    <name not found> = JetTypeImpl@4['Short']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Byte': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('Short': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Byte': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Long': FqName@18) = null
-    packageFragments('java.lang.Short': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Byte': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Long': FqName@23) = null
-    packageFragments('kotlin.Short': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Byte': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[8] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[8] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[8] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[8] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[8] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[8] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[8] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
-}
-
-null {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@367[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-    <name not found> = ArrayList@368[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@369[8] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233, ... }
-    <name not found> = ArrayList@370[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = ArrayList@371[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@372[8] { ResolutionCandidate@306, ResolutionCandidate@307, ResolutionCandidate@308, ... }
-    <name not found> = ArrayList@373[8] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@374[8] { ResolutionCandidate@271, ResolutionCandidate@272, ResolutionCandidate@273, ... }
-    <name not found> = ArrayList@375[8] { ResolutionCandidate@261, ResolutionCandidate@262, ResolutionCandidate@263, ... }
-    <name not found> = ArrayList@376[8] { ResolutionCandidate@211, ResolutionCandidate@212, ResolutionCandidate@213, ... }
-    <name not found> = ArrayList@377[8] { ResolutionCandidate@311, ResolutionCandidate@312, ResolutionCandidate@313, ... }
-    <name not found> = ArrayList@378[8] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = ArrayList@379[8] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
-    <name not found> = ArrayList@380[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@381[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@382[8] { ResolutionCandidate@236, ResolutionCandidate@237, ResolutionCandidate@238, ... }
-    <name not found> = ArrayList@383[8] { ResolutionCandidate@266, ResolutionCandidate@267, ResolutionCandidate@268, ... }
-    <name not found> = ArrayList@384[8] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = ArrayList@385[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-    <name not found> = ArrayList@386[8] { ResolutionCandidate@241, ResolutionCandidate@242, ResolutionCandidate@243, ... }
-    <name not found> = ArrayList@387[8] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@388[8] { ResolutionCandidate@221, ResolutionCandidate@222, ResolutionCandidate@223, ... }
-    <name not found> = ArrayList@389[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@390[8] { ResolutionCandidate@301, ResolutionCandidate@302, ResolutionCandidate@303, ... }
-    <name not found> = ArrayList@391[8] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-    <name not found> = ArrayList@392[8] { ResolutionCandidate@316, ResolutionCandidate@317, ResolutionCandidate@318, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
deleted file mode 100644
index a01ce48c379..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
+++ /dev/null
@@ -1,803 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ByteValue@1
-    <name not found> = DeserializedType@2['kotlin.Byte']
-    <name not found> = DeserializedType@3['kotlin.Short']
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = JetTypeImpl@6['Byte']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@8['Int']
-    <name not found> = JetTypeImpl@9['Long']
-    <name not found> = JetTypeImpl@9['Long']
-    <name not found> = JetTypeImpl@10['Long']
-    <name not found> = JetTypeImpl@11['Short']
-    <name not found> = LongValue@12
-    <name not found> = LongValue@13
-    <name not found> = ShortValue@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('Byte': FqName@18) = null
-    packageFragments('Int': FqName@19) = null
-    packageFragments('Long': FqName@20) = null
-    packageFragments('Short': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.Byte': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.Long': FqName@28) = null
-    packageFragments('java.lang.Short': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.Byte': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.Long': FqName@33) = null
-    packageFragments('kotlin.Short': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-    packageFragments('p1': FqName@37) = null
-    packageFragments('p2': FqName@38) = null
-    packageFragments('p3': FqName@39) = null
-    packageFragments('p4': FqName@40) = null
-    packageFragments('p5': FqName@41) = null
-    packageFragments('p6': FqName@42) = null
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('Byte': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Long': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Short': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('fooByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('fooInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('fooLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('fooShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p1': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p3': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p4': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p5': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p6': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooByte': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooInt': Name@49) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooLong': Name@50) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooShort': Name@51) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('fooByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p1': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p3': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p4': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p5': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p6': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooByte': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooInt': Name@49) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooLong': Name@50) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooShort': Name@51) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-null {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@321[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-    <name not found> = ArrayList@322[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = ArrayList@323[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@324[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-    <name not found> = ArrayList@325[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = ArrayList@326[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
deleted file mode 100644
index 6e50761da8b..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
+++ /dev/null
@@ -1,288 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ByteValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = IntValue@13
-    <name not found> = IntValue@14
-    <name not found> = LongValue@15
-    <name not found> = LongValue@16
-    <name not found> = LongValue@17
-    <name not found> = LongValue@18
-    <name not found> = LongValue@19
-    <name not found> = LongValue@20
-    <name not found> = LongValue@21
-    <name not found> = LongValue@22
-    <name not found> = LongValue@23
-    <name not found> = ShortValue@24
-}
-
-LazyJavaPackageFragmentProvider@25 {
-    packageFragments('<root>': FqName@26) = LazyJavaPackageFragment@27['<root>']
-    packageFragments('Byte': FqName@28) = null
-    packageFragments('Int': FqName@29) = null
-    packageFragments('Long': FqName@30) = null
-    packageFragments('Short': FqName@31) = null
-    packageFragments('b1': FqName@32) = null
-    packageFragments('b2': FqName@33) = null
-    packageFragments('b3': FqName@34) = null
-    packageFragments('b4': FqName@35) = null
-    packageFragments('i1': FqName@36) = null
-    packageFragments('i2': FqName@37) = null
-    packageFragments('i3': FqName@38) = null
-    packageFragments('i4': FqName@39) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.Byte': FqName@44) = null
-    packageFragments('java.lang.Int': FqName@45) = null
-    packageFragments('java.lang.Long': FqName@46) = null
-    packageFragments('java.lang.Short': FqName@47) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.Byte': FqName@49) = null
-    packageFragments('kotlin.Int': FqName@50) = null
-    packageFragments('kotlin.Long': FqName@51) = null
-    packageFragments('kotlin.Short': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('l1': FqName@55) = null
-    packageFragments('l2': FqName@56) = null
-    packageFragments('l3': FqName@57) = null
-    packageFragments('l4': FqName@58) = null
-    packageFragments('lp1': FqName@59) = null
-    packageFragments('lp2': FqName@60) = null
-    packageFragments('lp3': FqName@61) = null
-    packageFragments('lp4': FqName@62) = null
-    packageFragments('p1': FqName@63) = null
-    packageFragments('p2': FqName@64) = null
-    packageFragments('p3': FqName@65) = null
-    packageFragments('p4': FqName@66) = null
-    packageFragments('s1': FqName@67) = null
-    packageFragments('s2': FqName@68) = null
-    packageFragments('s3': FqName@69) = null
-    packageFragments('s4': FqName@70) = null
-}
-
-LazyJavaPackageFragment@27['<root>'] {
-    classes('Byte': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Long': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Short': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[8] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[8] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-}
-
-null {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@266[8] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@267[8] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = ArrayList@268[8] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = ArrayList@269[8] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189, ... }
-    <name not found> = ArrayList@270[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@272[8] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-    <name not found> = ArrayList@274[8] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@276[8] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-    <name not found> = ArrayList@277[8] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@152, ResolutionCandidate@153, ResolutionCandidate@154, ... }
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@281[8] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@282[8] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@283[8] { ResolutionCandidate@157, ResolutionCandidate@158, ResolutionCandidate@159, ... }
-    <name not found> = ArrayList@284[8] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@285[8] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-    <name not found> = ArrayList@286[8] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@287[8] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-    <name not found> = ArrayList@288[8] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@289[8] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.lazy.log b/compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.lazy.log
deleted file mode 100644
index 0af1a8f8dba..00000000000
--- a/compiler/testData/diagnostics/tests/evaluate/wrongLongSuffix.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = LongValue@1
-    <name not found> = LongValue@2
-    <name not found> = LongValue@3
-    <name not found> = LongValue@4
-    <name not found> = LongValue@5
-    <name not found> = LongValue@6
-    <name not found> = LongValue@7
-    <name not found> = LongValue@8
-    <name not found> = LongValue@9
-    <name not found> = LongValue@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Int': FqName@14) = null
-    packageFragments('Long': FqName@15) = null
-    packageFragments('a1': FqName@16) = null
-    packageFragments('a10': FqName@17) = null
-    packageFragments('a2': FqName@18) = null
-    packageFragments('a3': FqName@19) = null
-    packageFragments('a4': FqName@20) = null
-    packageFragments('a5': FqName@21) = null
-    packageFragments('a6': FqName@22) = null
-    packageFragments('a7': FqName@23) = null
-    packageFragments('a8': FqName@24) = null
-    packageFragments('a9': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Int': FqName@30) = null
-    packageFragments('java.lang.Long': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.Long': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Long': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
deleted file mode 100644
index 4d3004c9260..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
+++ /dev/null
@@ -1,621 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaClassDescriptor@3['Appendable'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
-}
-
-LazyJavaClassDescriptor@9['AutoCloseable'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@13['Closeable'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
-}
-
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
-}
-
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('print': Name@29) = ArrayList@30[9] { JavaMethodDescriptor@31['print'], JavaMethodDescriptor@32['print'], JavaMethodDescriptor@33['print'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@28
-    nestedClasses('print': Name@29) = null // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['PrintStream']
-}
-
-LazyJavaClassDescriptor@38['System'] {
-    enumEntryIndex = LinkedHashMap@39 // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaStaticClassScope@43
-    nestedClassIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@40
-    nestedClasses('out': Name@45) = null // through LazyJavaClassMemberScope@40
-    properties('out': Name@45) = ArrayList@46[1] { JavaPropertyDescriptor@47['out'] } // through LazyJavaStaticClassScope@43
-    properties('out': Name@45) = EmptyList@5[empty] // through LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@48['System']
-}
-
-LazyJavaClassTypeConstructor@8['Appendable'] {
-    parameters = ArrayList@49[empty]
-    supertypes = ArrayList@50[1] { JetTypeImpl@51['Any'] }
-}
-
-LazyJavaClassTypeConstructor@12['AutoCloseable'] {
-    parameters = ArrayList@52[empty]
-    supertypes = ArrayList@53[1] { JetTypeImpl@51['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Closeable'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@24['OutputStream'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@37['PrintStream'] {
-    parameters = ArrayList@63[empty]
-    supertypes = ArrayList@64[3] { LazyJavaClassifierType@65['FilterOutputStream'], LazyJavaClassifierType@66['Appendable'], LazyJavaClassifierType@67['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@48['System'] {
-    supertypes = ArrayList@68[1] { JetTypeImpl@51['Any'] }
-}
-
-LazyJavaClassifierType@66['Appendable'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@70['Appendable']
-    memberScope = LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
-}
-
-LazyJavaClassifierType@56['AutoCloseable'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
-}
-
-LazyJavaClassifierType@62['Closeable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
-}
-
-LazyJavaClassifierType@67['Closeable'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
-}
-
-LazyJavaClassifierType@65['FilterOutputStream'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
-}
-
-LazyJavaClassifierType@79['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@80
-}
-
-LazyJavaClassifierType@81['Object'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@83['Object']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@86['Object'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@83['Object']
-    nullable = 'true': Boolean@88
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@89['Object'] {
-    classifier = JavaClassImpl@90['Object']
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@91['Object'] {
-    classifier = JavaClassImpl@92['Object']
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@93['Object'] {
-    classifier = JavaClassImpl@94['Object']
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@95['Object'] {
-    classifier = JavaClassImpl@96['Object']
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@59['OutputStream'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
-}
-
-LazyJavaClassifierType@99['PrintStream'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
-    nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@37['PrintStream']
-}
-
-LazyJavaClassifierType@102['PrintStream'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@101['PrintStream']
-    nullable = 'true': Boolean@88
-    typeConstructor = LazyJavaClassTypeConstructor@37['PrintStream']
-}
-
-LazyJavaClassifierType@104['String'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@108['String'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'true': Boolean@88
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaPackageFragmentProvider@110 {
-    packageFragments('<root>': FqName@111) = LazyJavaPackageFragment@112['<root>']
-    packageFragments('A': FqName@113) = null
-    packageFragments('Any': FqName@114) = null
-    packageFragments('Array': FqName@115) = null
-    packageFragments('Boolean': FqName@116) = null
-    packageFragments('Command': FqName@117) = null
-    packageFragments('E': FqName@118) = null
-    packageFragments('Int': FqName@119) = null
-    packageFragments('String': FqName@120) = null
-    packageFragments('System': FqName@121) = null
-    packageFragments('T': FqName@122) = null
-    packageFragments('Unit': FqName@123) = null
-    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
-    packageFragments('java.io': FqName@126) = LazyJavaPackageFragment@127['io']
-    packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
-    packageFragments('java.lang.A': FqName@130) = null
-    packageFragments('java.lang.Any': FqName@131) = null
-    packageFragments('java.lang.Array': FqName@132) = null
-    packageFragments('java.lang.Boolean': FqName@133) = null
-    packageFragments('java.lang.Command': FqName@134) = null
-    packageFragments('java.lang.E': FqName@135) = null
-    packageFragments('java.lang.Int': FqName@136) = null
-    packageFragments('java.lang.String': FqName@137) = null
-    packageFragments('java.lang.System': FqName@138) = null
-    packageFragments('java.lang.T': FqName@139) = null
-    packageFragments('java.lang.Unit': FqName@140) = null
-    packageFragments('kotlin': FqName@141) = null
-    packageFragments('kotlin.A': FqName@142) = null
-    packageFragments('kotlin.Any': FqName@143) = null
-    packageFragments('kotlin.Array': FqName@144) = null
-    packageFragments('kotlin.Boolean': FqName@145) = null
-    packageFragments('kotlin.Command': FqName@146) = null
-    packageFragments('kotlin.E': FqName@147) = null
-    packageFragments('kotlin.Int': FqName@148) = null
-    packageFragments('kotlin.String': FqName@149) = null
-    packageFragments('kotlin.System': FqName@150) = null
-    packageFragments('kotlin.T': FqName@151) = null
-    packageFragments('kotlin.Unit': FqName@152) = null
-    packageFragments('kotlin.io': FqName@153) = null
-    packageFragments('kotlin.jvm': FqName@154) = null
-    packageFragments('null_safety': FqName@155) = null
-    packageFragments('null_safety.Any': FqName@156) = null
-    packageFragments('null_safety.Array': FqName@157) = null
-    packageFragments('null_safety.Boolean': FqName@158) = null
-    packageFragments('null_safety.Command': FqName@159) = null
-    packageFragments('null_safety.Int': FqName@160) = null
-    packageFragments('null_safety.String': FqName@161) = null
-    packageFragments('null_safety.System': FqName@162) = null
-    packageFragments('outer': FqName@163) = null
-    packageFragments('outer.A': FqName@164) = null
-    packageFragments('outer.Any': FqName@165) = null
-    packageFragments('outer.Array': FqName@166) = null
-    packageFragments('outer.Boolean': FqName@167) = null
-    packageFragments('outer.Command': FqName@168) = null
-    packageFragments('outer.E': FqName@169) = null
-    packageFragments('outer.Int': FqName@170) = null
-    packageFragments('outer.String': FqName@171) = null
-    packageFragments('outer.System': FqName@172) = null
-    packageFragments('outer.T': FqName@173) = null
-    packageFragments('outer.Unit': FqName@174) = null
-    packageFragments('outer.abs': FqName@175) = null
-    packageFragments('outer.foo': FqName@176) = null
-    packageFragments('outer.optval': FqName@177) = null
-    topLevelClasses(JavaClassImpl@70['Appendable']) = LazyJavaClassDescriptor@3['Appendable']
-    topLevelClasses(JavaClassImpl@72['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
-    topLevelClasses(JavaClassImpl@76['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
-    topLevelClasses(JavaClassImpl@78['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@98['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@101['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
-    topLevelClasses(JavaClassImpl@178['System']) = LazyJavaClassDescriptor@38['System']
-}
-
-LazyJavaPackageFragment@125['java'] {
-    classes('lang': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    deserializedPackageScope = Empty@181 // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('lang': Name@182) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@180
-}
-
-LazyJavaPackageFragment@129['lang'] {
-    classes('Command': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('System': Name@186) = LazyJavaClassDescriptor@38['System'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals1': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals2': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('foo': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('invoke': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('minus': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('parse': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('plus': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@181 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('Command': Name@184) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals': Name@187) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals1': Name@188) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals2': Name@189) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('foo': Name@190) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('invoke': Name@191) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('minus': Name@192) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('parse': Name@193) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('plus': Name@194) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@204[2] { ResolutionCandidate@205, ResolutionCandidate@206 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@210[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@216[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[3] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[3] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[7] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[8] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[9] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-null {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@345[2] { ResolutionCandidate@284, ResolutionCandidate@285 }
-    <name not found> = ArrayList@346[2] { ResolutionCandidate@205, ResolutionCandidate@206 }
-    <name not found> = ArrayList@347[2] { ResolutionCandidate@211, ResolutionCandidate@212 }
-    <name not found> = ArrayList@348[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-    <name not found> = ArrayList@349[3] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300 }
-    <name not found> = ArrayList@350[3] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290 }
-    <name not found> = ArrayList@351[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
-    <name not found> = ArrayList@352[7] { ResolutionCandidate@303, ResolutionCandidate@304, ResolutionCandidate@305, ... }
-    <name not found> = ArrayList@353[8] { ResolutionCandidate@308, ResolutionCandidate@309, ResolutionCandidate@310, ... }
-    <name not found> = ArrayList@354[9] { ResolutionCandidate@313, ResolutionCandidate@314, ResolutionCandidate@315, ... }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
deleted file mode 100644
index 4983e103b8b..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
+++ /dev/null
@@ -1,140 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('buzz1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('buzz1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('buzz1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('buzz1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@49[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log b/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
deleted file mode 100644
index e76d5e3ad7d..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
+++ /dev/null
@@ -1,673 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = DelegatingFlexibleType@5
-}
-
-DescriptorResolver@6 {
-    <name not found> = JetTypeImpl@7['Boolean']
-    <name not found> = JetTypeImpl@7['Boolean']
-}
-
-DescriptorResolver@8 {
-    <name not found> = JetTypeImpl@9['Iterator<1>']
-    <name not found> = JetTypeImpl@10['MyIterator<1>']
-}
-
-LazyJavaClassDescriptor@11['Appendable'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
-}
-
-LazyJavaClassDescriptor@17['AutoCloseable'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@21['Closeable'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
-}
-
-LazyJavaClassDescriptor@25['Enumeration'] {
-    defaultType = JetTypeImpl@26['Enumeration<1>']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functionTypeForSamInterface = null
-    functions('hasMoreElements': Name@29) = ArrayList@30[1] { JavaMethodDescriptor@31['hasMoreElements'] } // through LazyJavaClassMemberScope@28
-    functions('nextElement': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['nextElement'] } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@28
-    nestedClasses('hasMoreElements': Name@29) = null // through LazyJavaClassMemberScope@28
-    nestedClasses('nextElement': Name@32) = null // through LazyJavaClassMemberScope@28
-    properties('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyJavaClassMemberScope@28
-    properties('nextElement': Name@32) = EmptyList@13[empty] // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['Enumeration']
-}
-
-LazyJavaClassDescriptor@39['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@40['Exception']
-}
-
-LazyJavaClassDescriptor@41['FilterOutputStream'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@42
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@42
-    typeConstructor = LazyJavaClassTypeConstructor@44['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@45['NoSuchElementException'] {
-    constructors = ArrayList@46[2] { JavaConstructorDescriptor@47['<init>'], JavaConstructorDescriptor@48['<init>'] } // through LazyJavaClassMemberScope@49
-    defaultType = JetTypeImpl@50['NoSuchElementException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@51['NoSuchElementException']
-}
-
-LazyJavaClassDescriptor@52['OutputStream'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
-}
-
-LazyJavaClassDescriptor@56['PrintStream'] {
-    defaultType = JetTypeImpl@57['PrintStream']
-    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
-    functions('println': Name@60) = ArrayList@61[10] { JavaMethodDescriptor@62['println'], JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], ... } // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@59
-    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@59
-    nestedClasses('println': Name@60) = null // through LazyJavaClassMemberScope@59
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
-}
-
-LazyJavaClassDescriptor@69['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@70['RuntimeException']
-}
-
-LazyJavaClassDescriptor@71['System'] {
-    enumEntryIndex = LinkedHashMap@72 // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@74 // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@75 // through LazyJavaStaticClassScope@76
-    nestedClassIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@73
-    nestedClasses('out': Name@78) = null // through LazyJavaClassMemberScope@73
-    properties('out': Name@78) = ArrayList@79[1] { JavaPropertyDescriptor@80['out'] } // through LazyJavaStaticClassScope@76
-    properties('out': Name@78) = EmptyList@13[empty] // through LazyJavaClassMemberScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@81['System']
-}
-
-LazyJavaClassTypeConstructor@16['Appendable'] {
-    parameters = ArrayList@82[empty]
-    supertypes = ArrayList@83[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['AutoCloseable'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['Closeable'] {
-    parameters = ArrayList@87[empty]
-    supertypes = ArrayList@88[1] { LazyJavaClassifierType@89['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@38['Enumeration'] {
-    parameters = ArrayList@90[1] { LazyJavaTypeParameterDescriptor@91['E'] }
-    supertypes = ArrayList@92[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassTypeConstructor@40['Exception'] {
-    parameters = ArrayList@93[empty]
-    supertypes = ArrayList@94[1] { LazyJavaClassifierType@95['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@44['FilterOutputStream'] {
-    parameters = ArrayList@96[empty]
-    supertypes = ArrayList@97[1] { LazyJavaClassifierType@98['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@51['NoSuchElementException'] {
-    parameters = ArrayList@99[empty]
-    supertypes = ArrayList@100[1] { LazyJavaClassifierType@101['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@55['OutputStream'] {
-    parameters = ArrayList@102[empty]
-    supertypes = ArrayList@103[1] { LazyJavaClassifierType@104['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@68['PrintStream'] {
-    parameters = ArrayList@105[empty]
-    supertypes = ArrayList@106[3] { LazyJavaClassifierType@107['FilterOutputStream'], LazyJavaClassifierType@108['Appendable'], LazyJavaClassifierType@109['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@70['RuntimeException'] {
-    parameters = ArrayList@110[empty]
-    supertypes = ArrayList@111[1] { LazyJavaClassifierType@112['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@81['System'] {
-    supertypes = ArrayList@113[1] { JetTypeImpl@84['Any'] }
-}
-
-LazyJavaClassifierType@108['Appendable'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['Appendable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
-}
-
-LazyJavaClassifierType@89['AutoCloseable'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@117['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
-}
-
-LazyJavaClassifierType@109['Closeable'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['Closeable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
-}
-
-LazyJavaClassifierType@104['Closeable'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['Closeable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
-}
-
-LazyJavaClassifierType@122['E'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'false': Boolean@125
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'true': Boolean@129
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@112['Exception'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@131['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@40['Exception']
-}
-
-LazyJavaClassifierType@107['FilterOutputStream'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@133['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@42
-    typeConstructor = LazyJavaClassTypeConstructor@44['FilterOutputStream']
-}
-
-LazyJavaClassifierType@134['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@135
-}
-
-LazyJavaClassifierType@136['Object'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@138['Object']
-    nullable = 'false': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@140['Object'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@138['Object']
-    nullable = 'true': Boolean@129
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@142['Object'] {
-    classifier = JavaClassImpl@143['Object']
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@144['Object'] {
-    classifier = JavaClassImpl@145['Object']
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@146['Object'] {
-    classifier = JavaClassImpl@147['Object']
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@148['Object'] {
-    classifier = JavaClassImpl@149['Object']
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@150['Object'] {
-    classifier = JavaClassImpl@151['Object']
-    typeConstructor = DeserializedClassTypeConstructor@139
-}
-
-LazyJavaClassifierType@98['OutputStream'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@153['OutputStream']
-    memberScope = LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
-}
-
-LazyJavaClassifierType@154['PrintStream'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@156['PrintStream']
-    memberScope = LazyJavaClassMemberScope@59
-    nullable = 'false': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
-}
-
-LazyJavaClassifierType@157['PrintStream'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@156['PrintStream']
-    nullable = 'true': Boolean@129
-    typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
-}
-
-LazyJavaClassifierType@101['RuntimeException'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaClassImpl@160['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@70['RuntimeException']
-}
-
-LazyJavaClassifierType@161['String'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@163['String']
-    nullable = 'false': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@165['String'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@167['String']
-    nullable = 'false': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@168['String'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaClassImpl@163['String']
-    nullable = 'true': Boolean@129
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@170['String'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaClassImpl@167['String']
-    nullable = 'true': Boolean@129
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@95['Throwable'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaClassImpl@173['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@174
-}
-
-LazyJavaPackageFragmentProvider@175 {
-    packageFragments('<root>': FqName@176) = LazyJavaPackageFragment@177['<root>']
-    packageFragments('Any': FqName@178) = null
-    packageFragments('Array': FqName@179) = null
-    packageFragments('Boolean': FqName@180) = null
-    packageFragments('Int': FqName@181) = null
-    packageFragments('Iterator': FqName@182) = null
-    packageFragments('MyIterator': FqName@183) = null
-    packageFragments('String': FqName@184) = null
-    packageFragments('System': FqName@185) = null
-    packageFragments('T': FqName@186) = null
-    packageFragments('java': FqName@187) = LazyJavaPackageFragment@188['java']
-    packageFragments('java.io': FqName@189) = LazyJavaPackageFragment@190['io']
-    packageFragments('java.lang': FqName@191) = LazyJavaPackageFragment@192['lang']
-    packageFragments('java.lang.Any': FqName@193) = null
-    packageFragments('java.lang.Array': FqName@194) = null
-    packageFragments('java.lang.Boolean': FqName@195) = null
-    packageFragments('java.lang.Int': FqName@196) = null
-    packageFragments('java.lang.Iterator': FqName@197) = null
-    packageFragments('java.lang.MyIterator': FqName@198) = null
-    packageFragments('java.lang.String': FqName@199) = null
-    packageFragments('java.lang.System': FqName@200) = null
-    packageFragments('java.lang.T': FqName@201) = null
-    packageFragments('java.util': FqName@202) = LazyJavaPackageFragment@203['util']
-    packageFragments('java.util.Enumeration': FqName@204) = null
-    packageFragments('kotlin': FqName@205) = null
-    packageFragments('kotlin.Any': FqName@206) = null
-    packageFragments('kotlin.Array': FqName@207) = null
-    packageFragments('kotlin.Boolean': FqName@208) = null
-    packageFragments('kotlin.Int': FqName@209) = null
-    packageFragments('kotlin.Iterator': FqName@210) = null
-    packageFragments('kotlin.MyIterator': FqName@211) = null
-    packageFragments('kotlin.String': FqName@212) = null
-    packageFragments('kotlin.System': FqName@213) = null
-    packageFragments('kotlin.T': FqName@214) = null
-    packageFragments('kotlin.io': FqName@215) = null
-    packageFragments('kotlin.jvm': FqName@216) = null
-    topLevelClasses(JavaClassImpl@115['Appendable']) = LazyJavaClassDescriptor@11['Appendable']
-    topLevelClasses(JavaClassImpl@117['AutoCloseable']) = LazyJavaClassDescriptor@17['AutoCloseable']
-    topLevelClasses(JavaClassImpl@119['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
-    topLevelClasses(JavaClassImpl@217['Enumeration']) = LazyJavaClassDescriptor@25['Enumeration']
-    topLevelClasses(JavaClassImpl@131['Exception']) = LazyJavaClassDescriptor@39['Exception']
-    topLevelClasses(JavaClassImpl@133['FilterOutputStream']) = LazyJavaClassDescriptor@41['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@218['NoSuchElementException']) = LazyJavaClassDescriptor@45['NoSuchElementException']
-    topLevelClasses(JavaClassImpl@153['OutputStream']) = LazyJavaClassDescriptor@52['OutputStream']
-    topLevelClasses(JavaClassImpl@156['PrintStream']) = LazyJavaClassDescriptor@56['PrintStream']
-    topLevelClasses(JavaClassImpl@160['RuntimeException']) = LazyJavaClassDescriptor@69['RuntimeException']
-    topLevelClasses(JavaClassImpl@219['System']) = LazyJavaClassDescriptor@71['System']
-}
-
-LazyJavaPackageFragment@177['<root>'] {
-    classes('Any': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Array': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Boolean': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Enumeration': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Int': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Iterator': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('equals': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('hasMoreElements': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('iterator': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('java': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('nextElement': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('equals': Name@229) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('iterator': Name@231) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('java': Name@234) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('nextElement': Name@32) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    memberIndex = computeMemberIndex$1@235 // through LazyPackageFragmentScopeForJavaPackage@221
-}
-
-LazyJavaPackageFragment@188['java'] {
-    classes('lang': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('util': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('lang': Name@239) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('util': Name@240) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    memberIndex = computeMemberIndex$1@241 // through LazyPackageFragmentScopeForJavaPackage@237
-}
-
-LazyJavaPackageFragment@192['lang'] {
-    classes('System': Name@228) = LazyJavaClassDescriptor@71['System'] // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('equals': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('hasMoreElements': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('iterator': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('java': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('nextElement': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('equals': Name@229) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('iterator': Name@231) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('nextElement': Name@32) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@242
-}
-
-LazyJavaPackageFragment@203['util'] {
-    classes('Enumeration': Name@245) = LazyJavaClassDescriptor@25['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('NoSuchElementException': Name@247) = LazyJavaClassDescriptor@45['NoSuchElementException'] // through LazyPackageFragmentScopeForJavaPackage@246
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('Enumeration': Name@248) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('NoSuchElementException': Name@247) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    memberIndex = computeMemberIndex$1@249 // through LazyPackageFragmentScopeForJavaPackage@246
-}
-
-LazyJavaTypeParameterDescriptor@91['E'] {
-    defaultType = JetTypeImpl@250['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@251[1] { NullableType@252 }
-    upperBoundsAsType = NullableType@252
-}
-
-LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@91['E']
-}
-
-LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@124['E']) = null
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[2] { ResolutionCandidate@301, ResolutionCandidate@302 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[2] { ResolutionCandidate@305, ResolutionCandidate@306 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-null {
-    <name not found> = ArrayList@310[10] { ResolutionCandidate@258, ResolutionCandidate@259, ResolutionCandidate@260, ... }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@324[2] { ResolutionCandidate@305, ResolutionCandidate@306 }
-    <name not found> = ArrayList@325[2] { ResolutionCandidate@301, ResolutionCandidate@302 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
deleted file mode 100644
index e6cbd0ad4e3..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
+++ /dev/null
@@ -1,220 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = DelegatingFlexibleType@3
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['Iterator<1>']
-}
-
-LazyJavaClassDescriptor@6['Enumeration'] {
-    defaultType = JetTypeImpl@7['Enumeration<1>']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@9
-    functionTypeForSamInterface = null
-    functions('hasMoreElements': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['hasMoreElements'] } // through LazyJavaClassMemberScope@9
-    functions('iterator': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    functions('nextElement': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['nextElement'] } // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@9
-    nestedClasses('hasMoreElements': Name@10) = null // through LazyJavaClassMemberScope@9
-    nestedClasses('iterator': Name@13) = null // through LazyJavaClassMemberScope@9
-    nestedClasses('nextElement': Name@15) = null // through LazyJavaClassMemberScope@9
-    properties('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    properties('iterator': Name@13) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    properties('nextElement': Name@15) = EmptyList@14[empty] // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@20['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@21['Enumeration']
-}
-
-LazyJavaClassTypeConstructor@21['Enumeration'] {
-    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@26['E'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaTypeParameterImpl@28['E']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-}
-
-LazyJavaClassifierType@31['E'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaTypeParameterImpl@28['E']
-    nullable = 'true': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-}
-
-LazyJavaClassifierType@34['Object'] {
-    classifier = JavaClassImpl@35['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('Boolean': FqName@40) = null
-    packageFragments('Int': FqName@41) = null
-    packageFragments('Iterator': FqName@42) = null
-    packageFragments('T': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.Boolean': FqName@48) = null
-    packageFragments('java.lang.Int': FqName@49) = null
-    packageFragments('java.lang.Iterator': FqName@50) = null
-    packageFragments('java.lang.T': FqName@51) = null
-    packageFragments('java.util': FqName@52) = LazyJavaPackageFragment@53['util']
-    packageFragments('java.util.Enumeration': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = null
-    packageFragments('kotlin.Boolean': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.Iterator': FqName@58) = null
-    packageFragments('kotlin.T': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    topLevelClasses(JavaClassImpl@62['Enumeration']) = LazyJavaClassDescriptor@6['Enumeration']
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('Boolean': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Enumeration': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Iterator': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('hasMoreElements': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('iterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('java': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('nextElement': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('iterator': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('java': Name@70) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('nextElement': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('util': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@75) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('util': Name@76) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    classes('hasMoreElements': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('iterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('java': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('nextElement': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('iterator': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('nextElement': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@53['util'] {
-    classes('Enumeration': Name@81) = LazyJavaClassDescriptor@6['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Enumeration': Name@83) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaTypeParameterDescriptor@23['E'] {
-    defaultType = JetTypeImpl@85['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-    upperBounds = LinkedHashSet@86[1] { NullableType@87 }
-    upperBoundsAsType = NullableType@87
-}
-
-LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@89['E']) = LazyJavaTypeParameterDescriptor@23['E']
-}
-
-LazyJavaTypeParameterResolver@90 {
-    resolve(JavaTypeParameterImpl@28['E']) = null
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log b/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
deleted file mode 100644
index ed8f82ac30b..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
+++ /dev/null
@@ -1,277 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f4': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f5': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f1': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f2': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f3': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f4': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f5': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f4': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f5': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f1': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f2': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f3': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f4': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f5': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
deleted file mode 100644
index fc7c8cf28d9..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
+++ /dev/null
@@ -1,226 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('D': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('JPAEntityClass': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.D': FqName@15) = null
-    packageFragments('java.lang.Foo': FqName@16) = null
-    packageFragments('java.lang.JPAEntityClass': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('java.lang.Unit': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Array': FqName@22) = null
-    packageFragments('kotlin.D': FqName@23) = null
-    packageFragments('kotlin.Foo': FqName@24) = null
-    packageFragments('kotlin.JPAEntityClass': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.T': FqName@27) = null
-    packageFragments('kotlin.Unit': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Unit': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('findByName': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('with': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('findByName': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('with': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('findByName': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('with': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('findByName': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('with': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
deleted file mode 100644
index bd0bf83cb58..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
+++ /dev/null
@@ -1,291 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.Unit': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1875': FqName@21) = null
-    packageFragments('kt1875.Int': FqName@22) = null
-    packageFragments('kt1875.T': FqName@23) = null
-    packageFragments('kt1875.Unit': FqName@24) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('b': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
deleted file mode 100644
index 47f6a2adccb..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
+++ /dev/null
@@ -1,91 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = NullableType@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.Long': FqName@16) = null
-    packageFragments('java.lang.Unit': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.Long': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kt2317': FqName@25) = null
-    packageFragments('kt2317.Any': FqName@26) = null
-    packageFragments('kt2317.Int': FqName@27) = null
-    packageFragments('kt2317.Long': FqName@28) = null
-    packageFragments('kt2317.Unit': FqName@29) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('baz': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('bar': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('baz': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
deleted file mode 100644
index 03fa57e8456..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.String']
-    <name not found> = DeserializedType@1['kotlin.String']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('toString': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('toString': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('toString': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('toString': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
deleted file mode 100644
index 3564357a649..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
+++ /dev/null
@@ -1,179 +0,0 @@
-LazyJavaClassDescriptor@0['File'] {
-    defaultType = JetTypeImpl@1['File']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('getName': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['getName'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('getName': Name@4) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('name': Name@9) = null // through LazyJavaClassMemberScope@3
-    properties('name': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['File']
-}
-
-LazyJavaClassDescriptor@13['Serializable'] {
-    functions('getName': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('name': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaClassTypeConstructor@12['File'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[2] { LazyJavaClassifierType@20['Serializable'], LazyJavaClassifierType@21['Comparable<File>'] }
-}
-
-LazyJavaClassTypeConstructor@17['Serializable'] {
-    parameters = ArrayList@22[empty]
-    supertypes = ArrayList@23[1] { JetTypeImpl@24['Any'] }
-}
-
-LazyJavaClassifierType@21['Comparable<File>'] {
-    arguments = ArrayList@25[1] { TypeProjectionImpl@26 }
-    classifier = JavaClassImpl@27['Comparable']
-    memberScope = SubstitutingScope@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['File'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['File']
-    nullable = 'false': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@12['File']
-}
-
-LazyJavaClassifierType@34['File'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@32['File']
-    nullable = 'true': Boolean@36
-    typeConstructor = LazyJavaClassTypeConstructor@12['File']
-}
-
-LazyJavaClassifierType@37['Object'] {
-    classifier = JavaClassImpl@38['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@20['Serializable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@43['Serializable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaClassifierType@44['String'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['String']
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@47
-}
-
-LazyJavaClassifierType@48['String'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@46['String']
-    nullable = 'true': Boolean@36
-    typeConstructor = DeserializedClassTypeConstructor@47
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Customer': FqName@53) = null
-    packageFragments('File': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('bar': FqName@56) = null
-    packageFragments('bar.Customer': FqName@57) = null
-    packageFragments('bar.File': FqName@58) = null
-    packageFragments('bar.String': FqName@59) = null
-    packageFragments('bar.name': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    packageFragments('java.io.File': FqName@65) = null
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.Customer': FqName@68) = null
-    packageFragments('java.lang.File': FqName@69) = null
-    packageFragments('java.lang.String': FqName@70) = null
-    packageFragments('kotlin': FqName@71) = null
-    packageFragments('kotlin.Customer': FqName@72) = null
-    packageFragments('kotlin.File': FqName@73) = null
-    packageFragments('kotlin.String': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    topLevelClasses(JavaClassImpl@77['File']) = LazyJavaClassDescriptor@0['File']
-    topLevelClasses(JavaClassImpl@43['Serializable']) = LazyJavaClassDescriptor@13['Serializable']
-}
-
-LazyJavaPackageFragment@64['io'] {
-    classes('File': Name@78) = LazyJavaClassDescriptor@0['File'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('File': Name@81) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('io': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('io': Name@86) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@87) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@67['lang'] {
-    classes('getName': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('getName': Name@4) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
deleted file mode 100644
index 8afa66f0d65..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
+++ /dev/null
@@ -1,417 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@10
-    properties('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@14['BufferedInputStream'] {
-    constructors = ArrayList@15[2] { JavaConstructorDescriptor@16['<init>'], JavaConstructorDescriptor@17['<init>'] } // through LazyJavaClassMemberScope@18
-    defaultType = JetTypeImpl@19['BufferedInputStream']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@20['BufferedInputStream']
-}
-
-LazyJavaClassDescriptor@21['BufferedReader'] {
-    constructors = ArrayList@22[2] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'] } // through LazyJavaClassMemberScope@25
-    defaultType = JetTypeImpl@26['BufferedReader']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@27['BufferedReader']
-}
-
-LazyJavaClassDescriptor@28['Closeable'] {
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@29
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@29
-    properties('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@29
-    properties('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@29
-    typeConstructor = LazyJavaClassTypeConstructor@31['Closeable']
-}
-
-LazyJavaClassDescriptor@32['InputStream'] {
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@34
-    functionTypeForSamInterface = null
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@34
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@34
-    nestedClasses('BufferedInputStream': Name@8) = null // through LazyJavaClassMemberScope@34
-    properties('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
-}
-
-LazyJavaClassDescriptor@38['Readable'] {
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    properties('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['Readable']
-}
-
-LazyJavaClassDescriptor@42['Reader'] {
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@44
-    functionTypeForSamInterface = null
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@44
-    nestedClasses('BufferedReader': Name@11) = null // through LazyJavaClassMemberScope@44
-    properties('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['BufferedInputStream'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@27['BufferedReader'] {
-    parameters = ArrayList@53[empty]
-    supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['Reader'] }
-}
-
-LazyJavaClassTypeConstructor@31['Closeable'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@37['InputStream'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@41['Readable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@47['Reader'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[2] { LazyJavaClassifierType@66['Readable'], LazyJavaClassifierType@67['Closeable'] }
-}
-
-LazyJavaClassifierType@58['AutoCloseable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassifierType@67['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@29
-    typeConstructor = LazyJavaClassTypeConstructor@31['Closeable']
-}
-
-LazyJavaClassifierType@61['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@29
-    typeConstructor = LazyJavaClassTypeConstructor@31['Closeable']
-}
-
-LazyJavaClassifierType@74['FilterInputStream'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@75
-}
-
-LazyJavaClassifierType@76['InputStream'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['InputStream']
-    nullable = 'false': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
-}
-
-LazyJavaClassifierType@80['InputStream'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['InputStream']
-    nullable = 'false': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
-}
-
-LazyJavaClassifierType@83['InputStream'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@78['InputStream']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
-}
-
-LazyJavaClassifierType@86['InputStream'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@82['InputStream']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@37['InputStream']
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@91['Object'] {
-    classifier = JavaClassImpl@92['Object']
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@93['Object'] {
-    classifier = JavaClassImpl@94['Object']
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@95['Object'] {
-    classifier = JavaClassImpl@96['Object']
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@66['Readable'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['Readable']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['Readable']
-}
-
-LazyJavaClassifierType@99['Reader'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['Reader']
-    nullable = 'false': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaClassifierType@102['Reader'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['Reader']
-    nullable = 'false': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaClassifierType@105['Reader'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@101['Reader']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaClassifierType@107['Reader'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@104['Reader']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaClassifierType@55['Reader'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['Reader']
-    typeConstructor = LazyJavaClassTypeConstructor@47['Reader']
-}
-
-LazyJavaPackageFragmentProvider@111 {
-    packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
-    packageFragments('A': FqName@114) = null
-    packageFragments('B': FqName@115) = null
-    packageFragments('BufferedInputStream': FqName@116) = null
-    packageFragments('BufferedReader': FqName@117) = null
-    packageFragments('InputStream': FqName@118) = null
-    packageFragments('Int': FqName@119) = null
-    packageFragments('Reader': FqName@120) = null
-    packageFragments('String': FqName@121) = null
-    packageFragments('buffered': FqName@122) = null
-    packageFragments('inline': FqName@123) = null
-    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
-    packageFragments('java.io': FqName@126) = LazyJavaPackageFragment@127['io']
-    packageFragments('java.io.A': FqName@128) = null
-    packageFragments('java.io.BufferedInputStream': FqName@129) = null
-    packageFragments('java.io.BufferedReader': FqName@130) = null
-    packageFragments('java.io.InputStream': FqName@131) = null
-    packageFragments('java.io.Int': FqName@132) = null
-    packageFragments('java.io.Reader': FqName@133) = null
-    packageFragments('java.io.String': FqName@134) = null
-    packageFragments('java.io.inline': FqName@135) = null
-    packageFragments('java.lang': FqName@136) = LazyJavaPackageFragment@137['lang']
-    packageFragments('java.lang.A': FqName@138) = null
-    packageFragments('java.lang.BufferedInputStream': FqName@139) = null
-    packageFragments('java.lang.BufferedReader': FqName@140) = null
-    packageFragments('java.lang.InputStream': FqName@141) = null
-    packageFragments('java.lang.Int': FqName@142) = null
-    packageFragments('java.lang.Reader': FqName@143) = null
-    packageFragments('java.lang.String': FqName@144) = null
-    packageFragments('java.lang.inline': FqName@145) = null
-    packageFragments('kotlin': FqName@146) = null
-    packageFragments('kotlin.A': FqName@147) = null
-    packageFragments('kotlin.BufferedInputStream': FqName@148) = null
-    packageFragments('kotlin.BufferedReader': FqName@149) = null
-    packageFragments('kotlin.InputStream': FqName@150) = null
-    packageFragments('kotlin.Int': FqName@151) = null
-    packageFragments('kotlin.Reader': FqName@152) = null
-    packageFragments('kotlin.String': FqName@153) = null
-    packageFragments('kotlin.inline': FqName@154) = null
-    packageFragments('kotlin.io': FqName@155) = null
-    packageFragments('kotlin.jvm': FqName@156) = null
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@157['BufferedInputStream']) = LazyJavaClassDescriptor@14['BufferedInputStream']
-    topLevelClasses(JavaClassImpl@158['BufferedReader']) = LazyJavaClassDescriptor@21['BufferedReader']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@28['Closeable']
-    topLevelClasses(JavaClassImpl@159['InputStream']) = LazyJavaClassDescriptor@32['InputStream']
-    topLevelClasses(JavaClassImpl@98['Readable']) = LazyJavaClassDescriptor@38['Readable']
-    topLevelClasses(JavaClassImpl@160['Reader']) = LazyJavaClassDescriptor@42['Reader']
-}
-
-LazyJavaPackageFragment@113['<root>'] {
-    classes('BufferedInputStream': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('BufferedReader': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('InputStream': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('Reader': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('String': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('inline': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('java': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('java': Name@171) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@127['io'] {
-    classes('BufferedInputStream': Name@161) = LazyJavaClassDescriptor@14['BufferedInputStream'] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('BufferedReader': Name@163) = LazyJavaClassDescriptor@21['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('InputStream': Name@164) = LazyJavaClassDescriptor@32['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('Reader': Name@166) = LazyJavaClassDescriptor@42['Reader'] // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('String': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('inline': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@173
-}
-
-LazyJavaPackageFragment@125['java'] {
-    classes('io': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('lang': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('io': Name@178) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('lang': Name@179) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    memberIndex = computeMemberIndex$1@180 // through LazyPackageFragmentScopeForJavaPackage@176
-}
-
-LazyJavaPackageFragment@137['lang'] {
-    classes('BufferedInputStream': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('BufferedReader': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    memberIndex = computeMemberIndex$1@182 // through LazyPackageFragmentScopeForJavaPackage@181
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[2] { ResolutionCandidate@206, ResolutionCandidate@207 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[2] { ResolutionCandidate@210, ResolutionCandidate@211 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[2] { ResolutionCandidate@218, ResolutionCandidate@219 }
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@227[2] { ResolutionCandidate@210, ResolutionCandidate@211 }
-    <name not found> = ArrayList@228[2] { ResolutionCandidate@206, ResolutionCandidate@207 }
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@218, ResolutionCandidate@219 }
-    <name not found> = ArrayList@230[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
deleted file mode 100644
index 15b2080e3f7..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
+++ /dev/null
@@ -1,199 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaClassDescriptor@4['A'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functions('bar': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@6
-    functions('bar': Name@7) = EmptyList@8[empty] // through LazyJavaStaticClassScope@9
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@9
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@6
-    nestedClasses('Nested': Name@13) = LazyJavaClassDescriptor@14['Nested'] // through LazyJavaClassMemberScope@6
-    nestedClasses('bar': Name@7) = null // through LazyJavaClassMemberScope@6
-    properties('Nested': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@6
-    properties('Nested': Name@13) = EmptyList@8[empty] // through LazyJavaStaticClassScope@9
-    properties('bar': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@6
-    properties('bar': Name@7) = EmptyList@8[empty] // through LazyJavaStaticClassScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@15['A']
-}
-
-LazyJavaClassDescriptor@14['Nested'] {
-    enumEntryIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@17
-    functions('bar': Name@18) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    functions('bar': Name@18) = EmptyList@8[empty] // through LazyJavaStaticClassScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaStaticClassScope@19
-    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@17
-    nestedClasses('bar': Name@18) = null // through LazyJavaClassMemberScope@17
-    properties('bar': Name@18) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    properties('bar': Name@18) = EmptyList@8[empty] // through LazyJavaStaticClassScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@23['Nested']
-}
-
-LazyJavaClassTypeConstructor@15['A'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Nested'] {
-    supertypes = ArrayList@26[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@27['Object'] {
-    classifier = JavaClassImpl@28['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['Object'] {
-    classifier = JavaClassImpl@31['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaPackageFragmentProvider@32 {
-    packageFragments('<root>': FqName@33) = LazyJavaPackageFragment@34['<root>']
-    packageFragments('A': FqName@35) = null
-    packageFragments('Any': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.A': FqName@41) = null
-    packageFragments('java.lang.Any': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.A': FqName@44) = null
-    packageFragments('kotlin.Any': FqName@45) = null
-    packageFragments('kotlin.io': FqName@46) = null
-    packageFragments('kotlin.jvm': FqName@47) = null
-    topLevelClasses(JavaClassImpl@48['A']) = LazyJavaClassDescriptor@4['A']
-}
-
-LazyJavaPackageFragment@34['<root>'] {
-    classes('A': Name@49) = LazyJavaClassDescriptor@4['A'] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@40['lang'] {
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/object.lazy.log b/compiler/testData/diagnostics/tests/extensions/object.lazy.log
deleted file mode 100644
index 415b20d0275..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/object.lazy.log
+++ /dev/null
@@ -1,98 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('O': FqName@8) = null
-    packageFragments('bar': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.O': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.O': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('x': FqName@23) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
deleted file mode 100644
index 4a236081435..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
+++ /dev/null
@@ -1,477 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Collection': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('bar': FqName@11) = null
-    packageFragments('bar.A': FqName@12) = null
-    packageFragments('bar.Any': FqName@13) = null
-    packageFragments('bar.Collection': FqName@14) = null
-    packageFragments('bar.Int': FqName@15) = null
-    packageFragments('bar.List': FqName@16) = null
-    packageFragments('bar.R': FqName@17) = null
-    packageFragments('bar.String': FqName@18) = null
-    packageFragments('bar.T': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.A': FqName@24) = null
-    packageFragments('java.lang.Any': FqName@25) = null
-    packageFragments('java.lang.Collection': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.List': FqName@28) = null
-    packageFragments('java.lang.R': FqName@29) = null
-    packageFragments('java.lang.String': FqName@30) = null
-    packageFragments('java.lang.T': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.A': FqName@33) = null
-    packageFragments('kotlin.Any': FqName@34) = null
-    packageFragments('kotlin.Collection': FqName@35) = null
-    packageFragments('kotlin.Int': FqName@36) = null
-    packageFragments('kotlin.List': FqName@37) = null
-    packageFragments('kotlin.R': FqName@38) = null
-    packageFragments('kotlin.String': FqName@39) = null
-    packageFragments('kotlin.T': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('b': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('c': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('foo': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('sure': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('a': Name@49) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('b': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('c': Name@52) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('foo': Name@53) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('sure': Name@54) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
deleted file mode 100644
index 846c9705252..00000000000
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
+++ /dev/null
@@ -1,224 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('A': FqName@54) = null
-    packageFragments('Comparable': FqName@55) = null
-    packageFragments('Range': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('a': FqName@58) = null
-    packageFragments('a.A': FqName@59) = null
-    packageFragments('a.Comparable': FqName@60) = null
-    packageFragments('a.Range': FqName@61) = null
-    packageFragments('a.T': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.A': FqName@67) = null
-    packageFragments('java.lang.Comparable': FqName@68) = null
-    packageFragments('java.lang.Range': FqName@69) = null
-    packageFragments('java.lang.T': FqName@70) = null
-    packageFragments('kotlin': FqName@71) = null
-    packageFragments('kotlin.A': FqName@72) = null
-    packageFragments('kotlin.Comparable': FqName@73) = null
-    packageFragments('kotlin.Range': FqName@74) = null
-    packageFragments('kotlin.T': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@78['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@64['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@66['lang'] {
-    classes('UnsupportedOperationException': Name@85) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('rangeTo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('UnsupportedOperationException': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('rangeTo': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
deleted file mode 100644
index c8699b3bc16..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
+++ /dev/null
@@ -1,209 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Function0<1>']
-    <name not found> = JetTypeImpl@3['Function0<1>']
-    <name not found> = JetTypeImpl@4['StringBuilder']
-}
-
-LazyJavaClassDescriptor@5['StringBuilder'] {
-    constructors = ArrayList@6[4] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@4['StringBuilder']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@11['StringBuilder'] {
-    parameters = ArrayList@12[empty]
-}
-
-LazyJavaClassifierType@13['CharSequence'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['CharSequence']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['CharSequence'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@15['CharSequence']
-    nullable = 'true': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('Byte': FqName@30) = null
-    packageFragments('Foo': FqName@31) = null
-    packageFragments('Foo1': FqName@32) = null
-    packageFragments('Int': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.Byte': FqName@38) = null
-    packageFragments('java.lang.Int': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.Byte': FqName@41) = null
-    packageFragments('kotlin.Int': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    topLevelClasses(JavaClassImpl@45['StringBuilder']) = LazyJavaClassDescriptor@5['StringBuilder']
-}
-
-LazyJavaPackageFragment@29['<root>'] {
-    classes('Byte': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Int': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('StringBuilder': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('println': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('StringBuilder': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('println': Name@50) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('StringBuilder': Name@49) = LazyJavaClassDescriptor@5['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('println': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('StringBuilder': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('println': Name@50) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-null {
-    <name not found> = ArrayList@80[3] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = ArrayList@81[3] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69 }
-    <name not found> = ArrayList@82[4] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = ArrayList@83[4] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
deleted file mode 100644
index 8a43323cd03..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Sub': FqName@5) = null
-    packageFragments('Super': FqName@6) = null
-    packageFragments('Trait': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.Sub': FqName@9) = null
-    packageFragments('a.Super': FqName@10) = null
-    packageFragments('a.Trait': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Sub': FqName@16) = null
-    packageFragments('java.lang.Super': FqName@17) = null
-    packageFragments('java.lang.Trait': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Sub': FqName@20) = null
-    packageFragments('kotlin.Super': FqName@21) = null
-    packageFragments('kotlin.Trait': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
deleted file mode 100644
index 9561e6989b3..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
+++ /dev/null
@@ -1,293 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-    <name not found> = JetTypeImpl@2['Function1<2>']
-    <name not found> = JetTypeImpl@3['Function2<3>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.Int': FqName@10) = null
-    packageFragments('a.String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('foo0': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo0': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo1': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo2': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
deleted file mode 100644
index 6934b83f5f1..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('h': FqName@7) = null
-    packageFragments('h.A': FqName@8) = null
-    packageFragments('h.B': FqName@9) = null
-    packageFragments('h.C': FqName@10) = null
-    packageFragments('h.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.C': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.B': FqName@22) = null
-    packageFragments('kotlin.C': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('f': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
deleted file mode 100644
index 246be8f86fa..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
+++ /dev/null
@@ -1,89 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('baz': FqName@5) = null
-    packageFragments('baz.Int': FqName@6) = null
-    packageFragments('baz.Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.Unit': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@34, ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
deleted file mode 100644
index 03f335dfefe..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('_': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('java.lang.Unit': FqName@15) = null
-    packageFragments('java.lang._': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.Unit': FqName@20) = null
-    packageFragments('kotlin._': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('tests': FqName@24) = null
-    packageFragments('tests._checkType': FqName@25) = null
-    packageFragments('tests._checkType.Int': FqName@26) = null
-    packageFragments('tests._checkType.T': FqName@27) = null
-    packageFragments('tests._checkType.Unit': FqName@28) = null
-    packageFragments('tests._checkType._': FqName@29) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('_': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('checkType': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tests': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('checkType': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('tests': Name@37) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('checkType': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('checkType': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
deleted file mode 100644
index 37a23f221c7..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralInIf.lazy.log
+++ /dev/null
@@ -1,388 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractSet'] {
-    defaultType = JetTypeImpl@10['AbstractSet<1>']
-    functions('add': Name@2) = ArrayList@11[1] { DeserializedSimpleFunctionDescriptor@12['add'] } // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
-}
-
-LazyJavaClassDescriptor@16['HashSet'] {
-    constructors = ArrayList@17[5] { JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], JavaConstructorDescriptor@20['<init>'], ... } // through LazyJavaClassMemberScope@21
-    defaultType = JetTypeImpl@22['HashSet<1>']
-    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@21
-    functionTypeForSamInterface = null
-    functions('add': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@21
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@21
-    nestedClasses('add': Name@24) = null // through LazyJavaClassMemberScope@21
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['HashSet']
-}
-
-LazyJavaClassDescriptor@31['Serializable'] {
-    functions('add': Name@2) = EmptyList@32[empty] // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@35['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
-    supertypes = ArrayList@38[1] { LazyJavaClassifierType@39['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@15['AbstractSet'] {
-    parameters = ArrayList@40[1] { LazyJavaTypeParameterDescriptor@41['E'] }
-    supertypes = ArrayList@42[2] { LazyJavaClassifierType@43['AbstractCollection<E>'], LazyJavaClassifierType@44['Set<E>'] }
-}
-
-LazyJavaClassTypeConstructor@30['HashSet'] {
-    parameters = ArrayList@45[1] { LazyJavaTypeParameterDescriptor@46['E'] }
-    supertypes = ArrayList@47[4] { LazyJavaClassifierType@48['AbstractSet<E>'], LazyJavaClassifierType@49['Set<E>'], LazyJavaClassifierType@50['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@35['Serializable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassifierType@43['AbstractCollection<E>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@56['AbstractCollection']
-    memberScope = SubstitutingScope@57
-    nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@48['AbstractSet<E>'] {
-    arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
-    classifier = JavaClassImpl@61['AbstractSet']
-    memberScope = SubstitutingScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractSet']
-}
-
-LazyJavaClassifierType@50['Cloneable'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@64['Cloneable']
-    memberScope = DeserializedClassMemberScope@65
-    typeConstructor = DeserializedClassTypeConstructor@66
-}
-
-LazyJavaClassifierType@67['Collection<? extends E>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['Collection']
-    memberScope = SubstitutingScope@71
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@73['Collection<? extends E>'] {
-    arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
-    classifier = JavaClassImpl@70['Collection']
-    memberScope = SubstitutingScope@76
-    nullable = 'true': Boolean@77
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@39['Collection<E>'] {
-    arguments = ArrayList@79[1] { TypeProjectionImpl@80 }
-    classifier = JavaClassImpl@81['Collection']
-    memberScope = SubstitutingScope@82
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@97['E'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@106['E'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@108['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@89['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@112['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@93['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@125['E'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@129['E'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@108['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaClassifierType@131['Object'] {
-    classifier = JavaClassImpl@132['Object']
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@134['Object'] {
-    classifier = JavaClassImpl@135['Object']
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@136['Serializable'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@138['Serializable']
-    memberScope = LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@35['Serializable']
-}
-
-LazyJavaClassifierType@44['Set<E>'] {
-    arguments = ArrayList@139[1] { TypeProjectionImpl@140 }
-    classifier = JavaClassImpl@141['Set']
-    memberScope = SubstitutingScope@142
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaClassifierType@49['Set<E>'] {
-    arguments = ArrayList@144[1] { TypeProjectionImpl@145 }
-    classifier = JavaClassImpl@146['Set']
-    memberScope = SubstitutingScope@147
-    typeConstructor = DeserializedClassTypeConstructor@143
-}
-
-LazyJavaPackageFragmentProvider@148 {
-    packageFragments('<root>': FqName@149) = LazyJavaPackageFragment@150['<root>']
-    packageFragments('Int': FqName@151) = null
-    packageFragments('Unit': FqName@152) = null
-    packageFragments('java': FqName@153) = LazyJavaPackageFragment@154['java']
-    packageFragments('java.io': FqName@155) = LazyJavaPackageFragment@156['io']
-    packageFragments('java.lang': FqName@157) = LazyJavaPackageFragment@158['lang']
-    packageFragments('java.lang.Int': FqName@159) = null
-    packageFragments('java.lang.Unit': FqName@160) = null
-    packageFragments('java.util': FqName@161) = LazyJavaPackageFragment@162['util']
-    packageFragments('java.util.HashSet': FqName@163) = null
-    packageFragments('kotlin': FqName@164) = null
-    packageFragments('kotlin.Int': FqName@165) = null
-    packageFragments('kotlin.Unit': FqName@166) = null
-    packageFragments('kotlin.io': FqName@167) = null
-    packageFragments('kotlin.jvm': FqName@168) = null
-    topLevelClasses(JavaClassImpl@56['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@61['AbstractSet']) = LazyJavaClassDescriptor@9['AbstractSet']
-    topLevelClasses(JavaClassImpl@169['HashSet']) = LazyJavaClassDescriptor@16['HashSet']
-    topLevelClasses(JavaClassImpl@138['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-}
-
-LazyJavaPackageFragment@150['<root>'] {
-    classes('HashSet': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('Int': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('Unit': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('java': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('java': Name@177) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@171
-}
-
-LazyJavaPackageFragment@154['java'] {
-    classes('lang': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('util': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('lang': Name@182) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('util': Name@183) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@180
-}
-
-LazyJavaPackageFragment@158['lang'] {
-    classes('HashSet': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('HashSet': Name@176) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@186 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-LazyJavaPackageFragment@162['util'] {
-    classes('HashSet': Name@187) = LazyJavaClassDescriptor@16['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@188
-    deserializedPackageScope = Empty@175 // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('HashSet': Name@189) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    memberIndex = computeMemberIndex$1@190 // through LazyPackageFragmentScopeForJavaPackage@188
-}
-
-LazyJavaTypeParameterDescriptor@46['E'] {
-    defaultType = JetTypeImpl@191['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-    upperBounds = LinkedHashSet@192[1] { NullableType@193 }
-    upperBoundsAsType = NullableType@193
-}
-
-LazyJavaTypeParameterDescriptor@37['E'] {
-    defaultType = JetTypeImpl@194['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-    upperBounds = LinkedHashSet@195[1] { NullableType@196 }
-    upperBoundsAsType = NullableType@196
-}
-
-LazyJavaTypeParameterDescriptor@41['E'] {
-    defaultType = JetTypeImpl@197['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-}
-
-LazyJavaTypeParameterResolver@198 {
-    resolve(JavaTypeParameterImpl@199['E']) = LazyJavaTypeParameterDescriptor@37['E']
-}
-
-LazyJavaTypeParameterResolver@200 {
-    resolve(JavaTypeParameterImpl@201['E']) = LazyJavaTypeParameterDescriptor@41['E']
-}
-
-LazyJavaTypeParameterResolver@202 {
-    resolve(JavaTypeParameterImpl@203['E']) = LazyJavaTypeParameterDescriptor@46['E']
-}
-
-LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@93['E']) = null
-}
-
-LazyJavaTypeParameterResolver@205 {
-    resolve(JavaTypeParameterImpl@105['E']) = null
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@231[5] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
deleted file mode 100644
index b92aec831bc..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = JetTypeImpl@2['T']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('_': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('java.lang._': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.Unit': FqName@21) = null
-    packageFragments('kotlin._': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('tests': FqName@25) = null
-    packageFragments('tests._checkType': FqName@26) = null
-    packageFragments('tests._checkType.Int': FqName@27) = null
-    packageFragments('tests._checkType.T': FqName@28) = null
-    packageFragments('tests._checkType.Unit': FqName@29) = null
-    packageFragments('tests._checkType._': FqName@30) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('_': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('checkType': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('id': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tests': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('checkType': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('id': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('tests': Name@39) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('checkType': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('id': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('checkType': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('id': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
deleted file mode 100644
index 4264ad196fe..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
+++ /dev/null
@@ -1,149 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Array': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('bug': FqName@9) = null
-    packageFragments('bug.Array': FqName@10) = null
-    packageFragments('bug.String': FqName@11) = null
-    packageFragments('bug.T': FqName@12) = null
-    packageFragments('bug.Unit': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Array': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.T': FqName@20) = null
-    packageFragments('java.lang.Unit': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Array': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('f': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo1': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo2': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('println': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('run': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('bar': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo1': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo2': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('println': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('run': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
deleted file mode 100644
index 3d20f8f2f46..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
+++ /dev/null
@@ -1,167 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = NullableType@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('G': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Any': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Array': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('G': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('use': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('G': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('use': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('G': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('use': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('G': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('use': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-}
-
-null {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = ArrayList@115[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
deleted file mode 100644
index 136af10a7bc..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
deleted file mode 100644
index 72dc18903eb..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
deleted file mode 100644
index 5710e1fcf70..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.T': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.T': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('f': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('run': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('run': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
deleted file mode 100644
index cd20ccf2e7f..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
deleted file mode 100644
index a641ee9e36e..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
+++ /dev/null
@@ -1,69 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
deleted file mode 100644
index 33b8bf95190..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
deleted file mode 100644
index d193bd57afe..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Nothing': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.Nothing': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.Nothing': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Nothing': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run1': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run1': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
deleted file mode 100644
index 5a6c1b67b46..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@50, ResolutionCandidate@51, ResolutionCandidate@52, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
deleted file mode 100644
index 690f216357b..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
deleted file mode 100644
index dfc2c7838fa..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@54[7] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
deleted file mode 100644
index 6c770ff6d80..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
deleted file mode 100644
index bd9d99ce66e..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@58[7] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
deleted file mode 100644
index f12977bbb0e..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
+++ /dev/null
@@ -1,99 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('run': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('run': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
deleted file mode 100644
index 2f5b0d8560a..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
+++ /dev/null
@@ -1,200 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Element': FqName@50) = null
-    packageFragments('K': FqName@51) = null
-    packageFragments('Map': FqName@52) = null
-    packageFragments('String': FqName@53) = null
-    packageFragments('Unit': FqName@54) = null
-    packageFragments('V': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Element': FqName@60) = null
-    packageFragments('java.lang.K': FqName@61) = null
-    packageFragments('java.lang.Map': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('java.lang.Unit': FqName@64) = null
-    packageFragments('java.lang.V': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Element': FqName@67) = null
-    packageFragments('kotlin.K': FqName@68) = null
-    packageFragments('kotlin.Map': FqName@69) = null
-    packageFragments('kotlin.String': FqName@70) = null
-    packageFragments('kotlin.Unit': FqName@71) = null
-    packageFragments('kotlin.V': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    packageFragments('m': FqName@75) = null
-    packageFragments('m.Element': FqName@76) = null
-    packageFragments('m.K': FqName@77) = null
-    packageFragments('m.Map': FqName@78) = null
-    packageFragments('m.String': FqName@79) = null
-    packageFragments('m.Unit': FqName@80) = null
-    packageFragments('m.V': FqName@81) = null
-    topLevelClasses(JavaClassImpl@82['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@89) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('getOrElse': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('getOrElse': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteral.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
deleted file mode 100644
index e23f7d33861..00000000000
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.lazy.log b/compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.lazy.log
deleted file mode 100644
index f0bf08e1258..00000000000
--- a/compiler/testData/diagnostics/tests/generics/ClassObjectBoundsAreNotSupported.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Any': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log b/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
deleted file mode 100644
index b4e9d401174..00000000000
--- a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
+++ /dev/null
@@ -1,676 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['IllegalStateException'] {
-    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['IllegalStateException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['IllegalStateException']
-}
-
-LazyJavaClassDescriptor@10['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@9['IllegalStateException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@11['RuntimeException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['Exception'] }
-}
-
-LazyJavaClassifierType@20['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@17['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@11['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('In': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('Inv': FqName@56) = null
-    packageFragments('Out': FqName@57) = null
-    packageFragments('String': FqName@58) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('Unit': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.In': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Inv': FqName@67) = null
-    packageFragments('java.lang.Out': FqName@68) = null
-    packageFragments('java.lang.String': FqName@69) = null
-    packageFragments('java.lang.T': FqName@70) = null
-    packageFragments('java.lang.Unit': FqName@71) = null
-    packageFragments('kotlin': FqName@72) = null
-    packageFragments('kotlin.In': FqName@73) = null
-    packageFragments('kotlin.Int': FqName@74) = null
-    packageFragments('kotlin.Inv': FqName@75) = null
-    packageFragments('kotlin.Out': FqName@76) = null
-    packageFragments('kotlin.String': FqName@77) = null
-    packageFragments('kotlin.T': FqName@78) = null
-    packageFragments('kotlin.Unit': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@82['IllegalStateException']) = LazyJavaClassDescriptor@2['IllegalStateException']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@10['RuntimeException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('IllegalStateException': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('In': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Inv': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Out': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('f': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('inf': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('outf': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('IllegalStateException': Name@83) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('In': Name@85) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Inv': Name@87) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Out': Name@88) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('f': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('inf': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('outf': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('IllegalStateException': Name@83) = LazyJavaClassDescriptor@2['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('In': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Inv': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Out': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('f': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('inf': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('outf': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('IllegalStateException': Name@83) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('In': Name@85) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('Inv': Name@87) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('Out': Name@88) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('f': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('inf': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('outf': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[2] { ResolutionCandidate@184, ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[2] { ResolutionCandidate@196, ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[2] { ResolutionCandidate@200, ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[2] { ResolutionCandidate@204, ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-null {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@245[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = ArrayList@246[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-    <name not found> = ArrayList@247[2] { ResolutionCandidate@200, ResolutionCandidate@201 }
-    <name not found> = ArrayList@248[2] { ResolutionCandidate@196, ResolutionCandidate@197 }
-    <name not found> = ArrayList@249[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = ArrayList@250[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
-    <name not found> = ArrayList@251[2] { ResolutionCandidate@188, ResolutionCandidate@189 }
-    <name not found> = ArrayList@252[2] { ResolutionCandidate@184, ResolutionCandidate@185 }
-    <name not found> = ArrayList@253[2] { ResolutionCandidate@204, ResolutionCandidate@205 }
-    <name not found> = ArrayList@254[2] { ResolutionCandidate@192, ResolutionCandidate@193 }
-    <name not found> = ArrayList@255[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@256[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
deleted file mode 100644
index b49573df5fa..00000000000
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-LazyJavaClassDescriptor@0['Usage'] {
-    defaultType = JetTypeImpl@1['Usage']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('foo': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['foo'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['Usage']
-}
-
-LazyJavaClassTypeConstructor@10['Usage'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['Collection'] {
-    arguments = ArrayList@15[1] { LazyStarProjection@16 }
-    classifier = JavaClassImpl@17['Collection']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['Collection'] {
-    arguments = ArrayList@21[1] { LazyStarProjection@22 }
-    classifier = JavaClassImpl@17['Collection']
-    nullable = 'true': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Usage': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.Usage': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.Usage': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = null
-    packageFragments('kotlin.jvm': FqName@40) = null
-    packageFragments('test': FqName@41) = LazyJavaPackageFragment@42['test']
-    packageFragments('test.Usage': FqName@43) = null
-    topLevelClasses(JavaClassImpl@44['Usage']) = LazyJavaClassDescriptor@0['Usage']
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@42['test'] {
-    classes('Usage': Name@51) = LazyJavaClassDescriptor@0['Usage'] // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@55 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
deleted file mode 100644
index 5c32873f52d..00000000000
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
+++ /dev/null
@@ -1,80 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('List': FqName@5) = null
-    packageFragments('Map': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.Map': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.List': FqName@18) = null
-    packageFragments('kotlin.Map': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.Any': FqName@23) = null
-    packageFragments('p.Int': FqName@24) = null
-    packageFragments('p.List': FqName@25) = null
-    packageFragments('p.Map': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
deleted file mode 100644
index 4b08f03c5ff..00000000000
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('List': FqName@5) = null
-    packageFragments('Map': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.Map': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.List': FqName@18) = null
-    packageFragments('kotlin.Map': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('List': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Map': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log b/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
deleted file mode 100644
index eaf3664fd73..00000000000
--- a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('TestFail': FqName@5) = null
-    packageFragments('TestOK': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('java.lang.TestFail': FqName@13) = null
-    packageFragments('java.lang.TestOK': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.TestFail': FqName@18) = null
-    packageFragments('kotlin.TestOK': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.lazy.log b/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.lazy.log
deleted file mode 100644
index 04d4f8d0bfa..00000000000
--- a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundWithTwoArguments.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.D': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.D': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
diff --git a/compiler/testData/diagnostics/tests/generics/argumentsForT.lazy.log b/compiler/testData/diagnostics/tests/generics/argumentsForT.lazy.log
deleted file mode 100644
index 04f9f499382..00000000000
--- a/compiler/testData/diagnostics/tests/generics/argumentsForT.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
diff --git a/compiler/testData/diagnostics/tests/generics/kt1575-Class.lazy.log b/compiler/testData/diagnostics/tests/generics/kt1575-Class.lazy.log
deleted file mode 100644
index 7983ed0a0bf..00000000000
--- a/compiler/testData/diagnostics/tests/generics/kt1575-Class.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.lazy.log b/compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.lazy.log
deleted file mode 100644
index a376dafe0f6..00000000000
--- a/compiler/testData/diagnostics/tests/generics/kt1575-ClassObject.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('CO': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.CO': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.CO': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/generics/kt1575-Function.lazy.log b/compiler/testData/diagnostics/tests/generics/kt1575-Function.lazy.log
deleted file mode 100644
index 7983ed0a0bf..00000000000
--- a/compiler/testData/diagnostics/tests/generics/kt1575-Function.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log b/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
deleted file mode 100644
index 031fdbe6398..00000000000
--- a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Rec': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Rec': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Rec': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.lazy.log b/compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.lazy.log
deleted file mode 100644
index 807365691b4..00000000000
--- a/compiler/testData/diagnostics/tests/generics/resolveGenericBoundsBeforeSupertypes.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('O': FqName@3) = null
-    packageFragments('Tr': FqName@4) = null
-    packageFragments('V': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Tr': FqName@10) = null
-    packageFragments('java.lang.V': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Tr': FqName@13) = null
-    packageFragments('kotlin.V': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
deleted file mode 100644
index 85c76b0bad5..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
+++ /dev/null
@@ -1,146 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('A': FqName@10) = null
-    packageFragments('Any': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Any': FqName@19) = null
-    packageFragments('java.lang.T': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.inline': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Any': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('tp': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('any': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('tp': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('any': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('tp': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('any': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('plus': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('tp': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@93[2] { ResolutionCandidate@77, ResolutionCandidate@78 }
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@81, ResolutionCandidate@82 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
deleted file mode 100644
index a7a7d90a446..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('C': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('C': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('C': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('C': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
deleted file mode 100644
index 7c2d9869b0d..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
+++ /dev/null
@@ -1,249 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['Exception']
-}
-
-LazyJavaClassDescriptor@6['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@7['RuntimeException']
-}
-
-LazyJavaClassDescriptor@8['UnsupportedOperationException'] {
-    constructors = ArrayList@9[4] { JavaConstructorDescriptor@10['<init>'], JavaConstructorDescriptor@11['<init>'], JavaConstructorDescriptor@12['<init>'], ... } // through LazyJavaClassMemberScope@13
-    defaultType = JetTypeImpl@14['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@15['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@5['Exception'] {
-    parameters = ArrayList@16[empty]
-    supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@7['RuntimeException'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@15['UnsupportedOperationException'] {
-    parameters = ArrayList@22[empty]
-    supertypes = ArrayList@23[1] { LazyJavaClassifierType@24['RuntimeException'] }
-}
-
-LazyJavaClassifierType@21['Exception'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@5['Exception']
-}
-
-LazyJavaClassifierType@24['RuntimeException'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@7['RuntimeException']
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['String']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@31['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@49['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@51['Throwable'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@18['Throwable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('A': FqName@58) = null
-    packageFragments('Int': FqName@59) = null
-    packageFragments('T': FqName@60) = null
-    packageFragments('inline': FqName@61) = null
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.A': FqName@66) = null
-    packageFragments('java.lang.Int': FqName@67) = null
-    packageFragments('java.lang.T': FqName@68) = null
-    packageFragments('java.lang.inline': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.A': FqName@71) = null
-    packageFragments('kotlin.Int': FqName@72) = null
-    packageFragments('kotlin.T': FqName@73) = null
-    packageFragments('kotlin.inline': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    topLevelClasses(JavaClassImpl@26['Exception']) = LazyJavaClassDescriptor@4['Exception']
-    topLevelClasses(JavaClassImpl@28['RuntimeException']) = LazyJavaClassDescriptor@6['RuntimeException']
-    topLevelClasses(JavaClassImpl@77['UnsupportedOperationException']) = LazyJavaClassDescriptor@8['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('Int': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('UnsupportedOperationException': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('f': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('id': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('inline': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('UnsupportedOperationException': Name@80) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('f': Name@81) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('id': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('UnsupportedOperationException': Name@80) = LazyJavaClassDescriptor@8['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('f': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('id': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('UnsupportedOperationException': Name@80) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('f': Name@81) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('id': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
deleted file mode 100644
index 7a30902c132..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
+++ /dev/null
@@ -1,187 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('A': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.A': FqName@61) = null
-    packageFragments('java.lang.Int': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.A': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.T': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    packageFragments('v': FqName@70) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@71['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('UnsupportedOperationException': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('v': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('UnsupportedOperationException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('UnsupportedOperationException': Name@74) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('v': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('UnsupportedOperationException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@77[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InType.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InType.lazy.log
deleted file mode 100644
index c336d7c214d..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InType.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
deleted file mode 100644
index 8888cf06595..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
+++ /dev/null
@@ -1,99 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('R': FqName@10) = null
-    packageFragments('T1': FqName@11) = null
-    packageFragments('T2': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.R': FqName@18) = null
-    packageFragments('java.lang.T1': FqName@19) = null
-    packageFragments('java.lang.T2': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.R': FqName@23) = null
-    packageFragments('kotlin.T1': FqName@24) = null
-    packageFragments('kotlin.T2': FqName@25) = null
-    packageFragments('kotlin.inline': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('bar': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
deleted file mode 100644
index c034d483638..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('T': FqName@7) = null
-    packageFragments('inline': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.inline': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.inline': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('inline': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/NotInlineableReified.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
deleted file mode 100644
index 58265010e12..00000000000
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
+++ /dev/null
@@ -1,164 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('A': FqName@54) = null
-    packageFragments('T2': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.T2': FqName@60) = null
-    packageFragments('kotlin': FqName@61) = null
-    packageFragments('kotlin.T2': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@65['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('UnsupportedOperationException': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('UnsupportedOperationException': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('UnsupportedOperationException': Name@66) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('UnsupportedOperationException': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-null {
-    <name not found> = ArrayList@82[4] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
deleted file mode 100644
index 5fc39a67882..00000000000
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('_': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('java.lang.Unit': FqName@15) = null
-    packageFragments('java.lang._': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.Unit': FqName@20) = null
-    packageFragments('kotlin._': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('tests': FqName@24) = null
-    packageFragments('tests._checkType': FqName@25) = null
-    packageFragments('tests._checkType.T': FqName@26) = null
-    packageFragments('tests._checkType.Tr': FqName@27) = null
-    packageFragments('tests._checkType.Unit': FqName@28) = null
-    packageFragments('tests._checkType._': FqName@29) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('_': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('checkType': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tests': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('checkType': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('tests': Name@36) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('checkType': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('checkType': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
deleted file mode 100644
index 6b4dd2ab253..00000000000
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Tr': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('_': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.Tr': FqName@16) = null
-    packageFragments('java.lang.Unit': FqName@17) = null
-    packageFragments('java.lang._': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.Tr': FqName@22) = null
-    packageFragments('kotlin.Unit': FqName@23) = null
-    packageFragments('kotlin._': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('tests': FqName@27) = null
-    packageFragments('tests._checkType': FqName@28) = null
-    packageFragments('tests._checkType.Any': FqName@29) = null
-    packageFragments('tests._checkType.T': FqName@30) = null
-    packageFragments('tests._checkType.Tr': FqName@31) = null
-    packageFragments('tests._checkType.Unit': FqName@32) = null
-    packageFragments('tests._checkType._': FqName@33) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('_': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('checkType': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('tests': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('checkType': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('tests': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('checkType': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('checkType': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
deleted file mode 100644
index 90680bab230..00000000000
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('Tr': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.Tr': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
deleted file mode 100644
index 7db54981e48..00000000000
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
+++ /dev/null
@@ -1,99 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('Tr': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('java.lang.Tr': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.C': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.Tr': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
deleted file mode 100644
index e9e16518f02..00000000000
--- a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('X': FqName@3) = null
-    packageFragments('a': FqName@4) = null
-    packageFragments('a.X': FqName@5) = null
-    packageFragments('a.x': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('b.X': FqName@8) = null
-    packageFragments('c': FqName@9) = null
-    packageFragments('c.X': FqName@10) = null
-    packageFragments('c.x': FqName@11) = null
-    packageFragments('d': FqName@12) = null
-    packageFragments('d.X': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.X': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.X': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('X': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('X': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.lazy.log b/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.lazy.log
deleted file mode 100644
index 4a06db28352..00000000000
--- a/compiler/testData/diagnostics/tests/imports/ImportsHiddenByDefinitionInTheSameFile.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('List': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.Double': FqName@9) = null
-    packageFragments('kotlin.List': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Double': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('kotlin': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('kotlin': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log b/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
deleted file mode 100644
index 3bd851c8e03..00000000000
--- a/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('a': FqName@7) = null
-    packageFragments('a.x': FqName@8) = null
-    packageFragments('b': FqName@9) = null
-    packageFragments('b.y': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('AX': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
deleted file mode 100644
index 56e4491db92..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('a.getErrorType': FqName@4) = null
-    packageFragments('getErrorType': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.getErrorType': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.getErrorType': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('getErrorType': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('getErrorType': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
deleted file mode 100644
index e851bc3f070..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
+++ /dev/null
@@ -1,388 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@4['Comparator'] {
-    allDescriptors = ArrayList@5[4] { JavaMethodDescriptor@6['compare'], DeserializedSimpleFunctionDescriptor@7['hashCode'], DeserializedSimpleFunctionDescriptor@8['toString'], ... } // through LazyJavaClassMemberScope@9
-    annotations = LazyJavaAnnotations@10
-    defaultType = JetTypeImpl@11['Comparator<1>']
-    enumEntryIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@9
-    functionTypeForSamInterface = JetTypeImpl@13['Function2<3>']
-    functions('clone': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('compare': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@6['compare'] } // through LazyJavaClassMemberScope@9
-    functions('equals': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['equals'] } // through LazyJavaClassMemberScope@9
-    functions('finalize': Name@21) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('getClass': Name@22) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('hashCode': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@7['hashCode'] } // through LazyJavaClassMemberScope@9
-    functions('notify': Name@25) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('notifyAll': Name@26) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@8['toString'] } // through LazyJavaClassMemberScope@9
-    functions('wait': Name@29) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['Comparator']
-}
-
-LazyJavaClassDescriptor@34['Date'] {
-    defaultType = JetTypeImpl@35['Date']
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@37
-    functionTypeForSamInterface = null
-    functions('compareTo': Name@38) = ArrayList@39[1] { JavaMethodDescriptor@40['compareTo'] } // through LazyJavaClassMemberScope@37
-    functions('equals': Name@41) = ArrayList@42[1] { JavaMethodDescriptor@43['equals'] } // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@37
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@37
-    nestedClasses('compareTo': Name@38) = null // through LazyJavaClassMemberScope@37
-    nestedClasses('equals': Name@41) = null // through LazyJavaClassMemberScope@37
-    properties('equals': Name@41) = EmptyList@15[empty] // through LazyJavaClassMemberScope@37
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@47['Date']
-}
-
-LazyJavaClassDescriptor@48['Serializable'] {
-    defaultType = JetTypeImpl@49['Serializable']
-    functions('compareTo': Name@50) = EmptyList@15[empty] // through LazyJavaClassMemberScope@51
-    functions('equals': Name@52) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@54['equals'] } // through LazyJavaClassMemberScope@51
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@51
-    properties('equals': Name@41) = EmptyList@15[empty] // through LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassTypeConstructor@33['Comparator'] {
-    parameters = ArrayList@57[1] { LazyJavaTypeParameterDescriptor@58['T'] }
-    supertypes = ArrayList@59[1] { JetTypeImpl@60['Any'] }
-}
-
-LazyJavaClassTypeConstructor@47['Date'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[3] { LazyJavaClassifierType@63['Serializable'], LazyJavaClassifierType@64['Cloneable'], LazyJavaClassifierType@65['Comparable<Date>'] }
-}
-
-LazyJavaClassTypeConstructor@56['Serializable'] {
-    parameters = ArrayList@66[empty]
-    supertypes = ArrayList@67[1] { JetTypeImpl@60['Any'] }
-}
-
-LazyJavaClassifierType@64['Cloneable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['Cloneable']
-    memberScope = DeserializedClassMemberScope@70
-    typeConstructor = DeserializedClassTypeConstructor@71
-}
-
-LazyJavaClassifierType@65['Comparable<Date>'] {
-    arguments = ArrayList@72[1] { TypeProjectionImpl@73 }
-    classifier = JavaClassImpl@74['Comparable']
-    memberScope = SubstitutingScope@75
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Date'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['Date']
-    memberScope = LazyJavaClassMemberScope@37
-    nullable = 'false': Boolean@80
-    typeConstructor = LazyJavaClassTypeConstructor@47['Date']
-}
-
-LazyJavaClassifierType@81['Date'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@79['Date']
-    memberScope = LazyJavaClassMemberScope@37
-    nullable = 'true': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@47['Date']
-}
-
-LazyJavaClassifierType@84['Date'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['Date']
-    nullable = 'false': Boolean@80
-    typeConstructor = LazyJavaClassTypeConstructor@47['Date']
-}
-
-LazyJavaClassifierType@87['Date'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@86['Date']
-    nullable = 'true': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@47['Date']
-}
-
-LazyJavaClassifierType@89['Object'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@91['Object']
-    nullable = 'false': Boolean@80
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@93['Object'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@91['Object']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@95['Object'] {
-    classifier = JavaClassImpl@96['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@97['Object'] {
-    classifier = JavaClassImpl@98['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@99['Object'] {
-    classifier = JavaClassImpl@100['Object']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@63['Serializable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['Serializable']
-    memberScope = LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassifierType@103['T'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['T']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@110['T'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@113['T'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@116['T'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@118['T'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@120['T'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@122['T'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@105['T']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaPackageFragmentProvider@124 {
-    packageFragments('<root>': FqName@125) = LazyJavaPackageFragment@126['<root>']
-    packageFragments('Any': FqName@127) = null
-    packageFragments('Comparator': FqName@128) = null
-    packageFragments('Date': FqName@129) = null
-    packageFragments('Int': FqName@130) = null
-    packageFragments('T': FqName@131) = null
-    packageFragments('U': FqName@132) = null
-    packageFragments('a': FqName@133) = null
-    packageFragments('a.Any': FqName@134) = null
-    packageFragments('a.Comparator': FqName@135) = null
-    packageFragments('a.Date': FqName@136) = null
-    packageFragments('a.Int': FqName@137) = null
-    packageFragments('a.T': FqName@138) = null
-    packageFragments('a.U': FqName@139) = null
-    packageFragments('a.inline': FqName@140) = null
-    packageFragments('inline': FqName@141) = null
-    packageFragments('java': FqName@142) = LazyJavaPackageFragment@143['java']
-    packageFragments('java.io': FqName@144) = LazyJavaPackageFragment@145['io']
-    packageFragments('java.lang': FqName@146) = LazyJavaPackageFragment@147['lang']
-    packageFragments('java.lang.Any': FqName@148) = null
-    packageFragments('java.lang.Comparator': FqName@149) = null
-    packageFragments('java.lang.Date': FqName@150) = null
-    packageFragments('java.lang.Int': FqName@151) = null
-    packageFragments('java.lang.T': FqName@152) = null
-    packageFragments('java.lang.U': FqName@153) = null
-    packageFragments('java.lang.inline': FqName@154) = null
-    packageFragments('java.util': FqName@155) = LazyJavaPackageFragment@156['util']
-    packageFragments('java.util.Comparator': FqName@157) = null
-    packageFragments('java.util.Date': FqName@158) = null
-    packageFragments('kotlin': FqName@159) = null
-    packageFragments('kotlin.Any': FqName@160) = null
-    packageFragments('kotlin.Comparator': FqName@161) = null
-    packageFragments('kotlin.Date': FqName@162) = null
-    packageFragments('kotlin.Int': FqName@163) = null
-    packageFragments('kotlin.T': FqName@164) = null
-    packageFragments('kotlin.U': FqName@165) = null
-    packageFragments('kotlin.inline': FqName@166) = null
-    packageFragments('kotlin.io': FqName@167) = null
-    packageFragments('kotlin.jvm': FqName@168) = null
-    topLevelClasses(JavaClassImpl@169['Comparator']) = LazyJavaClassDescriptor@4['Comparator']
-    topLevelClasses(JavaClassImpl@170['Date']) = LazyJavaClassDescriptor@34['Date']
-    topLevelClasses(JavaClassImpl@102['Serializable']) = LazyJavaClassDescriptor@48['Serializable']
-}
-
-LazyJavaPackageFragment@143['java'] {
-    classes('lang': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('util': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('lang': Name@175) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('util': Name@176) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@177 // through LazyPackageFragmentScopeForJavaPackage@172
-}
-
-LazyJavaPackageFragment@147['lang'] {
-    classes('U': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('comparator': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('equals': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('comparator': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('equals': Name@41) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@179
-}
-
-LazyJavaPackageFragment@156['util'] {
-    classes('Comparator': Name@182) = LazyJavaClassDescriptor@4['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@183
-    classes('Date': Name@184) = LazyJavaClassDescriptor@34['Date'] // through LazyPackageFragmentScopeForJavaPackage@183
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('Comparator': Name@185) = ArrayList@186[1] { SamConstructorDescriptor@187['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('Date': Name@188) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@183
-}
-
-LazyJavaTypeParameterDescriptor@58['T'] {
-    defaultType = JetTypeImpl@190['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@191[1] { NullableType@192 }
-}
-
-LazyJavaTypeParameterResolver@193 {
-    resolve(JavaTypeParameterImpl@194['T']) = LazyJavaTypeParameterDescriptor@58['T']
-}
-
-LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@109['T']) = null
-}
-
-LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@105['T']) = null
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-}
-
-null {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@269[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
-    <name not found> = ArrayList@270[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
deleted file mode 100644
index 8024dbc1a6b..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
+++ /dev/null
@@ -1,122 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('b': FqName@6) = null
-    packageFragments('b.Array': FqName@7) = null
-    packageFragments('b.Int': FqName@8) = null
-    packageFragments('b.String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('arrayOfNulls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('arrayOfNulls': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@97[7] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
deleted file mode 100644
index 6d1f67084bd..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
+++ /dev/null
@@ -1,60 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('IntArray': FqName@5) = null
-    packageFragments('Nothing': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('d': FqName@8) = null
-    packageFragments('d.A': FqName@9) = null
-    packageFragments('d.Int': FqName@10) = null
-    packageFragments('d.IntArray': FqName@11) = null
-    packageFragments('d.Nothing': FqName@12) = null
-    packageFragments('d.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.IntArray': FqName@20) = null
-    packageFragments('java.lang.Nothing': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.IntArray': FqName@26) = null
-    packageFragments('kotlin.Nothing': FqName@27) = null
-    packageFragments('kotlin.T': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('infer': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('infer': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
deleted file mode 100644
index cc05c21600e..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
+++ /dev/null
@@ -1,460 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('AA': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('it': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.AA': FqName@11) = null
-    packageFragments('java.lang.List': FqName@12) = null
-    packageFragments('java.lang.a': FqName@13) = null
-    packageFragments('java.lang.it': FqName@14) = null
-    packageFragments('java.lang.l': FqName@15) = null
-    packageFragments('java.lang.n': FqName@16) = null
-    packageFragments('java.lang.rr': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.AA': FqName@19) = null
-    packageFragments('kotlin.List': FqName@20) = null
-    packageFragments('kotlin.a': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.it': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kotlin.l': FqName@25) = null
-    packageFragments('kotlin.n': FqName@26) = null
-    packageFragments('kotlin.rr': FqName@27) = null
-    packageFragments('l': FqName@28) = null
-    packageFragments('n': FqName@29) = null
-    packageFragments('rr': FqName@30) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('AA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('List': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('it': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('l': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('n': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('rr': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('a': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('it': Name@43) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('l': Name@44) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('map': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('n': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('rr': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('AA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('it': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('l': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('n': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('rr': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('a': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('it': Name@43) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('l': Name@44) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('map': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('n': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('rr': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-null {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
deleted file mode 100644
index 6178508d781..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('bar': FqName@5) = null
-    packageFragments('bar.Array': FqName@6) = null
-    packageFragments('bar.String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Array': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
deleted file mode 100644
index 144b4203578..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
+++ /dev/null
@@ -1,290 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Double': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('h': FqName@6) = null
-    packageFragments('h.Array': FqName@7) = null
-    packageFragments('h.Double': FqName@8) = null
-    packageFragments('h.Square': FqName@9) = null
-    packageFragments('h.String': FqName@10) = null
-    packageFragments('h.set': FqName@11) = null
-    packageFragments('h.value': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Array': FqName@17) = null
-    packageFragments('java.lang.Double': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.set': FqName@20) = null
-    packageFragments('java.lang.value': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Array': FqName@23) = null
-    packageFragments('kotlin.Double': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('kotlin.set': FqName@28) = null
-    packageFragments('kotlin.value': FqName@29) = null
-    packageFragments('set': FqName@30) = null
-    packageFragments('value': FqName@31) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('Square': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('area': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('size': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('value': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Square': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('value': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@79[7] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
deleted file mode 100644
index 8378ee26d06..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
+++ /dev/null
@@ -1,116 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('c': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('map': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('map': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plus': Name@19) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[8] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@25, ResolutionCandidate@26, ResolutionCandidate@27, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funEquals.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funKeyword.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/funcitonTypes.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
deleted file mode 100644
index d6f22af9060..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.E': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.E': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.lazy.log
deleted file mode 100644
index ca57ac6c648..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteVal.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('c': FqName@3) = null
-    packageFragments('c.i': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.lazy.log
deleted file mode 100644
index d4e3b2eaf7b..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteValWithAccessor.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('c': FqName@4) = null
-    packageFragments('c.String': FqName@5) = null
-    packageFragments('c.i': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
deleted file mode 100644
index 5b1456948f8..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Any': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Any': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/namedFun.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
deleted file mode 100644
index 924c039f6ab..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.lazy.log
+++ /dev/null
@@ -1,203 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('F': FqName@50) = null
-    packageFragments('G': FqName@51) = null
-    packageFragments('Map': FqName@52) = null
-    packageFragments('R': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('b': FqName@55) = null
-    packageFragments('b.F': FqName@56) = null
-    packageFragments('b.G': FqName@57) = null
-    packageFragments('b.Map': FqName@58) = null
-    packageFragments('b.R': FqName@59) = null
-    packageFragments('b.T': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.F': FqName@65) = null
-    packageFragments('java.lang.G': FqName@66) = null
-    packageFragments('java.lang.Map': FqName@67) = null
-    packageFragments('java.lang.R': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.F': FqName@71) = null
-    packageFragments('kotlin.G': FqName@72) = null
-    packageFragments('kotlin.Map': FqName@73) = null
-    packageFragments('kotlin.R': FqName@74) = null
-    packageFragments('kotlin.T': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    topLevelClasses(JavaClassImpl@78['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Exception': Name@85) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('getMap': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('Exception': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('getMap': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[4] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@108[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
-    <name not found> = ArrayList@109[5] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.lazy.log
deleted file mode 100644
index 65fd330869c..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/typeReferenceError.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('java.lang.main': FqName@7) = null
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-    packageFragments('kotlin.main': FqName@11) = null
-    packageFragments('main': FqName@12) = null
-    packageFragments('typeReferenceError': FqName@13) = null
-    packageFragments('typeReferenceError.Pair': FqName@14) = null
-    packageFragments('typeReferenceError.main': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['lang'] {
-    classes('main': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
deleted file mode 100644
index 4d6c60e4308..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('l': FqName@13) = null
-    packageFragments('l.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
deleted file mode 100644
index 720743b491a..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
+++ /dev/null
@@ -1,643 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['Arrays'] {
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('toString': Name@4) = ArrayList@5[1] { DeserializedSimpleFunctionDescriptor@6['toString'] } // through LazyJavaClassMemberScope@3
-    functions('toString': Name@4) = ArrayList@7[9] { JavaMethodDescriptor@8['toString'], JavaMethodDescriptor@9['toString'], JavaMethodDescriptor@10['toString'], ... } // through LazyJavaStaticClassScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@3
-    nestedClasses('toString': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('toString': Name@4) = EmptyList@15[empty] // through LazyJavaClassMemberScope@3
-    properties('toString': Name@4) = EmptyList@15[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@16['Arrays']
-}
-
-LazyJavaClassDescriptor@17['AssertionError'] {
-    constructors = ArrayList@18[10] { JavaConstructorDescriptor@19['<init>'], JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], ... } // through LazyJavaClassMemberScope@22
-    defaultType = JetTypeImpl@23['AssertionError']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@24['AssertionError']
-}
-
-LazyJavaClassDescriptor@25['Error'] {
-    typeConstructor = LazyJavaClassTypeConstructor@26['Error']
-}
-
-LazyJavaClassTypeConstructor@16['Arrays'] {
-    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['AssertionError'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['Error'] }
-}
-
-LazyJavaClassTypeConstructor@26['Error'] {
-    parameters = ArrayList@32[empty]
-    supertypes = ArrayList@33[1] { LazyJavaClassifierType@34['Throwable'] }
-}
-
-LazyJavaClassifierType@31['Error'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['Error']
-    typeConstructor = LazyJavaClassTypeConstructor@26['Error']
-}
-
-LazyJavaClassifierType@37['Object'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Object']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Object'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Object']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Object'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@39['Object']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@48['Object'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@44['Object']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@50['Object'] {
-    classifier = JavaClassImpl@51['Object']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@52['String'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@56['String'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaClassImpl@58['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@59['String'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@62['String'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@64['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@65['String'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@68['String'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@70['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@71['String'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@74['String'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@77['String'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@80['String'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@83['String'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@86['String'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@82['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@88['String'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@67['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@90['String'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@79['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@92['String'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@54['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@94['String'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@70['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@96['String'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@85['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@98['String'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@73['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@100['String'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@58['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@102['String'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@76['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@104['String'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@61['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@106['String'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@64['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@108['Throwable'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['Throwable']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@112['Throwable'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@110['Throwable']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@34['Throwable'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaPackageFragmentProvider@116 {
-    packageFragments('<root>': FqName@117) = LazyJavaPackageFragment@118['<root>']
-    packageFragments('Any': FqName@119) = null
-    packageFragments('Array': FqName@120) = null
-    packageFragments('Arrays': FqName@121) = null
-    packageFragments('Int': FqName@122) = null
-    packageFragments('IntArray': FqName@123) = null
-    packageFragments('String': FqName@124) = null
-    packageFragments('T': FqName@125) = null
-    packageFragments('java': FqName@126) = LazyJavaPackageFragment@127['java']
-    packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
-    packageFragments('java.lang.Any': FqName@130) = null
-    packageFragments('java.lang.Array': FqName@131) = null
-    packageFragments('java.lang.Arrays': FqName@132) = null
-    packageFragments('java.lang.Int': FqName@133) = null
-    packageFragments('java.lang.IntArray': FqName@134) = null
-    packageFragments('java.lang.String': FqName@135) = null
-    packageFragments('java.lang.T': FqName@136) = null
-    packageFragments('java.lang.res': FqName@137) = null
-    packageFragments('java.util': FqName@138) = LazyJavaPackageFragment@139['util']
-    packageFragments('java.util.Any': FqName@140) = null
-    packageFragments('java.util.Array': FqName@141) = null
-    packageFragments('java.util.Arrays': FqName@142) = null
-    packageFragments('java.util.Int': FqName@143) = null
-    packageFragments('java.util.IntArray': FqName@144) = null
-    packageFragments('java.util.String': FqName@145) = null
-    packageFragments('java.util.T': FqName@146) = null
-    packageFragments('java.util.res': FqName@147) = null
-    packageFragments('kotlin': FqName@148) = null
-    packageFragments('kotlin.Any': FqName@149) = null
-    packageFragments('kotlin.Array': FqName@150) = null
-    packageFragments('kotlin.Arrays': FqName@151) = null
-    packageFragments('kotlin.Int': FqName@152) = null
-    packageFragments('kotlin.IntArray': FqName@153) = null
-    packageFragments('kotlin.String': FqName@154) = null
-    packageFragments('kotlin.T': FqName@155) = null
-    packageFragments('kotlin.io': FqName@156) = null
-    packageFragments('kotlin.jvm': FqName@157) = null
-    packageFragments('kotlin.res': FqName@158) = null
-    packageFragments('res': FqName@159) = null
-    packageFragments('sum': FqName@160) = null
-    packageFragments('sum.Any': FqName@161) = null
-    packageFragments('sum.Array': FqName@162) = null
-    packageFragments('sum.Arrays': FqName@163) = null
-    packageFragments('sum.Int': FqName@164) = null
-    packageFragments('sum.IntArray': FqName@165) = null
-    packageFragments('sum.String': FqName@166) = null
-    packageFragments('sum.T': FqName@167) = null
-    packageFragments('sum.res': FqName@168) = null
-    topLevelClasses(JavaClassImpl@169['Arrays']) = LazyJavaClassDescriptor@1['Arrays']
-    topLevelClasses(JavaClassImpl@170['AssertionError']) = LazyJavaClassDescriptor@17['AssertionError']
-    topLevelClasses(JavaClassImpl@36['Error']) = LazyJavaClassDescriptor@25['Error']
-}
-
-LazyJavaPackageFragment@127['java'] {
-    classes('lang': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('util': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('lang': Name@175) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('util': Name@176) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@177 // through LazyPackageFragmentScopeForJavaPackage@172
-}
-
-LazyJavaPackageFragment@129['lang'] {
-    classes('AssertionError': Name@178) = LazyJavaClassDescriptor@17['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('assertEquals': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('equals': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('res': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('sum': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('test': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('AssertionError': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('assertEquals': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('equals': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('res': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('sum': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('test': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@186 // through LazyPackageFragmentScopeForJavaPackage@179
-}
-
-LazyJavaPackageFragment@139['util'] {
-    classes('Any': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Array': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Arrays': Name@190) = LazyJavaClassDescriptor@1['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('AssertionError': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Int': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('IntArray': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('String': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('assertEquals': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('equals': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('res': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('sum': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('test': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('AssertionError': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('assertEquals': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('equals': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('res': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('sum': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('test': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    memberIndex = computeMemberIndex$1@194 // through LazyPackageFragmentScopeForJavaPackage@188
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[9] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[9] { ResolutionCandidate@291, ResolutionCandidate@292, ResolutionCandidate@293, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[9] { ResolutionCandidate@296, ResolutionCandidate@297, ResolutionCandidate@298, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-null {
-    <name not found> = ArrayList@304[10] { ResolutionCandidate@296, ResolutionCandidate@305, ResolutionCandidate@297, ... }
-    <name not found> = ArrayList@306[10] { ResolutionCandidate@291, ResolutionCandidate@307, ResolutionCandidate@292, ... }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@335[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@336[8] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283, ... }
-    <name not found> = ArrayList@337[9] { ResolutionCandidate@286, ResolutionCandidate@287, ResolutionCandidate@288, ... }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
deleted file mode 100644
index f4069da9b97..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('a.Any': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt1955.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/kt1955.lazy.log
deleted file mode 100644
index b9510736b50..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt1955.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('b': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
deleted file mode 100644
index e927aafccda..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
+++ /dev/null
@@ -1,272 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('c': FqName@7) = null
-    packageFragments('c.Foo': FqName@8) = null
-    packageFragments('c.Int': FqName@9) = null
-    packageFragments('c.R': FqName@10) = null
-    packageFragments('c.c': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Foo': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Foo': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('R': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('a': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bar': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('c': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('R': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('a': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('c': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
deleted file mode 100644
index edc490d0d3d..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
+++ /dev/null
@@ -1,90 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.foo': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
deleted file mode 100644
index 39fa387b83a..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('MyClass1': FqName@3) = null
-    packageFragments('a': FqName@4) = null
-    packageFragments('a.MyClass1': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.MyClass1': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.MyClass1': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('plus': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
deleted file mode 100644
index e1e94774de8..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('b': FqName@3) = null
-    packageFragments('b.collection': FqName@4) = null
-    packageFragments('collection': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.collection': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.collection': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('collection': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('collection': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
deleted file mode 100644
index 4a3f6399b97..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('IntArray': FqName@3) = null
-    packageFragments('d': FqName@4) = null
-    packageFragments('d.IntArray': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.IntArray': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.IntArray': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('a': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
deleted file mode 100644
index 27708c2f13b..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T': FqName@3) = null
-    packageFragments('bar': FqName@4) = null
-    packageFragments('bar.S': FqName@5) = null
-    packageFragments('bar.T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
deleted file mode 100644
index 6e3abba5803..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('java.lang.rrr': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.rrr': FqName@20) = null
-    packageFragments('rrr': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('rrr': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('bar': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('rrr': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('rrr': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('bar': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('rrr': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
deleted file mode 100644
index b7451f81cfb..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
+++ /dev/null
@@ -1,126 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('bbb': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.bbb': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.bbb': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bbb': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bbb': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('bbb': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bbb': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
deleted file mode 100644
index 5b32e551049..00000000000
--- a/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
deleted file mode 100644
index dd47e242be2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Nothing': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Nothing': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Nothing': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('n': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('Nothing': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('fooT22': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('sure': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('fooT22': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('sure': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('fooT22': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('sure': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('fooT22': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('sure': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
deleted file mode 100644
index be7c8c0c7fd..00000000000
--- a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('b': FqName@6) = null
-    packageFragments('b.Array': FqName@7) = null
-    packageFragments('b.Int': FqName@8) = null
-    packageFragments('b.String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Array': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Array': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
deleted file mode 100644
index 5ac18ca6684..00000000000
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
+++ /dev/null
@@ -1,178 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('Collection': FqName@51) = null
-    packageFragments('Int': FqName@52) = null
-    packageFragments('List': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('f': FqName@55) = null
-    packageFragments('f.Any': FqName@56) = null
-    packageFragments('f.Collection': FqName@57) = null
-    packageFragments('f.Int': FqName@58) = null
-    packageFragments('f.List': FqName@59) = null
-    packageFragments('f.T': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Any': FqName@65) = null
-    packageFragments('java.lang.Collection': FqName@66) = null
-    packageFragments('java.lang.Int': FqName@67) = null
-    packageFragments('java.lang.List': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Any': FqName@71) = null
-    packageFragments('kotlin.Collection': FqName@72) = null
-    packageFragments('kotlin.Int': FqName@73) = null
-    packageFragments('kotlin.List': FqName@74) = null
-    packageFragments('kotlin.T': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    topLevelClasses(JavaClassImpl@78['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Exception': Name@85) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('g': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('Exception': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('g': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[4] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[4] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@103[2] { ResolutionCandidate@91, ResolutionCandidate@92 }
-    <name not found> = ArrayList@104[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@105[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
deleted file mode 100644
index 42fc88f41aa..00000000000
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('R': FqName@9) = null
-    packageFragments('f': FqName@10) = null
-    packageFragments('f.Any': FqName@11) = null
-    packageFragments('f.Boolean': FqName@12) = null
-    packageFragments('f.Int': FqName@13) = null
-    packageFragments('f.R': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Any': FqName@19) = null
-    packageFragments('java.lang.Boolean': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.Boolean': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('h': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('h': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
deleted file mode 100644
index c0fb6391265..00000000000
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
+++ /dev/null
@@ -1,198 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('Collection': FqName@51) = null
-    packageFragments('Int': FqName@52) = null
-    packageFragments('List': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('f': FqName@55) = null
-    packageFragments('f.Any': FqName@56) = null
-    packageFragments('f.Collection': FqName@57) = null
-    packageFragments('f.Int': FqName@58) = null
-    packageFragments('f.List': FqName@59) = null
-    packageFragments('f.T': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Any': FqName@65) = null
-    packageFragments('java.lang.Collection': FqName@66) = null
-    packageFragments('java.lang.Int': FqName@67) = null
-    packageFragments('java.lang.List': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Any': FqName@71) = null
-    packageFragments('kotlin.Collection': FqName@72) = null
-    packageFragments('kotlin.Int': FqName@73) = null
-    packageFragments('kotlin.List': FqName@74) = null
-    packageFragments('kotlin.T': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    topLevelClasses(JavaClassImpl@78['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Exception': Name@85) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('emptyList': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('f': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('Exception': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('emptyList': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('f': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@95, ResolutionCandidate@96 }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
deleted file mode 100644
index 4b364199a4b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('List': FqName@5) = null
-    packageFragments('MutableCollection': FqName@6) = null
-    packageFragments('MutableList': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('f': FqName@9) = null
-    packageFragments('f.Any': FqName@10) = null
-    packageFragments('f.Int': FqName@11) = null
-    packageFragments('f.List': FqName@12) = null
-    packageFragments('f.MutableCollection': FqName@13) = null
-    packageFragments('f.MutableList': FqName@14) = null
-    packageFragments('f.T': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.List': FqName@22) = null
-    packageFragments('java.lang.MutableCollection': FqName@23) = null
-    packageFragments('java.lang.MutableList': FqName@24) = null
-    packageFragments('java.lang.T': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.List': FqName@29) = null
-    packageFragments('kotlin.MutableCollection': FqName@30) = null
-    packageFragments('kotlin.MutableList': FqName@31) = null
-    packageFragments('kotlin.T': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('f': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('f': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
deleted file mode 100644
index 0c26cc103af..00000000000
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Boolean': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('f': FqName@9) = null
-    packageFragments('f.Boolean': FqName@10) = null
-    packageFragments('f.R': FqName@11) = null
-    packageFragments('f.String': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Boolean': FqName@17) = null
-    packageFragments('java.lang.R': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Boolean': FqName@21) = null
-    packageFragments('kotlin.R': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('getAnswer': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('getAnswer': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('h': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
deleted file mode 100644
index c9ff7e8f19d..00000000000
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
+++ /dev/null
@@ -1,70 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('d': FqName@7) = null
-    packageFragments('d.Any': FqName@8) = null
-    packageFragments('d.Int': FqName@9) = null
-    packageFragments('d.String': FqName@10) = null
-    packageFragments('d.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('joinT': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('joinT': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
deleted file mode 100644
index 60a8c040f2e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
+++ /dev/null
@@ -1,563 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassDescriptor@19['ArrayList'] {
-    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
-    defaultType = JetTypeImpl@25['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
-    functionTypeForSamInterface = null
-    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
-    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
-}
-
-LazyJavaClassDescriptor@35['RandomAccess'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
-    supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@18['AbstractList'] {
-    parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
-    supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@34['ArrayList'] {
-    parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
-    supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@39['RandomAccess'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@43['Serializable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@51['AbstractCollection<E>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@66['AbstractCollection']
-    memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@56['AbstractList<E>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['AbstractList']
-    memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassifierType@72['Cloneable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Cloneable']
-    memberScope = DeserializedClassMemberScope@75
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Collection<? extends E>'] {
-    arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@81
-    nullable = 'false': Boolean@82
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@84['Collection<? extends E>'] {
-    arguments = ArrayList@85[1] { TypeProjectionImpl@86 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@87
-    nullable = 'true': Boolean@88
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@47['Collection<E>'] {
-    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    classifier = JavaClassImpl@92['Collection']
-    memberScope = SubstitutingScope@93
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@108['E'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@133['E'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@149['E'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@120['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@151['E'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@155['E'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@52['List<E>'] {
-    arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
-    classifier = JavaClassImpl@159['List']
-    memberScope = SubstitutingScope@160
-    nullable = 'false': Boolean@82
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@57['List<E>'] {
-    arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
-    classifier = JavaClassImpl@164['List']
-    memberScope = SubstitutingScope@165
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@166['Object'] {
-    classifier = JavaClassImpl@167['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@169['Object'] {
-    classifier = JavaClassImpl@170['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@171['Object'] {
-    classifier = JavaClassImpl@172['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@58['RandomAccess'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@174['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassifierType@175['Serializable'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['Serializable']
-    memberScope = LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@178 {
-    packageFragments('<root>': FqName@179) = LazyJavaPackageFragment@180['<root>']
-    packageFragments('ArrayList': FqName@181) = null
-    packageFragments('MutableList': FqName@182) = null
-    packageFragments('R': FqName@183) = null
-    packageFragments('T': FqName@184) = null
-    packageFragments('conflictingSubstitutions': FqName@185) = null
-    packageFragments('conflictingSubstitutions.ArrayList': FqName@186) = null
-    packageFragments('conflictingSubstitutions.MutableList': FqName@187) = null
-    packageFragments('conflictingSubstitutions.R': FqName@188) = null
-    packageFragments('conflictingSubstitutions.T': FqName@189) = null
-    packageFragments('java': FqName@190) = LazyJavaPackageFragment@191['java']
-    packageFragments('java.io': FqName@192) = LazyJavaPackageFragment@193['io']
-    packageFragments('java.lang': FqName@194) = LazyJavaPackageFragment@195['lang']
-    packageFragments('java.lang.ArrayList': FqName@196) = null
-    packageFragments('java.lang.MutableList': FqName@197) = null
-    packageFragments('java.lang.R': FqName@198) = null
-    packageFragments('java.lang.T': FqName@199) = null
-    packageFragments('java.util': FqName@200) = LazyJavaPackageFragment@201['util']
-    packageFragments('java.util.ArrayList': FqName@202) = null
-    packageFragments('java.util.MutableList': FqName@203) = null
-    packageFragments('java.util.R': FqName@204) = null
-    packageFragments('java.util.T': FqName@205) = null
-    packageFragments('kotlin': FqName@206) = null
-    packageFragments('kotlin.ArrayList': FqName@207) = null
-    packageFragments('kotlin.MutableList': FqName@208) = null
-    packageFragments('kotlin.R': FqName@209) = null
-    packageFragments('kotlin.T': FqName@210) = null
-    packageFragments('kotlin.io': FqName@211) = null
-    packageFragments('kotlin.jvm': FqName@212) = null
-    topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@213['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
-    topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
-}
-
-LazyJavaPackageFragment@191['java'] {
-    classes('lang': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('util': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('lang': Name@218) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('util': Name@219) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@220 // through LazyPackageFragmentScopeForJavaPackage@215
-}
-
-LazyJavaPackageFragment@195['lang'] {
-    classes('ArrayList': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    classes('elemAndList': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    classes('elemAndListWithReceiver': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    classes('list': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('ArrayList': Name@221) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndList': Name@223) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('list': Name@225) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    memberIndex = computeMemberIndex$1@226 // through LazyPackageFragmentScopeForJavaPackage@222
-}
-
-LazyJavaPackageFragment@201['util'] {
-    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('MutableList': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('elemAndList': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('elemAndListWithReceiver': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('list': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('ArrayList': Name@221) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndList': Name@223) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('list': Name@225) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@228
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@231['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@232[1] { NullableType@233 }
-    upperBoundsAsType = NullableType@233
-}
-
-LazyJavaTypeParameterDescriptor@49['E'] {
-    defaultType = JetTypeImpl@234['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-    upperBounds = LinkedHashSet@235[1] { NullableType@236 }
-    upperBoundsAsType = NullableType@236
-}
-
-LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@237['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@238[1] { NullableType@239 }
-    upperBoundsAsType = NullableType@239
-}
-
-LazyJavaTypeParameterResolver@240 {
-    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@54['E']
-}
-
-LazyJavaTypeParameterResolver@242 {
-    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@45['E']
-}
-
-LazyJavaTypeParameterResolver@244 {
-    resolve(JavaTypeParameterImpl@245['E']) = LazyJavaTypeParameterDescriptor@49['E']
-}
-
-LazyJavaTypeParameterResolver@246 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@104['E']) = null
-}
-
-LazyJavaTypeParameterResolver@248 {
-    resolve(JavaTypeParameterImpl@120['E']) = null
-}
-
-LazyJavaTypeParameterResolver@249 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
-}
-
-LazyJavaTypeParameterResolver@250 {
-    resolve(JavaTypeParameterImpl@116['E']) = null
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@296[2] { ResolutionCandidate@280, ResolutionCandidate@281 }
-    <name not found> = ArrayList@297[3] { ResolutionCandidate@284, ResolutionCandidate@285, ResolutionCandidate@286 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
deleted file mode 100644
index 4f4fc345c05..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
+++ /dev/null
@@ -1,559 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['Exception'] {
-    constructors = ArrayList@13[5] { JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], ... } // through LazyJavaClassMemberScope@17
-    defaultType = JetTypeImpl@18['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@19['Exception']
-}
-
-LazyJavaClassDescriptor@20['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
-}
-
-LazyJavaClassDescriptor@22['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
-    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
-    supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@19['Exception'] {
-    parameters = ArrayList@39[empty]
-    supertypes = ArrayList@40[1] { LazyJavaClassifierType@41['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@21['RandomAccess'] {
-    supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Serializable'] {
-    supertypes = ArrayList@44[1] { JetTypeImpl@43['Any'] }
-}
-
-LazyJavaClassifierType@31['AbstractCollection<E>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@36['AbstractList<E>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@51['Cloneable'] {
-    classifier = JavaClassImpl@52['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@53
-}
-
-LazyJavaClassifierType@54['Collection<? extends E>'] {
-    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
-    classifier = JavaClassImpl@57['Collection']
-    memberScope = SubstitutingScope@58
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@60
-}
-
-LazyJavaClassifierType@61['Collection<? extends E>'] {
-    arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
-    classifier = JavaClassImpl@57['Collection']
-    memberScope = SubstitutingScope@64
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@66
-}
-
-LazyJavaClassifierType@27['Collection<E>'] {
-    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    classifier = JavaClassImpl@69['Collection']
-    memberScope = SubstitutingScope@70
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@60
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
-}
-
-LazyJavaClassifierType@79['E'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaTypeParameterImpl@81['E']
-    nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@82['E'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@84['E']
-    nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['E']
-    nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaClassifierType@89['E'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@87['E']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@93['E'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@84['E']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@95['E'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@81['E']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@97['E'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
-}
-
-LazyJavaClassifierType@32['List<E>'] {
-    classifier = JavaClassImpl@99['List']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@37['List<E>'] {
-    classifier = JavaClassImpl@101['List']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@102['Object'] {
-    classifier = JavaClassImpl@103['Object']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@105['Object'] {
-    classifier = JavaClassImpl@106['Object']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@107['Object'] {
-    classifier = JavaClassImpl@108['Object']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@38['RandomAccess'] {
-    classifier = JavaClassImpl@109['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
-}
-
-LazyJavaClassifierType@110['Serializable'] {
-    classifier = JavaClassImpl@111['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaClassifierType@112['String'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@114['String']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@116['String'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['String']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@119['String'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['String']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@122['String'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@118['String']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@114['String']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@121['String']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@128['Throwable'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@130['Throwable']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@132['Throwable'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@134['Throwable']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@135['Throwable'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@137['Throwable']
-    nullable = 'false': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@138['Throwable'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@134['Throwable']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@140['Throwable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@137['Throwable']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@142['Throwable'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@130['Throwable']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@145['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@131
-}
-
-LazyJavaPackageFragmentProvider@146 {
-    packageFragments('<root>': FqName@147) = LazyJavaPackageFragment@148['<root>']
-    packageFragments('Array': FqName@149) = null
-    packageFragments('ArrayList': FqName@150) = null
-    packageFragments('C': FqName@151) = null
-    packageFragments('Int': FqName@152) = null
-    packageFragments('IntArray': FqName@153) = null
-    packageFragments('MutableCollection': FqName@154) = null
-    packageFragments('R': FqName@155) = null
-    packageFragments('T': FqName@156) = null
-    packageFragments('c': FqName@157) = null
-    packageFragments('c.Array': FqName@158) = null
-    packageFragments('c.ArrayList': FqName@159) = null
-    packageFragments('c.C': FqName@160) = null
-    packageFragments('c.Int': FqName@161) = null
-    packageFragments('c.IntArray': FqName@162) = null
-    packageFragments('c.MutableCollection': FqName@163) = null
-    packageFragments('c.R': FqName@164) = null
-    packageFragments('c.T': FqName@165) = null
-    packageFragments('java': FqName@166) = LazyJavaPackageFragment@167['java']
-    packageFragments('java.io': FqName@168) = LazyJavaPackageFragment@169['io']
-    packageFragments('java.lang': FqName@170) = LazyJavaPackageFragment@171['lang']
-    packageFragments('java.lang.Array': FqName@172) = null
-    packageFragments('java.lang.ArrayList': FqName@173) = null
-    packageFragments('java.lang.C': FqName@174) = null
-    packageFragments('java.lang.Int': FqName@175) = null
-    packageFragments('java.lang.IntArray': FqName@176) = null
-    packageFragments('java.lang.MutableCollection': FqName@177) = null
-    packageFragments('java.lang.R': FqName@178) = null
-    packageFragments('java.lang.T': FqName@179) = null
-    packageFragments('java.util': FqName@180) = LazyJavaPackageFragment@181['util']
-    packageFragments('java.util.ArrayList': FqName@182) = null
-    packageFragments('kotlin': FqName@183) = null
-    packageFragments('kotlin.Array': FqName@184) = null
-    packageFragments('kotlin.ArrayList': FqName@185) = null
-    packageFragments('kotlin.C': FqName@186) = null
-    packageFragments('kotlin.Int': FqName@187) = null
-    packageFragments('kotlin.IntArray': FqName@188) = null
-    packageFragments('kotlin.MutableCollection': FqName@189) = null
-    packageFragments('kotlin.R': FqName@190) = null
-    packageFragments('kotlin.T': FqName@191) = null
-    packageFragments('kotlin.io': FqName@192) = null
-    packageFragments('kotlin.jvm': FqName@193) = null
-    topLevelClasses(JavaClassImpl@47['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@50['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@194['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@195['Exception']) = LazyJavaClassDescriptor@12['Exception']
-    topLevelClasses(JavaClassImpl@109['RandomAccess']) = LazyJavaClassDescriptor@20['RandomAccess']
-    topLevelClasses(JavaClassImpl@111['Serializable']) = LazyJavaClassDescriptor@22['Serializable']
-}
-
-LazyJavaPackageFragment@167['java'] {
-    classes('lang': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('util': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('lang': Name@200) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('util': Name@202) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaPackageFragment@171['lang'] {
-    classes('ArrayList': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('Exception': Name@206) = LazyJavaClassDescriptor@12['Exception'] // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('IntArray': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('mapTo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('size': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('ArrayList': Name@204) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('Exception': Name@206) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('IntArray': Name@207) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('mapTo': Name@208) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('size': Name@209) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@205
-}
-
-LazyJavaPackageFragment@181['util'] {
-    classes('ArrayList': Name@211) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@199 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('ArrayList': Name@213) = EmptyList@201[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
-}
-
-LazyJavaTypeParameterDescriptor@34['E'] {
-    defaultType = JetTypeImpl@215['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-    upperBounds = LinkedHashSet@216[1] { NullableType@217 }
-}
-
-LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
-}
-
-LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@87['E']) = LazyJavaTypeParameterDescriptor@29['E']
-}
-
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@25['E']
-}
-
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@34['E']
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[4] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
-
-null {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@269[3] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254 }
-    <name not found> = ArrayList@270[5] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-    <name not found> = EmptyList@201[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
deleted file mode 100644
index 3fcf7029d36..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
+++ /dev/null
@@ -1,327 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('Unit': FqName@55) = null
-    packageFragments('_': FqName@56) = null
-    packageFragments('java': FqName@57) = LazyJavaPackageFragment@58['java']
-    packageFragments('java.lang': FqName@59) = LazyJavaPackageFragment@60['lang']
-    packageFragments('java.lang.A': FqName@61) = null
-    packageFragments('java.lang.Int': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('java.lang.Unit': FqName@64) = null
-    packageFragments('java.lang._': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.A': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.T': FqName@69) = null
-    packageFragments('kotlin.Unit': FqName@70) = null
-    packageFragments('kotlin._': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    packageFragments('tests': FqName@74) = null
-    packageFragments('tests._checkType': FqName@75) = null
-    packageFragments('tests._checkType.A': FqName@76) = null
-    packageFragments('tests._checkType.Int': FqName@77) = null
-    packageFragments('tests._checkType.T': FqName@78) = null
-    packageFragments('tests._checkType.Unit': FqName@79) = null
-    packageFragments('tests._checkType._': FqName@80) = null
-    topLevelClasses(JavaClassImpl@81['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Int': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('_': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('checkType': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('doA': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('tests': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('Exception': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('checkType': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('doA': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('tests': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@82) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('checkType': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('doA': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('Exception': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('checkType': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('doA': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[4] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[4] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-null {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@194[5] { ResolutionCandidate@165, ResolutionCandidate@166, ResolutionCandidate@167, ... }
-    <name not found> = ArrayList@195[5] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
deleted file mode 100644
index 7c2e14a1ccc..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
+++ /dev/null
@@ -1,330 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Any': FqName@53) = null
-    packageFragments('In': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('Out': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('Unit': FqName@58) = null
-    packageFragments('_': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.A': FqName@64) = null
-    packageFragments('java.lang.Any': FqName@65) = null
-    packageFragments('java.lang.In': FqName@66) = null
-    packageFragments('java.lang.Int': FqName@67) = null
-    packageFragments('java.lang.Out': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('java.lang.Unit': FqName@70) = null
-    packageFragments('java.lang._': FqName@71) = null
-    packageFragments('kotlin': FqName@72) = null
-    packageFragments('kotlin.A': FqName@73) = null
-    packageFragments('kotlin.Any': FqName@74) = null
-    packageFragments('kotlin.In': FqName@75) = null
-    packageFragments('kotlin.Int': FqName@76) = null
-    packageFragments('kotlin.Out': FqName@77) = null
-    packageFragments('kotlin.T': FqName@78) = null
-    packageFragments('kotlin.Unit': FqName@79) = null
-    packageFragments('kotlin._': FqName@80) = null
-    packageFragments('kotlin.io': FqName@81) = null
-    packageFragments('kotlin.jvm': FqName@82) = null
-    packageFragments('tests': FqName@83) = null
-    packageFragments('tests._checkType': FqName@84) = null
-    packageFragments('tests._checkType.A': FqName@85) = null
-    packageFragments('tests._checkType.Any': FqName@86) = null
-    packageFragments('tests._checkType.In': FqName@87) = null
-    packageFragments('tests._checkType.Int': FqName@88) = null
-    packageFragments('tests._checkType.Out': FqName@89) = null
-    packageFragments('tests._checkType.T': FqName@90) = null
-    packageFragments('tests._checkType.Unit': FqName@91) = null
-    packageFragments('tests._checkType._': FqName@92) = null
-    topLevelClasses(JavaClassImpl@93['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Exception': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('_': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('checkType': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('doA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('doIn': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('doOut': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('doT': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('tests': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('Exception': Name@96) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('checkType': Name@99) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('doA': Name@100) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('doIn': Name@101) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('doOut': Name@102) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('doT': Name@103) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('tests': Name@107) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('lang': Name@111) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-LazyJavaPackageFragment@63['lang'] {
-    classes('Exception': Name@96) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('checkType': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doIn': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doOut': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('doT': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Exception': Name@96) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('checkType': Name@99) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('doA': Name@100) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('doIn': Name@101) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('doOut': Name@102) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('doT': Name@103) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[4] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[4] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[4] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
-
-null {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@195[5] { ResolutionCandidate@172, ResolutionCandidate@173, ResolutionCandidate@174, ... }
-    <name not found> = ArrayList@196[5] { ResolutionCandidate@177, ResolutionCandidate@178, ResolutionCandidate@179, ... }
-    <name not found> = ArrayList@197[5] { ResolutionCandidate@162, ResolutionCandidate@163, ResolutionCandidate@164, ... }
-    <name not found> = ArrayList@198[5] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-    <name not found> = EmptyList@106[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
deleted file mode 100644
index 7c7fdb0bea2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/subtypeConstraintOnNullableType.lazy.log
+++ /dev/null
@@ -1,331 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('Out': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('Unit': FqName@56) = null
-    packageFragments('_': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.A': FqName@62) = null
-    packageFragments('java.lang.Int': FqName@63) = null
-    packageFragments('java.lang.Out': FqName@64) = null
-    packageFragments('java.lang.T': FqName@65) = null
-    packageFragments('java.lang.Unit': FqName@66) = null
-    packageFragments('java.lang._': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.A': FqName@69) = null
-    packageFragments('kotlin.Int': FqName@70) = null
-    packageFragments('kotlin.Out': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.Unit': FqName@73) = null
-    packageFragments('kotlin._': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('tests': FqName@77) = null
-    packageFragments('tests._checkType': FqName@78) = null
-    packageFragments('tests._checkType.A': FqName@79) = null
-    packageFragments('tests._checkType.Int': FqName@80) = null
-    packageFragments('tests._checkType.Out': FqName@81) = null
-    packageFragments('tests._checkType.T': FqName@82) = null
-    packageFragments('tests._checkType.Unit': FqName@83) = null
-    packageFragments('tests._checkType._': FqName@84) = null
-    topLevelClasses(JavaClassImpl@85['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('_': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('doOut': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('tests': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('doOut': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('tests': Name@96) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@61['lang'] {
-    classes('Exception': Name@86) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('doOut': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('doOut': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-null {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@198[5] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@199[5] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
deleted file mode 100644
index 860b4a3f24b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
+++ /dev/null
@@ -1,331 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('In': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('Unit': FqName@56) = null
-    packageFragments('_': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.A': FqName@62) = null
-    packageFragments('java.lang.In': FqName@63) = null
-    packageFragments('java.lang.Int': FqName@64) = null
-    packageFragments('java.lang.T': FqName@65) = null
-    packageFragments('java.lang.Unit': FqName@66) = null
-    packageFragments('java.lang._': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.A': FqName@69) = null
-    packageFragments('kotlin.In': FqName@70) = null
-    packageFragments('kotlin.Int': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.Unit': FqName@73) = null
-    packageFragments('kotlin._': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('tests': FqName@77) = null
-    packageFragments('tests._checkType': FqName@78) = null
-    packageFragments('tests._checkType.A': FqName@79) = null
-    packageFragments('tests._checkType.In': FqName@80) = null
-    packageFragments('tests._checkType.Int': FqName@81) = null
-    packageFragments('tests._checkType.T': FqName@82) = null
-    packageFragments('tests._checkType.Unit': FqName@83) = null
-    packageFragments('tests._checkType._': FqName@84) = null
-    topLevelClasses(JavaClassImpl@85['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Exception': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('_': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('doIn': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('tests': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('doIn': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('tests': Name@96) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@61['lang'] {
-    classes('Exception': Name@86) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('checkType': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('doIn': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('foo': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('Exception': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('checkType': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('doIn': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-null {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@198[5] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@199[5] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
deleted file mode 100644
index faa37f92325..00000000000
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
+++ /dev/null
@@ -1,856 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    defaultType = JetTypeImpl@3['AbstractCollection<1>']
-    functions('add': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['add'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@11['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-}
-
-LazyJavaClassDescriptor@21['ArrayList'] {
-    constructors = ArrayList@22[3] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'] } // through LazyJavaClassMemberScope@26
-    defaultType = JetTypeImpl@27['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
-    functionTypeForSamInterface = null
-    functions('add': Name@29) = ArrayList@30[2] { JavaMethodDescriptor@31['add'], JavaMethodDescriptor@32['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@29) = null // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['ArrayList']
-}
-
-LazyJavaClassDescriptor@37['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
-}
-
-LazyJavaClassDescriptor@42['Serializable'] {
-    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
-}
-
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
-    parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
-    supertypes = ArrayList@48[1] { LazyJavaClassifierType@49['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@20['AbstractList'] {
-    parameters = ArrayList@50[1] { LazyJavaTypeParameterDescriptor@51['E'] }
-    supertypes = ArrayList@52[2] { LazyJavaClassifierType@53['AbstractCollection<E>'], LazyJavaClassifierType@54['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@36['ArrayList'] {
-    parameters = ArrayList@55[1] { LazyJavaTypeParameterDescriptor@56['E'] }
-    supertypes = ArrayList@57[5] { LazyJavaClassifierType@58['AbstractList<E>'], LazyJavaClassifierType@59['List<E>'], LazyJavaClassifierType@60['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@41['RandomAccess'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { JetTypeImpl@63['Any'] }
-}
-
-LazyJavaClassTypeConstructor@45['Serializable'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { JetTypeImpl@63['Any'] }
-}
-
-LazyJavaClassifierType@53['AbstractCollection<E>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@68['AbstractCollection']
-    memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassifierType@58['AbstractList<E>'] {
-    arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['AbstractList']
-    memberScope = SubstitutingScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-}
-
-LazyJavaClassifierType@74['Cloneable'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['Cloneable']
-    memberScope = DeserializedClassMemberScope@77
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@79['Collection<? extends E>'] {
-    arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
-    classifier = JavaClassImpl@82['Collection']
-    memberScope = SubstitutingScope@83
-    nullable = 'false': Boolean@84
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@86['Collection<? extends E>'] {
-    arguments = ArrayList@87[1] { TypeProjectionImpl@88 }
-    classifier = JavaClassImpl@82['Collection']
-    memberScope = SubstitutingScope@89
-    nullable = 'true': Boolean@90
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@49['Collection<E>'] {
-    arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
-    classifier = JavaClassImpl@94['Collection']
-    memberScope = SubstitutingScope@95
-    typeConstructor = DeserializedClassTypeConstructor@85
-}
-
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@107['E'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@109['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@120['E'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@126['E'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@128['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@129['E'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@131['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@132['E'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['E']
-    nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@134['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
-LazyJavaClassifierType@149['E'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@112['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-}
-
-LazyJavaClassifierType@151['E'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@128['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@155['E'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@109['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@157['E'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@131['E']
-    nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-LazyJavaClassifierType@59['List<E>'] {
-    arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
-    classifier = JavaClassImpl@161['List']
-    memberScope = SubstitutingScope@162
-    typeConstructor = DeserializedClassTypeConstructor@163
-}
-
-LazyJavaClassifierType@54['List<E>'] {
-    arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
-    classifier = JavaClassImpl@166['List']
-    memberScope = SubstitutingScope@167
-    typeConstructor = DeserializedClassTypeConstructor@163
-}
-
-LazyJavaClassifierType@168['Object'] {
-    classifier = JavaClassImpl@169['Object']
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@171['Object'] {
-    classifier = JavaClassImpl@172['Object']
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@173['Object'] {
-    classifier = JavaClassImpl@174['Object']
-    typeConstructor = DeserializedClassTypeConstructor@170
-}
-
-LazyJavaClassifierType@60['RandomAccess'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaClassImpl@176['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
-}
-
-LazyJavaClassifierType@177['Serializable'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaClassImpl@179['Serializable']
-    memberScope = LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@180 {
-    packageFragments('<root>': FqName@181) = LazyJavaPackageFragment@182['<root>']
-    packageFragments('ArrayList': FqName@183) = null
-    packageFragments('Comparable': FqName@184) = null
-    packageFragments('Int': FqName@185) = null
-    packageFragments('List': FqName@186) = null
-    packageFragments('Long': FqName@187) = null
-    packageFragments('R': FqName@188) = null
-    packageFragments('S': FqName@189) = null
-    packageFragments('String': FqName@190) = null
-    packageFragments('T': FqName@191) = null
-    packageFragments('h': FqName@192) = null
-    packageFragments('h.ArrayList': FqName@193) = null
-    packageFragments('h.Comparable': FqName@194) = null
-    packageFragments('h.Int': FqName@195) = null
-    packageFragments('h.List': FqName@196) = null
-    packageFragments('h.Long': FqName@197) = null
-    packageFragments('h.R': FqName@198) = null
-    packageFragments('h.S': FqName@199) = null
-    packageFragments('h.String': FqName@200) = null
-    packageFragments('h.T': FqName@201) = null
-    packageFragments('java': FqName@202) = LazyJavaPackageFragment@203['java']
-    packageFragments('java.io': FqName@204) = LazyJavaPackageFragment@205['io']
-    packageFragments('java.lang': FqName@206) = LazyJavaPackageFragment@207['lang']
-    packageFragments('java.lang.ArrayList': FqName@208) = null
-    packageFragments('java.lang.Comparable': FqName@209) = null
-    packageFragments('java.lang.Int': FqName@210) = null
-    packageFragments('java.lang.List': FqName@211) = null
-    packageFragments('java.lang.Long': FqName@212) = null
-    packageFragments('java.lang.R': FqName@213) = null
-    packageFragments('java.lang.S': FqName@214) = null
-    packageFragments('java.lang.String': FqName@215) = null
-    packageFragments('java.lang.T': FqName@216) = null
-    packageFragments('java.util': FqName@217) = LazyJavaPackageFragment@218['util']
-    packageFragments('java.util.ArrayList': FqName@219) = null
-    packageFragments('java.util.Comparable': FqName@220) = null
-    packageFragments('java.util.Int': FqName@221) = null
-    packageFragments('java.util.List': FqName@222) = null
-    packageFragments('java.util.Long': FqName@223) = null
-    packageFragments('java.util.R': FqName@224) = null
-    packageFragments('java.util.S': FqName@225) = null
-    packageFragments('java.util.String': FqName@226) = null
-    packageFragments('java.util.T': FqName@227) = null
-    packageFragments('kotlin': FqName@228) = null
-    packageFragments('kotlin.ArrayList': FqName@229) = null
-    packageFragments('kotlin.Comparable': FqName@230) = null
-    packageFragments('kotlin.Int': FqName@231) = null
-    packageFragments('kotlin.List': FqName@232) = null
-    packageFragments('kotlin.Long': FqName@233) = null
-    packageFragments('kotlin.R': FqName@234) = null
-    packageFragments('kotlin.S': FqName@235) = null
-    packageFragments('kotlin.String': FqName@236) = null
-    packageFragments('kotlin.T': FqName@237) = null
-    packageFragments('kotlin.io': FqName@238) = null
-    packageFragments('kotlin.jvm': FqName@239) = null
-    topLevelClasses(JavaClassImpl@68['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@72['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@240['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
-    topLevelClasses(JavaClassImpl@241['List']) = LazyJavaClassDescriptor@242['List']
-    topLevelClasses(JavaClassImpl@176['RandomAccess']) = LazyJavaClassDescriptor@37['RandomAccess']
-    topLevelClasses(JavaClassImpl@179['Serializable']) = LazyJavaClassDescriptor@42['Serializable']
-}
-
-LazyJavaPackageFragment@203['java'] {
-    classes('lang': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('util': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('lang': Name@247) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('util': Name@248) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    memberIndex = computeMemberIndex$1@249 // through LazyPackageFragmentScopeForJavaPackage@244
-}
-
-LazyJavaPackageFragment@207['lang'] {
-    classes('ArrayList': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id1': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('list': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('newList': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('ArrayList': Name@250) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('both': Name@252) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elem': Name@253) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elemAndList': Name@254) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id': Name@255) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id1': Name@256) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('list': Name@257) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('newList': Name@258) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    memberIndex = computeMemberIndex$1@259 // through LazyPackageFragmentScopeForJavaPackage@251
-}
-
-LazyJavaPackageFragment@218['util'] {
-    classes('ArrayList': Name@260) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('Comparable': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('Int': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('List': Name@264) = LazyJavaClassDescriptor@242['List'] // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('Long': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('String': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('id': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('id1': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('list': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    classes('newList': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('ArrayList': Name@250) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('both': Name@252) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('elem': Name@253) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('elemAndList': Name@254) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('id': Name@255) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('id1': Name@256) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('list': Name@257) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('newList': Name@258) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    memberIndex = computeMemberIndex$1@267 // through LazyPackageFragmentScopeForJavaPackage@261
-}
-
-LazyJavaTypeParameterDescriptor@51['E'] {
-    defaultType = JetTypeImpl@268['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@269[1] { NullableType@270 }
-    upperBoundsAsType = NullableType@270
-}
-
-LazyJavaTypeParameterDescriptor@47['E'] {
-    defaultType = JetTypeImpl@271['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-    upperBounds = LinkedHashSet@272[1] { NullableType@273 }
-    upperBoundsAsType = NullableType@273
-}
-
-LazyJavaTypeParameterDescriptor@56['E'] {
-    defaultType = JetTypeImpl@274['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@275[1] { NullableType@276 }
-    upperBoundsAsType = NullableType@276
-}
-
-LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@112['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@278 {
-    resolve(JavaTypeParameterImpl@128['E']) = LazyJavaTypeParameterDescriptor@51['E']
-}
-
-LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@56['E']
-}
-
-LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@131['E']) = null
-}
-
-LazyJavaTypeParameterResolver@282 {
-    resolve(JavaTypeParameterImpl@98['E']) = null
-}
-
-LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@105['E']) = null
-}
-
-LazyJavaTypeParameterResolver@284 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
-}
-
-LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@122['E']) = null
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-null {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@484[2] { ResolutionCandidate@426, ResolutionCandidate@427 }
-    <name not found> = ArrayList@485[3] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432 }
-    <name not found> = ArrayList@486[3] { ResolutionCandidate@435, ResolutionCandidate@436, ResolutionCandidate@437 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
deleted file mode 100644
index 21d5b0a8289..00000000000
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
+++ /dev/null
@@ -1,956 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('MyList': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.Any': FqName@10) = null
-    packageFragments('a.Int': FqName@11) = null
-    packageFragments('a.MyList': FqName@12) = null
-    packageFragments('a.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.MyList': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Any': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.MyList': FqName@25) = null
-    packageFragments('kotlin.T': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('MyList': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('getMyList': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('getMyListToReadFrom': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('getMyListToWriteTo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('readFromMyList': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('use': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('useMyList': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('writeToMyList': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('MyList': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('getMyList': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('getMyListToReadFrom': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('getMyListToWriteTo': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('readFromMyList': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('use': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('useMyList': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('writeToMyList': Name@43) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-}
-
-null {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
deleted file mode 100644
index 4d645251853..00000000000
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
+++ /dev/null
@@ -1,433 +0,0 @@
-LazyJavaClassDescriptor@0['Collections'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functionTypeForSamInterface = null
-    functions('comparator': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@2
-    functions('comparator': Name@3) = EmptyList@4[empty] // through LazyJavaStaticClassScope@5
-    functions('max': Name@6) = ArrayList@7[3] { JavaMethodDescriptor@8['max'], JavaMethodDescriptor@9['max'], SamAdapterFunctionDescriptor@10['max'] } // through LazyJavaStaticClassScope@5
-    functions('max': Name@6) = EmptyList@4[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaStaticClassScope@5
-    nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@2
-    nestedClasses('Comparator': Name@14) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('Int': Name@15) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('List': Name@16) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('String': Name@17) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('comparator': Name@3) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('max': Name@6) = null // through LazyJavaClassMemberScope@2
-    properties('comparator': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@2
-    properties('comparator': Name@3) = EmptyList@4[empty] // through LazyJavaStaticClassScope@5
-    properties('max': Name@6) = EmptyList@4[empty] // through LazyJavaClassMemberScope@2
-    properties('max': Name@6) = EmptyList@4[empty] // through LazyJavaStaticClassScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@18['Collections']
-}
-
-LazyJavaClassDescriptor@19['Comparator'] {
-    functionTypeForSamInterface = JetTypeImpl@20['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['Comparator']
-}
-
-LazyJavaClassTypeConstructor@18['Collections'] {
-    supertypes = ArrayList@23[1] { JetTypeImpl@24['Any'] }
-}
-
-LazyJavaClassTypeConstructor@22['Comparator'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['T'] }
-    supertypes = ArrayList@27[1] { JetTypeImpl@24['Any'] }
-}
-
-LazyJavaClassifierType@28['Collection<? extends T>'] {
-    arguments = ArrayList@29[1] { TypeProjectionImpl@30 }
-    classifier = JavaClassImpl@31['Collection']
-    memberScope = SubstitutingScope@32
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Collection<? extends T>'] {
-    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    classifier = JavaClassImpl@38['Collection']
-    memberScope = SubstitutingScope@39
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@40['Collection<? extends T>'] {
-    arguments = ArrayList@41[1] { TypeProjectionImpl@42 }
-    classifier = JavaClassImpl@38['Collection']
-    memberScope = SubstitutingScope@43
-    nullable = 'true': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Collection<? extends T>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@31['Collection']
-    memberScope = SubstitutingScope@49
-    nullable = 'true': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@50['Comparable<? super T>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@53['Comparable']
-    memberScope = SubstitutingScope@54
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@56['Comparable<? super T>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@53['Comparable']
-    memberScope = SubstitutingScope@59
-    nullable = 'true': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@60['Comparator<? super T>'] {
-    arguments = ArrayList@61[1] { TypeProjectionImpl@62 }
-    classifier = JavaClassImpl@63['Comparator']
-    memberScope = SubstitutingScope@64
-    nullable = 'false': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@22['Comparator']
-}
-
-LazyJavaClassifierType@65['Comparator<? super T>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@63['Comparator']
-    memberScope = SubstitutingScope@68
-    nullable = 'true': Boolean@44
-    typeConstructor = LazyJavaClassTypeConstructor@22['Comparator']
-}
-
-LazyJavaClassifierType@69['Object'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Object']
-    memberScope = DeserializedClassMemberScope@72
-    nullable = 'false': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@73
-}
-
-LazyJavaClassifierType@74['Object'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@71['Object']
-    memberScope = DeserializedClassMemberScope@72
-    nullable = 'true': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@73
-}
-
-LazyJavaClassifierType@76['Object'] {
-    classifier = JavaClassImpl@77['Object']
-    typeConstructor = DeserializedClassTypeConstructor@73
-}
-
-LazyJavaClassifierType@78['Object'] {
-    classifier = JavaClassImpl@79['Object']
-    typeConstructor = DeserializedClassTypeConstructor@73
-}
-
-LazyJavaClassifierType@80['T'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@84['T'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@86['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@87['T'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@91['T'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@94['T'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@97['T'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@103['T'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@106['T'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@108['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@109['T'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@113['T'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@116['T'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@119['T'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@111['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@121['T'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@123['T'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@105['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@125['T'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@86['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@127['T'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@129['T'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@131['T'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@133['T'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@135['T'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@137['T'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@108['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@139['T'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@82['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@141['T'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@89['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaPackageFragmentProvider@143 {
-    packageFragments('<root>': FqName@144) = LazyJavaPackageFragment@145['<root>']
-    packageFragments('Comparator': FqName@146) = null
-    packageFragments('Int': FqName@147) = null
-    packageFragments('List': FqName@148) = null
-    packageFragments('String': FqName@149) = null
-    packageFragments('T': FqName@150) = null
-    packageFragments('b': FqName@151) = null
-    packageFragments('b.Comparator': FqName@152) = null
-    packageFragments('b.Int': FqName@153) = null
-    packageFragments('b.List': FqName@154) = null
-    packageFragments('b.String': FqName@155) = null
-    packageFragments('b.T': FqName@156) = null
-    packageFragments('java': FqName@157) = LazyJavaPackageFragment@158['java']
-    packageFragments('java.lang': FqName@159) = LazyJavaPackageFragment@160['lang']
-    packageFragments('java.lang.Comparator': FqName@161) = null
-    packageFragments('java.lang.Int': FqName@162) = null
-    packageFragments('java.lang.List': FqName@163) = null
-    packageFragments('java.lang.String': FqName@164) = null
-    packageFragments('java.lang.T': FqName@165) = null
-    packageFragments('java.util': FqName@166) = LazyJavaPackageFragment@167['util']
-    packageFragments('java.util.Collections': FqName@168) = null
-    packageFragments('java.util.Comparator': FqName@169) = null
-    packageFragments('java.util.Int': FqName@170) = null
-    packageFragments('java.util.List': FqName@171) = null
-    packageFragments('java.util.String': FqName@172) = null
-    packageFragments('java.util.T': FqName@173) = null
-    packageFragments('kotlin': FqName@174) = null
-    packageFragments('kotlin.Comparator': FqName@175) = null
-    packageFragments('kotlin.Int': FqName@176) = null
-    packageFragments('kotlin.List': FqName@177) = null
-    packageFragments('kotlin.String': FqName@178) = null
-    packageFragments('kotlin.T': FqName@179) = null
-    packageFragments('kotlin.io': FqName@180) = null
-    packageFragments('kotlin.jvm': FqName@181) = null
-    topLevelClasses(JavaClassImpl@182['Collections']) = LazyJavaClassDescriptor@0['Collections']
-    topLevelClasses(JavaClassImpl@183['Comparator']) = LazyJavaClassDescriptor@19['Comparator']
-    topLevelClasses(JavaClassImpl@184['List']) = LazyJavaClassDescriptor@185['List']
-}
-
-LazyJavaPackageFragment@158['java'] {
-    classes('lang': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('util': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('lang': Name@190) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('util': Name@191) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@187
-}
-
-LazyJavaPackageFragment@160['lang'] {
-    classes('comparator': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('max': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('comparator': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('max': Name@6) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@194 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@167['util'] {
-    classes('Collections': Name@195) = LazyJavaClassDescriptor@0['Collections'] // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Comparator': Name@14) = LazyJavaClassDescriptor@19['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('List': Name@16) = LazyJavaClassDescriptor@185['List'] // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('String': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('comparator': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('max': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('Collections': Name@197) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('comparator': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('max': Name@6) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@196
-}
-
-LazyJavaTypeParameterDescriptor@26['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-    upperBounds = LinkedHashSet@199[1] { NullableType@200 }
-    upperBoundsAsType = NullableType@200
-}
-
-LazyJavaTypeParameterDescriptor@201['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@202[1] { NullableType@203 }
-    upperBoundsAsType = NullableType@203
-}
-
-LazyJavaTypeParameterDescriptor@204['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-    upperBounds = LinkedHashSet@205[2] { DelegatingFlexibleType@206, DelegatingFlexibleType@207 }
-    upperBoundsAsType = NotNullType@208
-}
-
-LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@210['T']) = LazyJavaTypeParameterDescriptor@26['T']
-}
-
-LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@201['T']
-}
-
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@204['T']
-}
-
-LazyJavaTypeParameterResolver@215 {
-    resolve(JavaTypeParameterImpl@115['T']) = null
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@227, ResolutionCandidate@228 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@232[3] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@233 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
deleted file mode 100644
index 7cc802b3b58..00000000000
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
+++ /dev/null
@@ -1,218 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Int': FqName@50) = null
-    packageFragments('List': FqName@51) = null
-    packageFragments('T': FqName@52) = null
-    packageFragments('Unit': FqName@53) = null
-    packageFragments('a': FqName@54) = null
-    packageFragments('a.Int': FqName@55) = null
-    packageFragments('a.List': FqName@56) = null
-    packageFragments('a.T': FqName@57) = null
-    packageFragments('a.Unit': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Int': FqName@63) = null
-    packageFragments('java.lang.List': FqName@64) = null
-    packageFragments('java.lang.T': FqName@65) = null
-    packageFragments('java.lang.Unit': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.List': FqName@69) = null
-    packageFragments('kotlin.T': FqName@70) = null
-    packageFragments('kotlin.Unit': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    topLevelClasses(JavaClassImpl@74['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('Exception': Name@81) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('emptyList': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Exception': Name@81) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('emptyList': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@84) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-null {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@124[5] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = ArrayList@125[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
deleted file mode 100644
index 4de65608315..00000000000
--- a/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
+++ /dev/null
@@ -1,123 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T': FqName@3) = null
-    packageFragments('aaab': FqName@4) = null
-    packageFragments('bbb': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('java.lang.aaab': FqName@11) = null
-    packageFragments('java.lang.bbb': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.aaab': FqName@15) = null
-    packageFragments('kotlin.bbb': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('n': FqName@19) = null
-    packageFragments('n.T': FqName@20) = null
-    packageFragments('n.aaab': FqName@21) = null
-    packageFragments('n.bbb': FqName@22) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('aaab': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bbb': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('aaab': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bbb': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log b/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
deleted file mode 100644
index 96d4427fa76..00000000000
--- a/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
+++ /dev/null
@@ -1,195 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    defaultType = JetTypeImpl@1['J']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('Foo': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@3
-    functions('Foo': Name@4) = EmptyList@5[empty] // through LazyJavaStaticClassScope@6
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@3
-    nestedClasses('Foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('Sub': Name@10) = LazyJavaClassDescriptor@11['Sub'] // through LazyJavaClassMemberScope@3
-    nestedClasses('Super': Name@12) = LazyJavaClassDescriptor@13['Super'] // through LazyJavaClassMemberScope@3
-    properties('Foo': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@3
-    properties('Foo': Name@4) = EmptyList@5[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
-}
-
-LazyJavaClassDescriptor@11['Sub'] {
-    allDescriptors = ArrayList@15[3] { DeserializedSimpleFunctionDescriptor@16['hashCode'], DeserializedSimpleFunctionDescriptor@17['toString'], DeserializedSimpleFunctionDescriptor@18['equals'] } // through LazyJavaClassMemberScope@19
-    constructors = stdlib_emptyListClass@20[empty] // through LazyJavaClassMemberScope@19
-    defaultType = JetTypeImpl@21['Sub<1>']
-    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@19
-    functions('clone': Name@23) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    functions('equals': Name@24) = ArrayList@25[1] { DeserializedSimpleFunctionDescriptor@18['equals'] } // through LazyJavaClassMemberScope@19
-    functions('finalize': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    functions('getClass': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    functions('hashCode': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@16['hashCode'] } // through LazyJavaClassMemberScope@19
-    functions('notify': Name@30) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    functions('notifyAll': Name@31) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    functions('toString': Name@32) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@17['toString'] } // through LazyJavaClassMemberScope@19
-    functions('wait': Name@34) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@19
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@37['Sub']
-}
-
-LazyJavaClassDescriptor@13['Super'] {
-    defaultType = JetTypeImpl@38['Super<1>']
-    functions('clone': Name@23) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    functions('equals': Name@24) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@41['equals'] } // through LazyJavaClassMemberScope@39
-    functions('finalize': Name@26) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    functions('getClass': Name@27) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    functions('hashCode': Name@28) = ArrayList@42[1] { DeserializedSimpleFunctionDescriptor@43['hashCode'] } // through LazyJavaClassMemberScope@39
-    functions('notify': Name@30) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    functions('notifyAll': Name@31) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    functions('toString': Name@32) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@45['toString'] } // through LazyJavaClassMemberScope@39
-    functions('wait': Name@34) = EmptyList@5[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@47['Super']
-}
-
-LazyJavaClassTypeConstructor@14['J'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@37['Sub'] {
-    parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['T'] }
-    supertypes = ArrayList@53[1] { LazyJavaClassifierType@54['Super<T>'] }
-}
-
-LazyJavaClassTypeConstructor@47['Super'] {
-    parameters = ArrayList@55[1] { LazyJavaTypeParameterDescriptor@56['T'] }
-    supertypes = ArrayList@57[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassifierType@58['Object'] {
-    classifier = JavaClassImpl@59['Object']
-    typeConstructor = DeserializedClassTypeConstructor@60
-}
-
-LazyJavaClassifierType@61['Object'] {
-    classifier = JavaClassImpl@62['Object']
-    typeConstructor = DeserializedClassTypeConstructor@60
-}
-
-LazyJavaClassifierType@54['Super<T>'] {
-    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@65['Super']
-    memberScope = SubstitutingScope@66
-    nullable = 'false': Boolean@67
-    typeConstructor = LazyJavaClassTypeConstructor@47['Super']
-}
-
-LazyJavaClassifierType@68['T'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['T']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@72['T'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@70['T']
-    nullable = 'true': Boolean@74
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaPackageFragmentProvider@75 {
-    packageFragments('<root>': FqName@76) = LazyJavaPackageFragment@77['<root>']
-    packageFragments('Foo': FqName@78) = null
-    packageFragments('Sub': FqName@79) = null
-    packageFragments('Super': FqName@80) = null
-    packageFragments('T': FqName@81) = null
-    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    packageFragments('java.lang': FqName@84) = LazyJavaPackageFragment@85['lang']
-    packageFragments('java.lang.Sub': FqName@86) = null
-    packageFragments('java.lang.Super': FqName@87) = null
-    packageFragments('java.lang.T': FqName@88) = null
-    packageFragments('kotlin': FqName@89) = null
-    packageFragments('kotlin.Sub': FqName@90) = null
-    packageFragments('kotlin.Super': FqName@91) = null
-    packageFragments('kotlin.T': FqName@92) = null
-    packageFragments('kotlin.io': FqName@93) = null
-    packageFragments('kotlin.jvm': FqName@94) = null
-    packageFragments('p': FqName@95) = LazyJavaPackageFragment@96['p']
-    packageFragments('p.J': FqName@97) = null
-    topLevelClasses(JavaClassImpl@98['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@77['<root>'] {
-    classes('Foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Sub': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Super': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('p': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@102 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('Foo': Name@4) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('p': Name@103) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@83['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@102 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@85['lang'] {
-    classes('Foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@102 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('Foo': Name@4) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaPackageFragment@96['p'] {
-    classes('J': Name@111) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@102 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('J': Name@113) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaTypeParameterDescriptor@52['T'] {
-    defaultType = JetTypeImpl@115['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
-}
-
-LazyJavaTypeParameterDescriptor@56['T'] {
-    defaultType = JetTypeImpl@118['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
-    upperBounds = LinkedHashSet@120[1] { NullableType@121 }
-}
-
-LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@123['T']) = LazyJavaTypeParameterDescriptor@56['T']
-}
-
-LazyJavaTypeParameterResolver@124 {
-    resolve(JavaTypeParameterImpl@125['T']) = LazyJavaTypeParameterDescriptor@52['T']
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
-
-null {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-    <name not found> = EmptyList@5[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
deleted file mode 100644
index b3e7c528523..00000000000
--- a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,336 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassDescriptor@6['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@7['RandomAccess']
-}
-
-LazyJavaClassDescriptor@8['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@10[1] { LazyJavaTypeParameterDescriptor@11['E'] }
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@14[1] { LazyJavaTypeParameterDescriptor@15['E'] }
-    supertypes = ArrayList@16[2] { LazyJavaClassifierType@17['AbstractCollection<E>'], LazyJavaClassifierType@18['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['ArrayList'] {
-    parameters = ArrayList@19[1] { LazyJavaTypeParameterDescriptor@20['E'] }
-    supertypes = ArrayList@21[5] { LazyJavaClassifierType@22['AbstractList<E>'], LazyJavaClassifierType@23['List<E>'], LazyJavaClassifierType@24['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@7['RandomAccess'] {
-    parameters = ArrayList@25[empty]
-    supertypes = ArrayList@26[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['Serializable'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassifierType@17['AbstractCollection<E>'] {
-    arguments = ArrayList@30[1] { TypeProjectionImpl@31 }
-    classifier = JavaClassImpl@32['AbstractCollection']
-    memberScope = SubstitutingScope@33
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@22['AbstractList<E>'] {
-    arguments = ArrayList@35[1] { TypeProjectionImpl@36 }
-    classifier = JavaClassImpl@37['AbstractList']
-    memberScope = SubstitutingScope@38
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@39['Cloneable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Cloneable']
-    memberScope = DeserializedClassMemberScope@42
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@13['Collection<E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['Collection']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@49['E'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@51['E']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@53['E'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@57['E'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@51['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@18['List<E>'] {
-    arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
-    classifier = JavaClassImpl@80['List']
-    memberScope = SubstitutingScope@81
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@23['List<E>'] {
-    arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@85['List']
-    memberScope = SubstitutingScope@86
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@87['Object'] {
-    classifier = JavaClassImpl@88['Object']
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@24['RandomAccess'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@96
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@7['RandomAccess']
-}
-
-LazyJavaClassifierType@97['Serializable'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['Serializable']
-    memberScope = LazyJavaClassMemberScope@100
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@101 {
-    packageFragments('<root>': FqName@102) = LazyJavaPackageFragment@103['<root>']
-    packageFragments('ArrayList': FqName@104) = null
-    packageFragments('Int': FqName@105) = null
-    packageFragments('List': FqName@106) = null
-    packageFragments('T': FqName@107) = null
-    packageFragments('java': FqName@108) = LazyJavaPackageFragment@109['java']
-    packageFragments('java.io': FqName@110) = LazyJavaPackageFragment@111['io']
-    packageFragments('java.lang': FqName@112) = LazyJavaPackageFragment@113['lang']
-    packageFragments('java.lang.ArrayList': FqName@114) = null
-    packageFragments('java.lang.Int': FqName@115) = null
-    packageFragments('java.lang.List': FqName@116) = null
-    packageFragments('java.lang.T': FqName@117) = null
-    packageFragments('java.util': FqName@118) = LazyJavaPackageFragment@119['util']
-    packageFragments('java.util.ArrayList': FqName@120) = null
-    packageFragments('java.util.Int': FqName@121) = null
-    packageFragments('java.util.List': FqName@122) = null
-    packageFragments('java.util.T': FqName@123) = null
-    packageFragments('kotlin': FqName@124) = null
-    packageFragments('kotlin.ArrayList': FqName@125) = null
-    packageFragments('kotlin.Int': FqName@126) = null
-    packageFragments('kotlin.List': FqName@127) = null
-    packageFragments('kotlin.T': FqName@128) = null
-    packageFragments('kotlin.io': FqName@129) = null
-    packageFragments('kotlin.jvm': FqName@130) = null
-    packageFragments('n': FqName@131) = null
-    packageFragments('n.ArrayList': FqName@132) = null
-    packageFragments('n.Int': FqName@133) = null
-    packageFragments('n.List': FqName@134) = null
-    packageFragments('n.T': FqName@135) = null
-    topLevelClasses(JavaClassImpl@32['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@37['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@136['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@137['List']) = LazyJavaClassDescriptor@138['List']
-    topLevelClasses(JavaClassImpl@95['RandomAccess']) = LazyJavaClassDescriptor@6['RandomAccess']
-    topLevelClasses(JavaClassImpl@99['Serializable']) = LazyJavaClassDescriptor@8['Serializable']
-}
-
-LazyJavaPackageFragment@109['java'] {
-    classes('lang': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('util': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = Empty@142 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('lang': Name@143) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('util': Name@145) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    memberIndex = computeMemberIndex$1@146 // through LazyPackageFragmentScopeForJavaPackage@140
-}
-
-LazyJavaPackageFragment@113['lang'] {
-    classes('expected': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('reverse': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@142 // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('expected': Name@147) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('reverse': Name@149) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@148
-}
-
-LazyJavaPackageFragment@119['util'] {
-    classes('ArrayList': Name@151) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('Int': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('List': Name@154) = LazyJavaClassDescriptor@138['List'] // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('expected': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('reverse': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@142 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('expected': Name@147) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('reverse': Name@149) = EmptyList@144[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@152
-}
-
-LazyJavaTypeParameterDescriptor@20['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@156[1] { NullableType@157 }
-}
-
-LazyJavaTypeParameterDescriptor@11['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaTypeParameterDescriptor@15['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-}
-
-LazyJavaTypeParameterResolver@158 {
-    resolve(JavaTypeParameterImpl@159['E']) = LazyJavaTypeParameterDescriptor@20['E']
-}
-
-LazyJavaTypeParameterResolver@160 {
-    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@15['E']
-}
-
-LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@11['E']
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@166 }
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-    <name not found> = EmptyList@144[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log b/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
deleted file mode 100644
index 6b78d6c33fe..00000000000
--- a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt1293': FqName@19) = null
-    packageFragments('kt1293.Array': FqName@20) = null
-    packageFragments('kt1293.Int': FqName@21) = null
-    packageFragments('kt1293.String': FqName@22) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('arrayOfNulls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('requiresInt': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('arrayOfNulls': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('requiresInt': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log b/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
deleted file mode 100644
index b053b2b8f82..00000000000
--- a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
+++ /dev/null
@@ -1,804 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaClassDescriptor@2['AbstractMap'] {
-    functions('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['AbstractMap']
-}
-
-LazyJavaClassDescriptor@8['Appendable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
-}
-
-LazyJavaClassDescriptor@13['AutoCloseable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@17['Closeable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassDescriptor@21['FilterOutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@25['HashMap'] {
-    constructors = ArrayList@26[4] { JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'], ... } // through LazyJavaClassMemberScope@30
-    defaultType = JetTypeImpl@31['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@30
-    functionTypeForSamInterface = null
-    functions('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@30
-    nestedClasses('set': Name@3) = null // through LazyJavaClassMemberScope@30
-    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@35['HashMap']
-}
-
-LazyJavaClassDescriptor@36['OutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['OutputStream']
-}
-
-LazyJavaClassDescriptor@40['PrintStream'] {
-    defaultType = JetTypeImpl@41['PrintStream']
-    enumEntryIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@43
-    functions('println': Name@44) = ArrayList@45[10] { JavaMethodDescriptor@46['println'], JavaMethodDescriptor@47['println'], JavaMethodDescriptor@48['println'], ... } // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@43
-    nestedClassIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@43
-    nestedClasses('println': Name@44) = null // through LazyJavaClassMemberScope@43
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@51['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
-}
-
-LazyJavaClassDescriptor@53['Serializable'] {
-    functions('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassDescriptor@57['System'] {
-    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@60 // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaStaticClassScope@62
-    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@59
-    nestedClasses('out': Name@64) = null // through LazyJavaClassMemberScope@59
-    properties('out': Name@64) = ArrayList@65[1] { JavaPropertyDescriptor@66['out'] } // through LazyJavaStaticClassScope@62
-    properties('out': Name@64) = EmptyList@4[empty] // through LazyJavaClassMemberScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@67['System']
-}
-
-LazyJavaClassTypeConstructor@7['AbstractMap'] {
-    parameters = ArrayList@68[2] { LazyJavaTypeParameterDescriptor@69['K'], LazyJavaTypeParameterDescriptor@70['V'] }
-    supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@12['Appendable'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[1] { JetTypeImpl@75['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['AutoCloseable'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[1] { JetTypeImpl@75['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['Closeable'] {
-    parameters = ArrayList@78[empty]
-    supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
-    parameters = ArrayList@81[empty]
-    supertypes = ArrayList@82[1] { LazyJavaClassifierType@83['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@35['HashMap'] {
-    parameters = ArrayList@84[2] { LazyJavaTypeParameterDescriptor@85['K'], LazyJavaTypeParameterDescriptor@86['V'] }
-    supertypes = ArrayList@87[4] { LazyJavaClassifierType@88['AbstractMap<K, V>'], LazyJavaClassifierType@89['Map<K, V>'], LazyJavaClassifierType@90['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@39['OutputStream'] {
-    parameters = ArrayList@91[empty]
-    supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@52['PrintStream'] {
-    parameters = ArrayList@94[empty]
-    supertypes = ArrayList@95[3] { LazyJavaClassifierType@96['FilterOutputStream'], LazyJavaClassifierType@97['Appendable'], LazyJavaClassifierType@98['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@56['Serializable'] {
-    parameters = ArrayList@99[empty]
-    supertypes = ArrayList@100[1] { JetTypeImpl@75['Any'] }
-}
-
-LazyJavaClassTypeConstructor@67['System'] {
-    supertypes = ArrayList@101[1] { JetTypeImpl@75['Any'] }
-}
-
-LazyJavaClassifierType@88['AbstractMap<K, V>'] {
-    arguments = ArrayList@102[2] { TypeProjectionImpl@103, TypeProjectionImpl@104 }
-    classifier = JavaClassImpl@105['AbstractMap']
-    memberScope = SubstitutingScope@106
-    typeConstructor = LazyJavaClassTypeConstructor@7['AbstractMap']
-}
-
-LazyJavaClassifierType@97['Appendable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Appendable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
-}
-
-LazyJavaClassifierType@80['AutoCloseable'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['AutoCloseable']
-}
-
-LazyJavaClassifierType@90['Cloneable'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['Cloneable']
-    memberScope = DeserializedClassMemberScope@113
-    typeConstructor = DeserializedClassTypeConstructor@114
-}
-
-LazyJavaClassifierType@93['Closeable'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['Closeable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassifierType@98['Closeable'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['Closeable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassifierType@96['FilterOutputStream'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@120['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
-}
-
-LazyJavaClassifierType@121['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@122
-}
-
-LazyJavaClassifierType@123['K'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['K']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@128['K'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['K']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@131['K'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['K']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@134['K'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['K']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
-}
-
-LazyJavaClassifierType@138['K'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['K']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@141['K'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@133['K']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@144['K'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@125['K']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@146['K'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@130['K']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@148['K'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@136['K']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
-}
-
-LazyJavaClassifierType@150['K'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@140['K']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@152['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@153[2] { TypeProjectionImpl@154, TypeProjectionImpl@155 }
-    classifier = JavaClassImpl@156['Map']
-    memberScope = SubstitutingScope@157
-    nullable = 'false': Boolean@126
-    typeConstructor = DeserializedClassTypeConstructor@158
-}
-
-LazyJavaClassifierType@159['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@160[2] { TypeProjectionImpl@161, TypeProjectionImpl@162 }
-    classifier = JavaClassImpl@156['Map']
-    memberScope = SubstitutingScope@163
-    nullable = 'true': Boolean@143
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@72['Map<K, V>'] {
-    arguments = ArrayList@165[2] { TypeProjectionImpl@166, TypeProjectionImpl@167 }
-    classifier = JavaClassImpl@168['Map']
-    memberScope = SubstitutingScope@169
-    nullable = 'false': Boolean@126
-    typeConstructor = DeserializedClassTypeConstructor@158
-}
-
-LazyJavaClassifierType@89['Map<K, V>'] {
-    arguments = ArrayList@170[2] { TypeProjectionImpl@171, TypeProjectionImpl@172 }
-    classifier = JavaClassImpl@173['Map']
-    memberScope = SubstitutingScope@174
-    typeConstructor = DeserializedClassTypeConstructor@158
-}
-
-LazyJavaClassifierType@175['Object'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['Object']
-    nullable = 'false': Boolean@126
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@179['Object'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaClassImpl@177['Object']
-    nullable = 'true': Boolean@143
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@181['Object'] {
-    classifier = JavaClassImpl@182['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@183['Object'] {
-    classifier = JavaClassImpl@184['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@185['Object'] {
-    classifier = JavaClassImpl@186['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@187['Object'] {
-    classifier = JavaClassImpl@188['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@189['Object'] {
-    classifier = JavaClassImpl@190['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@191['Object'] {
-    classifier = JavaClassImpl@192['Object']
-    typeConstructor = DeserializedClassTypeConstructor@178
-}
-
-LazyJavaClassifierType@83['OutputStream'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@194['OutputStream']
-    memberScope = LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['OutputStream']
-}
-
-LazyJavaClassifierType@195['PrintStream'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@197['PrintStream']
-    memberScope = LazyJavaClassMemberScope@43
-    nullable = 'false': Boolean@126
-    typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
-}
-
-LazyJavaClassifierType@198['PrintStream'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@197['PrintStream']
-    nullable = 'true': Boolean@143
-    typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
-}
-
-LazyJavaClassifierType@200['Serializable'] {
-    arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@202['Serializable']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassifierType@203['String'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@205['String']
-    nullable = 'false': Boolean@126
-    typeConstructor = DeserializedClassTypeConstructor@206
-}
-
-LazyJavaClassifierType@207['String'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@205['String']
-    nullable = 'true': Boolean@143
-    typeConstructor = DeserializedClassTypeConstructor@206
-}
-
-LazyJavaClassifierType@209['V'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@211['V']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@213['V'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@215['V']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@216['V'] {
-    arguments = ArrayList@217[empty]
-    classifier = JavaTypeParameterImpl@218['V']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@219['V'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@221['V']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
-}
-
-LazyJavaClassifierType@223['V'] {
-    arguments = ArrayList@224[empty]
-    classifier = JavaTypeParameterImpl@225['V']
-    nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@226['V'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@225['V']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@228['V'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@218['V']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@230['V'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@221['V']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
-}
-
-LazyJavaClassifierType@232['V'] {
-    arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@211['V']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaClassifierType@234['V'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@215['V']
-    nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-}
-
-LazyJavaPackageFragmentProvider@236 {
-    packageFragments('<root>': FqName@237) = LazyJavaPackageFragment@238['<root>']
-    packageFragments('Any': FqName@239) = null
-    packageFragments('Array': FqName@240) = null
-    packageFragments('K': FqName@241) = null
-    packageFragments('MutableMap': FqName@242) = null
-    packageFragments('String': FqName@243) = null
-    packageFragments('System': FqName@244) = null
-    packageFragments('T': FqName@245) = null
-    packageFragments('Unit': FqName@246) = null
-    packageFragments('V': FqName@247) = null
-    packageFragments('a': FqName@248) = null
-    packageFragments('a.Any': FqName@249) = null
-    packageFragments('a.Array': FqName@250) = null
-    packageFragments('a.K': FqName@251) = null
-    packageFragments('a.MutableMap': FqName@252) = null
-    packageFragments('a.String': FqName@253) = null
-    packageFragments('a.System': FqName@254) = null
-    packageFragments('a.T': FqName@255) = null
-    packageFragments('a.Unit': FqName@256) = null
-    packageFragments('a.V': FqName@257) = null
-    packageFragments('java': FqName@258) = LazyJavaPackageFragment@259['java']
-    packageFragments('java.io': FqName@260) = LazyJavaPackageFragment@261['io']
-    packageFragments('java.lang': FqName@262) = LazyJavaPackageFragment@263['lang']
-    packageFragments('java.lang.Any': FqName@264) = null
-    packageFragments('java.lang.Array': FqName@265) = null
-    packageFragments('java.lang.K': FqName@266) = null
-    packageFragments('java.lang.MutableMap': FqName@267) = null
-    packageFragments('java.lang.String': FqName@268) = null
-    packageFragments('java.lang.System': FqName@269) = null
-    packageFragments('java.lang.T': FqName@270) = null
-    packageFragments('java.lang.Unit': FqName@271) = null
-    packageFragments('java.lang.V': FqName@272) = null
-    packageFragments('java.util': FqName@273) = LazyJavaPackageFragment@274['util']
-    packageFragments('java.util.HashMap': FqName@275) = null
-    packageFragments('kotlin': FqName@276) = null
-    packageFragments('kotlin.Any': FqName@277) = null
-    packageFragments('kotlin.Array': FqName@278) = null
-    packageFragments('kotlin.K': FqName@279) = null
-    packageFragments('kotlin.MutableMap': FqName@280) = null
-    packageFragments('kotlin.String': FqName@281) = null
-    packageFragments('kotlin.System': FqName@282) = null
-    packageFragments('kotlin.T': FqName@283) = null
-    packageFragments('kotlin.Unit': FqName@284) = null
-    packageFragments('kotlin.V': FqName@285) = null
-    packageFragments('kotlin.io': FqName@286) = null
-    packageFragments('kotlin.jvm': FqName@287) = null
-    topLevelClasses(JavaClassImpl@105['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
-    topLevelClasses(JavaClassImpl@108['Appendable']) = LazyJavaClassDescriptor@8['Appendable']
-    topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
-    topLevelClasses(JavaClassImpl@118['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
-    topLevelClasses(JavaClassImpl@120['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@288['HashMap']) = LazyJavaClassDescriptor@25['HashMap']
-    topLevelClasses(JavaClassImpl@194['OutputStream']) = LazyJavaClassDescriptor@36['OutputStream']
-    topLevelClasses(JavaClassImpl@197['PrintStream']) = LazyJavaClassDescriptor@40['PrintStream']
-    topLevelClasses(JavaClassImpl@202['Serializable']) = LazyJavaClassDescriptor@53['Serializable']
-    topLevelClasses(JavaClassImpl@289['System']) = LazyJavaClassDescriptor@57['System']
-}
-
-LazyJavaPackageFragment@259['java'] {
-    classes('lang': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@291
-    classes('util': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@291
-    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@291
-    functions('lang': Name@294) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@291
-    functions('util': Name@295) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@291
-    memberIndex = computeMemberIndex$1@296 // through LazyPackageFragmentScopeForJavaPackage@291
-}
-
-LazyJavaPackageFragment@263['lang'] {
-    classes('HashMap': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('System': Name@299) = LazyJavaClassDescriptor@57['System'] // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('extf': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('invoke': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('println': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('set': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('test': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('HashMap': Name@297) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('extf': Name@300) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('invoke': Name@301) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('println': Name@302) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('set': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('test': Name@303) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    memberIndex = computeMemberIndex$1@304 // through LazyPackageFragmentScopeForJavaPackage@298
-}
-
-LazyJavaPackageFragment@274['util'] {
-    classes('HashMap': Name@305) = LazyJavaClassDescriptor@25['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@306
-    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('HashMap': Name@307) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@306
-    memberIndex = computeMemberIndex$1@308 // through LazyPackageFragmentScopeForJavaPackage@306
-}
-
-LazyJavaTypeParameterDescriptor@85['K'] {
-    defaultType = JetTypeImpl@309['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@310[1] { NullableType@311 }
-}
-
-LazyJavaTypeParameterDescriptor@69['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@137
-}
-
-LazyJavaTypeParameterDescriptor@86['V'] {
-    defaultType = JetTypeImpl@312['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-    upperBounds = LinkedHashSet@313[1] { NullableType@314 }
-}
-
-LazyJavaTypeParameterDescriptor@70['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
-}
-
-LazyJavaTypeParameterResolver@315 {
-    resolve(JavaTypeParameterImpl@316['K']) = LazyJavaTypeParameterDescriptor@69['K']
-    resolve(JavaTypeParameterImpl@317['V']) = LazyJavaTypeParameterDescriptor@70['V']
-}
-
-LazyJavaTypeParameterResolver@318 {
-    resolve(JavaTypeParameterImpl@319['K']) = LazyJavaTypeParameterDescriptor@85['K']
-    resolve(JavaTypeParameterImpl@320['V']) = LazyJavaTypeParameterDescriptor@86['V']
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@416[10] { ResolutionCandidate@323, ResolutionCandidate@324, ResolutionCandidate@325, ... }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@445[4] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log b/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
deleted file mode 100644
index dd2a344d8df..00000000000
--- a/compiler/testData/diagnostics/tests/inference/kt6175.lazy.log
+++ /dev/null
@@ -1,290 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('List': FqName@53) = null
-    packageFragments('R': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.List': FqName@61) = null
-    packageFragments('java.lang.R': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Any': FqName@65) = null
-    packageFragments('kotlin.List': FqName@66) = null
-    packageFragments('kotlin.R': FqName@67) = null
-    packageFragments('kotlin.T': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('List': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('baz': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('brr': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('fail': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('bar': Name@76) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('baz': Name@77) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('brr': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('fail': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('baz': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('brr': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('fail': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('bar': Name@76) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('baz': Name@77) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('brr': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('fail': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('foo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[4] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@143[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/kt619.lazy.log b/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
deleted file mode 100644
index 98f1ee70954..00000000000
--- a/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Comparable': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Comparable': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Comparable': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Comparable': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@52[8] { ResolutionCandidate@45, ResolutionCandidate@46, ResolutionCandidate@47, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
deleted file mode 100644
index e244ff97e9c..00000000000
--- a/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
+++ /dev/null
@@ -1,504 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@16[1] { LazyJavaTypeParameterDescriptor@17['E'] }
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['E'] }
-    supertypes = ArrayList@22[2] { LazyJavaClassifierType@23['AbstractCollection<E>'], LazyJavaClassifierType@24['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['E'] }
-    supertypes = ArrayList@27[5] { LazyJavaClassifierType@28['AbstractList<E>'], LazyJavaClassifierType@29['List<E>'], LazyJavaClassifierType@30['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@13['RandomAccess'] {
-    supertypes = ArrayList@31[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@33[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassifierType@23['AbstractCollection<E>'] {
-    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
-    classifier = JavaClassImpl@36['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@28['AbstractList<E>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@39['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@40['Cloneable'] {
-    classifier = JavaClassImpl@41['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Collection<? extends E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['Collection']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['Collection<? extends E>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@46['Collection']
-    memberScope = SubstitutingScope@53
-    nullable = 'true': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@19['Collection<E>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@58['Collection']
-    memberScope = SubstitutingScope@59
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@89['E'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@24['List<E>'] {
-    arguments = ArrayList@93[1] { TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@95['List']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@29['List<E>'] {
-    classifier = JavaClassImpl@97['List']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@98['Object'] {
-    classifier = JavaClassImpl@99['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@101['Object'] {
-    classifier = JavaClassImpl@102['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@103['Object'] {
-    classifier = JavaClassImpl@104['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@30['RandomAccess'] {
-    classifier = JavaClassImpl@105['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassifierType@106['Serializable'] {
-    classifier = JavaClassImpl@107['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@108 {
-    packageFragments('<root>': FqName@109) = LazyJavaPackageFragment@110['<root>']
-    packageFragments('A': FqName@111) = null
-    packageFragments('Any': FqName@112) = null
-    packageFragments('Array': FqName@113) = null
-    packageFragments('ArrayList': FqName@114) = null
-    packageFragments('B': FqName@115) = null
-    packageFragments('C': FqName@116) = null
-    packageFragments('Int': FqName@117) = null
-    packageFragments('List': FqName@118) = null
-    packageFragments('MutableCollection': FqName@119) = null
-    packageFragments('String': FqName@120) = null
-    packageFragments('T': FqName@121) = null
-    packageFragments('a': FqName@122) = null
-    packageFragments('a.A': FqName@123) = null
-    packageFragments('a.Any': FqName@124) = null
-    packageFragments('a.Array': FqName@125) = null
-    packageFragments('a.ArrayList': FqName@126) = null
-    packageFragments('a.B': FqName@127) = null
-    packageFragments('a.C': FqName@128) = null
-    packageFragments('a.Int': FqName@129) = null
-    packageFragments('a.List': FqName@130) = null
-    packageFragments('a.MutableCollection': FqName@131) = null
-    packageFragments('a.String': FqName@132) = null
-    packageFragments('a.T': FqName@133) = null
-    packageFragments('java': FqName@134) = LazyJavaPackageFragment@135['java']
-    packageFragments('java.io': FqName@136) = LazyJavaPackageFragment@137['io']
-    packageFragments('java.lang': FqName@138) = LazyJavaPackageFragment@139['lang']
-    packageFragments('java.lang.A': FqName@140) = null
-    packageFragments('java.lang.Any': FqName@141) = null
-    packageFragments('java.lang.Array': FqName@142) = null
-    packageFragments('java.lang.ArrayList': FqName@143) = null
-    packageFragments('java.lang.B': FqName@144) = null
-    packageFragments('java.lang.C': FqName@145) = null
-    packageFragments('java.lang.Int': FqName@146) = null
-    packageFragments('java.lang.List': FqName@147) = null
-    packageFragments('java.lang.MutableCollection': FqName@148) = null
-    packageFragments('java.lang.String': FqName@149) = null
-    packageFragments('java.lang.T': FqName@150) = null
-    packageFragments('java.util': FqName@151) = LazyJavaPackageFragment@152['util']
-    packageFragments('java.util.A': FqName@153) = null
-    packageFragments('java.util.Any': FqName@154) = null
-    packageFragments('java.util.Array': FqName@155) = null
-    packageFragments('java.util.ArrayList': FqName@156) = null
-    packageFragments('java.util.B': FqName@157) = null
-    packageFragments('java.util.C': FqName@158) = null
-    packageFragments('java.util.Int': FqName@159) = null
-    packageFragments('java.util.List': FqName@160) = null
-    packageFragments('java.util.MutableCollection': FqName@161) = null
-    packageFragments('java.util.String': FqName@162) = null
-    packageFragments('java.util.T': FqName@163) = null
-    packageFragments('kotlin': FqName@164) = null
-    packageFragments('kotlin.A': FqName@165) = null
-    packageFragments('kotlin.Any': FqName@166) = null
-    packageFragments('kotlin.Array': FqName@167) = null
-    packageFragments('kotlin.ArrayList': FqName@168) = null
-    packageFragments('kotlin.B': FqName@169) = null
-    packageFragments('kotlin.C': FqName@170) = null
-    packageFragments('kotlin.Int': FqName@171) = null
-    packageFragments('kotlin.List': FqName@172) = null
-    packageFragments('kotlin.MutableCollection': FqName@173) = null
-    packageFragments('kotlin.String': FqName@174) = null
-    packageFragments('kotlin.T': FqName@175) = null
-    packageFragments('kotlin.io': FqName@176) = null
-    packageFragments('kotlin.jvm': FqName@177) = null
-    topLevelClasses(JavaClassImpl@36['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@39['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@178['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@179['List']) = LazyJavaClassDescriptor@180['List']
-    topLevelClasses(JavaClassImpl@105['RandomAccess']) = LazyJavaClassDescriptor@12['RandomAccess']
-    topLevelClasses(JavaClassImpl@107['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@135['java'] {
-    classes('lang': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('util': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('lang': Name@185) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('util': Name@187) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    memberIndex = computeMemberIndex$1@188 // through LazyPackageFragmentScopeForJavaPackage@182
-}
-
-LazyJavaPackageFragment@139['lang'] {
-    classes('ArrayList': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('arrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('cons': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('nil': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('toCollection': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('arrayList': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('cons': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('nil': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('toCollection': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@190
-}
-
-LazyJavaPackageFragment@152['util'] {
-    classes('Any': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('Array': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('ArrayList': Name@199) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('Int': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('List': Name@201) = LazyJavaClassDescriptor@180['List'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('MutableCollection': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('arrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('cons': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('nil': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('toCollection': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('arrayList': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('cons': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('nil': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('toCollection': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@204 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaTypeParameterDescriptor@26['E'] {
-    defaultType = JetTypeImpl@205['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
-}
-
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaTypeParameterResolver@208 {
-    resolve(JavaTypeParameterImpl@209['E']) = LazyJavaTypeParameterDescriptor@26['E']
-}
-
-LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@211['E']) = LazyJavaTypeParameterDescriptor@17['E']
-}
-
-LazyJavaTypeParameterResolver@212 {
-    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@21['E']
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-null {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@306[3] { ResolutionCandidate@281, ResolutionCandidate@282, ResolutionCandidate@283 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log b/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
deleted file mode 100644
index 463b9da927d..00000000000
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Iterable': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Array': FqName@11) = null
-    packageFragments('a.Int': FqName@12) = null
-    packageFragments('a.Iterable': FqName@13) = null
-    packageFragments('a.List': FqName@14) = null
-    packageFragments('a.R': FqName@15) = null
-    packageFragments('a.String': FqName@16) = null
-    packageFragments('a.T': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Array': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Iterable': FqName@24) = null
-    packageFragments('java.lang.List': FqName@25) = null
-    packageFragments('java.lang.R': FqName@26) = null
-    packageFragments('java.lang.String': FqName@27) = null
-    packageFragments('java.lang.T': FqName@28) = null
-    packageFragments('java.util': FqName@29) = LazyJavaPackageFragment@30['util']
-    packageFragments('java.util.Array': FqName@31) = null
-    packageFragments('java.util.Int': FqName@32) = null
-    packageFragments('java.util.Iterable': FqName@33) = null
-    packageFragments('java.util.List': FqName@34) = null
-    packageFragments('java.util.R': FqName@35) = null
-    packageFragments('java.util.String': FqName@36) = null
-    packageFragments('java.util.T': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.Array': FqName@39) = null
-    packageFragments('kotlin.Int': FqName@40) = null
-    packageFragments('kotlin.Iterable': FqName@41) = null
-    packageFragments('kotlin.List': FqName@42) = null
-    packageFragments('kotlin.R': FqName@43) = null
-    packageFragments('kotlin.String': FqName@44) = null
-    packageFragments('kotlin.T': FqName@45) = null
-    packageFragments('kotlin.io': FqName@46) = null
-    packageFragments('kotlin.jvm': FqName@47) = null
-    topLevelClasses(JavaClassImpl@48['List']) = LazyJavaClassDescriptor@49['List']
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('util': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('util': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@30['util'] {
-    classes('Array': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Iterable': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('List': Name@66) = LazyJavaClassDescriptor@49['List'] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('String': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-}
-
-null {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@132[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
-    <name not found> = ArrayList@133[2] { ResolutionCandidate@101, ResolutionCandidate@102 }
-    <name not found> = ArrayList@134[7] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@135[7] { ResolutionCandidate@119, ResolutionCandidate@120, ResolutionCandidate@121, ... }
-    <name not found> = ArrayList@136[7] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116, ... }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
deleted file mode 100644
index ff82dc181c9..00000000000
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-LazyJavaClassDescriptor@0['Iterable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Iterable']
-}
-
-LazyJavaClassTypeConstructor@1['Iterable'] {
-    parameters = ArrayList@2[1] { LazyJavaTypeParameterDescriptor@3['T'] }
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Collection': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('List': FqName@9) = null
-    packageFragments('R': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('i': FqName@13) = null
-    packageFragments('i.Collection': FqName@14) = null
-    packageFragments('i.Int': FqName@15) = null
-    packageFragments('i.List': FqName@16) = null
-    packageFragments('i.R': FqName@17) = null
-    packageFragments('i.String': FqName@18) = null
-    packageFragments('i.T': FqName@19) = null
-    packageFragments('i.java': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.Collection': FqName@25) = null
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('java.lang.Iterable': FqName@27) = null
-    packageFragments('java.lang.List': FqName@28) = null
-    packageFragments('java.lang.R': FqName@29) = null
-    packageFragments('java.lang.String': FqName@30) = null
-    packageFragments('java.lang.T': FqName@31) = null
-    packageFragments('java.util': FqName@32) = LazyJavaPackageFragment@33['util']
-    packageFragments('java.util.Collection': FqName@34) = null
-    packageFragments('java.util.Int': FqName@35) = null
-    packageFragments('java.util.List': FqName@36) = null
-    packageFragments('java.util.R': FqName@37) = null
-    packageFragments('java.util.String': FqName@38) = null
-    packageFragments('java.util.T': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.Collection': FqName@41) = null
-    packageFragments('kotlin.Int': FqName@42) = null
-    packageFragments('kotlin.List': FqName@43) = null
-    packageFragments('kotlin.R': FqName@44) = null
-    packageFragments('kotlin.String': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    topLevelClasses(JavaClassImpl@49['Collection']) = LazyJavaClassDescriptor@50['Collection']
-    topLevelClasses(JavaClassImpl@51['Iterable']) = LazyJavaClassDescriptor@0['Iterable']
-    topLevelClasses(JavaClassImpl@52['List']) = LazyJavaClassDescriptor@53['List']
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('util': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('util': Name@60) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('Iterable': Name@62) = LazyJavaClassDescriptor@0['Iterable'] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('java': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('map1': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('foo': Name@64) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('map1': Name@66) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@33['util'] {
-    classes('Collection': Name@68) = LazyJavaClassDescriptor@50['Collection'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Int': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('List': Name@71) = LazyJavaClassDescriptor@53['List'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('String': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('java': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('map1': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@64) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('map1': Name@66) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaTypeParameterDescriptor@3['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-    upperBounds = LinkedHashSet@75[1] { NullableType@76 }
-}
-
-LazyJavaTypeParameterResolver@77 {
-    resolve(JavaTypeParameterImpl@78['T']) = LazyJavaTypeParameterDescriptor@3['T']
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@96, ResolutionCandidate@97 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
deleted file mode 100644
index 82fdc35f5b8..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
+++ /dev/null
@@ -1,201 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['List<1>']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('List': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('b': FqName@56) = null
-    packageFragments('b.A': FqName@57) = null
-    packageFragments('b.Int': FqName@58) = null
-    packageFragments('b.List': FqName@59) = null
-    packageFragments('b.T': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.A': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.List': FqName@67) = null
-    packageFragments('java.lang.T': FqName@68) = null
-    packageFragments('kotlin': FqName@69) = null
-    packageFragments('kotlin.A': FqName@70) = null
-    packageFragments('kotlin.Int': FqName@71) = null
-    packageFragments('kotlin.List': FqName@72) = null
-    packageFragments('kotlin.T': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    topLevelClasses(JavaClassImpl@76['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('lang': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Exception': Name@83) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Exception': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('bar': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@112[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
deleted file mode 100644
index 0286e245911..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
+++ /dev/null
@@ -1,857 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Any': FqName@53) = null
-    packageFragments('Boolean': FqName@54) = null
-    packageFragments('Collection': FqName@55) = null
-    packageFragments('Int': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('Z': FqName@58) = null
-    packageFragments('h': FqName@59) = null
-    packageFragments('h.A': FqName@60) = null
-    packageFragments('h.Any': FqName@61) = null
-    packageFragments('h.Boolean': FqName@62) = null
-    packageFragments('h.Collection': FqName@63) = null
-    packageFragments('h.Int': FqName@64) = null
-    packageFragments('h.T': FqName@65) = null
-    packageFragments('h.Z': FqName@66) = null
-    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    packageFragments('java.lang.A': FqName@71) = null
-    packageFragments('java.lang.Any': FqName@72) = null
-    packageFragments('java.lang.Boolean': FqName@73) = null
-    packageFragments('java.lang.Collection': FqName@74) = null
-    packageFragments('java.lang.Int': FqName@75) = null
-    packageFragments('java.lang.T': FqName@76) = null
-    packageFragments('java.lang.Z': FqName@77) = null
-    packageFragments('kotlin': FqName@78) = null
-    packageFragments('kotlin.A': FqName@79) = null
-    packageFragments('kotlin.Any': FqName@80) = null
-    packageFragments('kotlin.Boolean': FqName@81) = null
-    packageFragments('kotlin.Collection': FqName@82) = null
-    packageFragments('kotlin.Int': FqName@83) = null
-    packageFragments('kotlin.T': FqName@84) = null
-    packageFragments('kotlin.Z': FqName@85) = null
-    packageFragments('kotlin.io': FqName@86) = null
-    packageFragments('kotlin.jvm': FqName@87) = null
-    topLevelClasses(JavaClassImpl@88['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@68['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@92) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@70['lang'] {
-    classes('Exception': Name@95) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('compareTo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('id': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('newA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('plus': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('toBeOrNot': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('use': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('Exception': Name@95) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('compareTo': Name@97) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@98) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('id': Name@99) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('newA': Name@100) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('plus': Name@101) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('toBeOrNot': Name@102) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('use': Name@103) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[2] { ResolutionCandidate@356, ResolutionCandidate@357 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[2] { ResolutionCandidate@360, ResolutionCandidate@361 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[2] { ResolutionCandidate@364, ResolutionCandidate@365 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[4] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[4] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
-
-null {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@467[2] { ResolutionCandidate@364, ResolutionCandidate@365 }
-    <name not found> = ArrayList@468[2] { ResolutionCandidate@360, ResolutionCandidate@361 }
-    <name not found> = ArrayList@469[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
-    <name not found> = ArrayList@470[2] { ResolutionCandidate@356, ResolutionCandidate@357 }
-    <name not found> = ArrayList@471[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
-    <name not found> = ArrayList@472[5] { ResolutionCandidate@381, ResolutionCandidate@382, ResolutionCandidate@383, ... }
-    <name not found> = ArrayList@473[5] { ResolutionCandidate@376, ResolutionCandidate@377, ResolutionCandidate@378, ... }
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-    <name not found> = EmptyList@93[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
deleted file mode 100644
index 21c9d60583b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
+++ /dev/null
@@ -1,80 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.C': FqName@9) = null
-    packageFragments('a.Int': FqName@10) = null
-    packageFragments('a.String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
deleted file mode 100644
index fd4af45666e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
+++ /dev/null
@@ -1,110 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('K': FqName@6) = null
-    packageFragments('MutableMap': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('V': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.K': FqName@15) = null
-    packageFragments('java.lang.MutableMap': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.V': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.K': FqName@21) = null
-    packageFragments('kotlin.MutableMap': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.V': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('MutableMap': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
deleted file mode 100644
index 696e8ff8205..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
+++ /dev/null
@@ -1,539 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassDescriptor@19['ArrayList'] {
-    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
-    defaultType = JetTypeImpl@25['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
-    functionTypeForSamInterface = null
-    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
-    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
-}
-
-LazyJavaClassDescriptor@35['RandomAccess'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
-    supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@18['AbstractList'] {
-    parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
-    supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@34['ArrayList'] {
-    parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
-    supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@39['RandomAccess'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@43['Serializable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@51['AbstractCollection<E>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@66['AbstractCollection']
-    memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@56['AbstractList<E>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['AbstractList']
-    memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassifierType@72['Cloneable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Cloneable']
-    memberScope = DeserializedClassMemberScope@75
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Collection<? extends E>'] {
-    arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@81
-    nullable = 'false': Boolean@82
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@84['Collection<? extends E>'] {
-    arguments = ArrayList@85[1] { TypeProjectionImpl@86 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@87
-    nullable = 'true': Boolean@88
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@47['Collection<E>'] {
-    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    classifier = JavaClassImpl@92['Collection']
-    memberScope = SubstitutingScope@93
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@108['E'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@120['E'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@133['E'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@149['E'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@151['E'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@155['E'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@57['List<E>'] {
-    arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
-    classifier = JavaClassImpl@159['List']
-    memberScope = SubstitutingScope@160
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@52['List<E>'] {
-    arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
-    classifier = JavaClassImpl@164['List']
-    memberScope = SubstitutingScope@165
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@166['Object'] {
-    classifier = JavaClassImpl@167['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@169['Object'] {
-    classifier = JavaClassImpl@170['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@171['Object'] {
-    classifier = JavaClassImpl@172['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@58['RandomAccess'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@174['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassifierType@175['Serializable'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['Serializable']
-    memberScope = LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@178 {
-    packageFragments('<root>': FqName@179) = LazyJavaPackageFragment@180['<root>']
-    packageFragments('A': FqName@181) = null
-    packageFragments('B': FqName@182) = null
-    packageFragments('Int': FqName@183) = null
-    packageFragments('Iterable': FqName@184) = null
-    packageFragments('List': FqName@185) = null
-    packageFragments('Pair': FqName@186) = null
-    packageFragments('T': FqName@187) = null
-    packageFragments('a': FqName@188) = null
-    packageFragments('a.A': FqName@189) = null
-    packageFragments('a.B': FqName@190) = null
-    packageFragments('a.Int': FqName@191) = null
-    packageFragments('a.Iterable': FqName@192) = null
-    packageFragments('a.List': FqName@193) = null
-    packageFragments('a.Pair': FqName@194) = null
-    packageFragments('a.T': FqName@195) = null
-    packageFragments('java': FqName@196) = LazyJavaPackageFragment@197['java']
-    packageFragments('java.io': FqName@198) = LazyJavaPackageFragment@199['io']
-    packageFragments('java.lang': FqName@200) = LazyJavaPackageFragment@201['lang']
-    packageFragments('java.lang.A': FqName@202) = null
-    packageFragments('java.lang.B': FqName@203) = null
-    packageFragments('java.lang.Int': FqName@204) = null
-    packageFragments('java.lang.Iterable': FqName@205) = null
-    packageFragments('java.lang.List': FqName@206) = null
-    packageFragments('java.lang.Pair': FqName@207) = null
-    packageFragments('java.lang.T': FqName@208) = null
-    packageFragments('java.util': FqName@209) = LazyJavaPackageFragment@210['util']
-    packageFragments('java.util.ArrayList': FqName@211) = null
-    packageFragments('kotlin': FqName@212) = null
-    packageFragments('kotlin.A': FqName@213) = null
-    packageFragments('kotlin.B': FqName@214) = null
-    packageFragments('kotlin.Int': FqName@215) = null
-    packageFragments('kotlin.Iterable': FqName@216) = null
-    packageFragments('kotlin.List': FqName@217) = null
-    packageFragments('kotlin.Pair': FqName@218) = null
-    packageFragments('kotlin.T': FqName@219) = null
-    packageFragments('kotlin.io': FqName@220) = null
-    packageFragments('kotlin.jvm': FqName@221) = null
-    topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@222['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
-    topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
-}
-
-LazyJavaPackageFragment@197['java'] {
-    classes('lang': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    classes('util': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('lang': Name@227) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('util': Name@228) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    memberIndex = computeMemberIndex$1@229 // through LazyPackageFragmentScopeForJavaPackage@224
-}
-
-LazyJavaPackageFragment@201['lang'] {
-    classes('ArrayList': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('Pair': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('ArrayList': Name@230) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('Pair': Name@232) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    memberIndex = computeMemberIndex$1@233 // through LazyPackageFragmentScopeForJavaPackage@231
-}
-
-LazyJavaPackageFragment@210['util'] {
-    classes('ArrayList': Name@234) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@235
-    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@235
-    functions('ArrayList': Name@236) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@235
-    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@235
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@238['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@239[1] { NullableType@240 }
-    upperBoundsAsType = NullableType@240
-}
-
-LazyJavaTypeParameterDescriptor@49['E'] {
-    defaultType = JetTypeImpl@241['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@242[1] { NullableType@243 }
-    upperBoundsAsType = NullableType@243
-}
-
-LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@244['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@245[1] { NullableType@246 }
-    upperBoundsAsType = NullableType@246
-}
-
-LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@248['E']) = LazyJavaTypeParameterDescriptor@49['E']
-}
-
-LazyJavaTypeParameterResolver@249 {
-    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@45['E']
-}
-
-LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@54['E']
-}
-
-LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@254 {
-    resolve(JavaTypeParameterImpl@104['E']) = null
-}
-
-LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
-}
-
-LazyJavaTypeParameterResolver@256 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
-}
-
-LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@307[2] { ResolutionCandidate@290, ResolutionCandidate@291 }
-    <name not found> = ArrayList@308[3] { ResolutionCandidate@294, ResolutionCandidate@295, ResolutionCandidate@296 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
deleted file mode 100644
index 0fd8374accc..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
+++ /dev/null
@@ -1,221 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['R']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('B': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('MyFunc': FqName@55) = null
-    packageFragments('R': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('j': FqName@58) = null
-    packageFragments('j.A': FqName@59) = null
-    packageFragments('j.B': FqName@60) = null
-    packageFragments('j.Int': FqName@61) = null
-    packageFragments('j.MyFunc': FqName@62) = null
-    packageFragments('j.R': FqName@63) = null
-    packageFragments('j.T': FqName@64) = null
-    packageFragments('java': FqName@65) = LazyJavaPackageFragment@66['java']
-    packageFragments('java.lang': FqName@67) = LazyJavaPackageFragment@68['lang']
-    packageFragments('java.lang.A': FqName@69) = null
-    packageFragments('java.lang.B': FqName@70) = null
-    packageFragments('java.lang.Int': FqName@71) = null
-    packageFragments('java.lang.MyFunc': FqName@72) = null
-    packageFragments('java.lang.R': FqName@73) = null
-    packageFragments('java.lang.T': FqName@74) = null
-    packageFragments('kotlin': FqName@75) = null
-    packageFragments('kotlin.A': FqName@76) = null
-    packageFragments('kotlin.B': FqName@77) = null
-    packageFragments('kotlin.Int': FqName@78) = null
-    packageFragments('kotlin.MyFunc': FqName@79) = null
-    packageFragments('kotlin.R': FqName@80) = null
-    packageFragments('kotlin.T': FqName@81) = null
-    packageFragments('kotlin.io': FqName@82) = null
-    packageFragments('kotlin.jvm': FqName@83) = null
-    topLevelClasses(JavaClassImpl@84['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@66['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@68['lang'] {
-    classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('id': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('id': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@129[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@130[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
deleted file mode 100644
index 795c58ec125..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-    <name not found> = JetTypeImpl@2['T']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('aaa': FqName@8) = null
-    packageFragments('aaa.Int': FqName@9) = null
-    packageFragments('aaa.T': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('id': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('id': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
deleted file mode 100644
index e1c1d58f2ef..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
+++ /dev/null
@@ -1,545 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-    <name not found> = StringValue@2
-}
-
-LazyJavaClassDescriptor@3['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@4['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@5['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractList']
-}
-
-LazyJavaClassDescriptor@7['ArrayList'] {
-    constructors = ArrayList@8[3] { JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], JavaConstructorDescriptor@11['<init>'] } // through LazyJavaClassMemberScope@12
-    defaultType = JetTypeImpl@13['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@14['ArrayList']
-}
-
-LazyJavaClassDescriptor@15['Exception'] {
-    constructors = ArrayList@16[5] { JavaConstructorDescriptor@17['<init>'], JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], ... } // through LazyJavaClassMemberScope@20
-    defaultType = JetTypeImpl@21['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@22['Exception']
-}
-
-LazyJavaClassDescriptor@23['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['RandomAccess']
-}
-
-LazyJavaClassDescriptor@25['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@26['Serializable']
-}
-
-LazyJavaClassTypeConstructor@4['AbstractCollection'] {
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@6['AbstractList'] {
-    parameters = ArrayList@29[1] { LazyJavaTypeParameterDescriptor@30['E'] }
-    supertypes = ArrayList@31[2] { LazyJavaClassifierType@32['AbstractCollection<E>'], LazyJavaClassifierType@33['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@14['ArrayList'] {
-    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['E'] }
-    supertypes = ArrayList@36[5] { LazyJavaClassifierType@37['AbstractList<E>'], LazyJavaClassifierType@38['List<E>'], LazyJavaClassifierType@39['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@22['Exception'] {
-    parameters = ArrayList@40[empty]
-    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Throwable'] }
-}
-
-LazyJavaClassifierType@32['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@43['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@4['AbstractCollection']
-}
-
-LazyJavaClassifierType@37['AbstractList<E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractList']
-}
-
-LazyJavaClassifierType@47['Cloneable'] {
-    classifier = JavaClassImpl@48['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['Collection<? extends E>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@53['Collection']
-    memberScope = SubstitutingScope@54
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@57['Collection<? extends E>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@53['Collection']
-    memberScope = SubstitutingScope@60
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@28['Collection<E>'] {
-    classifier = JavaClassImpl@63['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@82['E'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@33['List<E>'] {
-    arguments = ArrayList@86[1] { TypeProjectionImpl@87 }
-    classifier = JavaClassImpl@88['List']
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@38['List<E>'] {
-    classifier = JavaClassImpl@90['List']
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@91['Object'] {
-    classifier = JavaClassImpl@92['Object']
-    typeConstructor = DeserializedClassTypeConstructor@93
-}
-
-LazyJavaClassifierType@39['RandomAccess'] {
-    classifier = JavaClassImpl@94['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@24['RandomAccess']
-}
-
-LazyJavaClassifierType@95['Serializable'] {
-    classifier = JavaClassImpl@96['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@26['Serializable']
-}
-
-LazyJavaClassifierType@97['String'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@101['String'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@104['String'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@107['String'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@109['String'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@99['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@111['String'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@113['Throwable'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@117['Throwable'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@120['Throwable'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@123['Throwable'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@119['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@125['Throwable'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@122['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@127['Throwable'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@115['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@130['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaPackageFragmentProvider@131 {
-    packageFragments('<root>': FqName@132) = LazyJavaPackageFragment@133['<root>']
-    packageFragments('A': FqName@134) = null
-    packageFragments('Any': FqName@135) = null
-    packageFragments('B': FqName@136) = null
-    packageFragments('Int': FqName@137) = null
-    packageFragments('K': FqName@138) = null
-    packageFragments('List': FqName@139) = null
-    packageFragments('Map': FqName@140) = null
-    packageFragments('Pair': FqName@141) = null
-    packageFragments('String': FqName@142) = null
-    packageFragments('T': FqName@143) = null
-    packageFragments('V': FqName@144) = null
-    packageFragments('b': FqName@145) = null
-    packageFragments('b.A': FqName@146) = null
-    packageFragments('b.Any': FqName@147) = null
-    packageFragments('b.B': FqName@148) = null
-    packageFragments('b.Int': FqName@149) = null
-    packageFragments('b.K': FqName@150) = null
-    packageFragments('b.List': FqName@151) = null
-    packageFragments('b.Map': FqName@152) = null
-    packageFragments('b.Pair': FqName@153) = null
-    packageFragments('b.String': FqName@154) = null
-    packageFragments('b.T': FqName@155) = null
-    packageFragments('b.V': FqName@156) = null
-    packageFragments('java': FqName@157) = LazyJavaPackageFragment@158['java']
-    packageFragments('java.io': FqName@159) = LazyJavaPackageFragment@160['io']
-    packageFragments('java.lang': FqName@161) = LazyJavaPackageFragment@162['lang']
-    packageFragments('java.lang.A': FqName@163) = null
-    packageFragments('java.lang.Any': FqName@164) = null
-    packageFragments('java.lang.B': FqName@165) = null
-    packageFragments('java.lang.Int': FqName@166) = null
-    packageFragments('java.lang.K': FqName@167) = null
-    packageFragments('java.lang.List': FqName@168) = null
-    packageFragments('java.lang.Map': FqName@169) = null
-    packageFragments('java.lang.Pair': FqName@170) = null
-    packageFragments('java.lang.String': FqName@171) = null
-    packageFragments('java.lang.T': FqName@172) = null
-    packageFragments('java.lang.V': FqName@173) = null
-    packageFragments('java.util': FqName@174) = LazyJavaPackageFragment@175['util']
-    packageFragments('java.util.ArrayList': FqName@176) = null
-    packageFragments('kotlin': FqName@177) = null
-    packageFragments('kotlin.A': FqName@178) = null
-    packageFragments('kotlin.Any': FqName@179) = null
-    packageFragments('kotlin.B': FqName@180) = null
-    packageFragments('kotlin.Int': FqName@181) = null
-    packageFragments('kotlin.K': FqName@182) = null
-    packageFragments('kotlin.List': FqName@183) = null
-    packageFragments('kotlin.Map': FqName@184) = null
-    packageFragments('kotlin.Pair': FqName@185) = null
-    packageFragments('kotlin.String': FqName@186) = null
-    packageFragments('kotlin.T': FqName@187) = null
-    packageFragments('kotlin.V': FqName@188) = null
-    packageFragments('kotlin.io': FqName@189) = null
-    packageFragments('kotlin.jvm': FqName@190) = null
-    topLevelClasses(JavaClassImpl@43['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@46['AbstractList']) = LazyJavaClassDescriptor@5['AbstractList']
-    topLevelClasses(JavaClassImpl@191['ArrayList']) = LazyJavaClassDescriptor@7['ArrayList']
-    topLevelClasses(JavaClassImpl@192['Exception']) = LazyJavaClassDescriptor@15['Exception']
-    topLevelClasses(JavaClassImpl@94['RandomAccess']) = LazyJavaClassDescriptor@23['RandomAccess']
-    topLevelClasses(JavaClassImpl@96['Serializable']) = LazyJavaClassDescriptor@25['Serializable']
-}
-
-LazyJavaPackageFragment@158['java'] {
-    classes('lang': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('util': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('lang': Name@197) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('util': Name@199) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@194
-}
-
-LazyJavaPackageFragment@162['lang'] {
-    classes('ArrayList': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Exception': Name@203) = LazyJavaClassDescriptor@15['Exception'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('foo': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('mapOf': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('println': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('query': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('to': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('ArrayList': Name@201) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('Exception': Name@203) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('foo': Name@204) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('mapOf': Name@205) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('println': Name@206) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('query': Name@207) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('to': Name@208) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
-}
-
-LazyJavaPackageFragment@175['util'] {
-    classes('ArrayList': Name@210) = LazyJavaClassDescriptor@7['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@211
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('ArrayList': Name@212) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@211
-}
-
-LazyJavaTypeParameterDescriptor@35['E'] {
-    defaultType = JetTypeImpl@214['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-    upperBounds = LinkedHashSet@215[1] { NullableType@216 }
-}
-
-LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['E']) = LazyJavaTypeParameterDescriptor@35['E']
-}
-
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@30['E']
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[4] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[4] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[4] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
-
-null {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@304[3] { ResolutionCandidate@270, ResolutionCandidate@271, ResolutionCandidate@272 }
-    <name not found> = ArrayList@305[5] { ResolutionCandidate@280, ResolutionCandidate@281, ResolutionCandidate@282, ... }
-    <name not found> = ArrayList@306[5] { ResolutionCandidate@275, ResolutionCandidate@276, ResolutionCandidate@277, ... }
-    <name not found> = ArrayList@307[5] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@287, ... }
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-    <name not found> = EmptyList@198[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
deleted file mode 100644
index c0bc9aaa5a9..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
+++ /dev/null
@@ -1,108 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.F': FqName@6) = null
-    packageFragments('a.Int': FqName@7) = null
-    packageFragments('a.String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('F': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('r': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('F': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('r': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
deleted file mode 100644
index 7a1269292f3..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
+++ /dev/null
@@ -1,432 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.A': FqName@9) = null
-    packageFragments('a.B': FqName@10) = null
-    packageFragments('a.Int': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('bar': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('baz': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('doInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('bar': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('baz': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('doInt': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-null {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
deleted file mode 100644
index 5f2b024aece..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
+++ /dev/null
@@ -1,334 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Any']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Any': FqName@53) = null
-    packageFragments('Array': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('List': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('a': FqName@58) = null
-    packageFragments('a.Any': FqName@59) = null
-    packageFragments('a.Array': FqName@60) = null
-    packageFragments('a.Int': FqName@61) = null
-    packageFragments('a.List': FqName@62) = null
-    packageFragments('a.T': FqName@63) = null
-    packageFragments('a.a': FqName@64) = null
-    packageFragments('java': FqName@65) = LazyJavaPackageFragment@66['java']
-    packageFragments('java.lang': FqName@67) = LazyJavaPackageFragment@68['lang']
-    packageFragments('java.lang.Any': FqName@69) = null
-    packageFragments('java.lang.Array': FqName@70) = null
-    packageFragments('java.lang.Int': FqName@71) = null
-    packageFragments('java.lang.List': FqName@72) = null
-    packageFragments('java.lang.T': FqName@73) = null
-    packageFragments('kotlin': FqName@74) = null
-    packageFragments('kotlin.Any': FqName@75) = null
-    packageFragments('kotlin.Array': FqName@76) = null
-    packageFragments('kotlin.Int': FqName@77) = null
-    packageFragments('kotlin.List': FqName@78) = null
-    packageFragments('kotlin.T': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    topLevelClasses(JavaClassImpl@82['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@66['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@68['lang'] {
-    classes('Exception': Name@89) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('a': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('emptyList': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('makeNullable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('bar': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('emptyList': Name@93) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('foo': Name@94) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('makeNullable': Name@95) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[2] { ResolutionCandidate@151, ResolutionCandidate@152 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-null {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@184[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@147, ResolutionCandidate@148 }
-    <name not found> = ArrayList@186[2] { ResolutionCandidate@151, ResolutionCandidate@152 }
-    <name not found> = ArrayList@187[5] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = ArrayList@188[8] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
deleted file mode 100644
index 73610f755f6..00000000000
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
+++ /dev/null
@@ -1,288 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[2] { LazyJavaClassifierType@21['AbstractCollection<E>'], LazyJavaClassifierType@22['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['E'] }
-    supertypes = ArrayList@25[5] { LazyJavaClassifierType@26['AbstractList<E>'], LazyJavaClassifierType@27['List<E>'], LazyJavaClassifierType@28['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@13['RandomAccess'] {
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@31[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@32['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@26['AbstractList<E>'] {
-    arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
-    classifier = JavaClassImpl@35['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@36['Cloneable'] {
-    classifier = JavaClassImpl@37['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@38
-}
-
-LazyJavaClassifierType@39['Collection<? extends E>'] {
-    arguments = ArrayList@40[1] { TypeProjectionImpl@41 }
-    classifier = JavaClassImpl@42['Collection']
-    memberScope = SubstitutingScope@43
-    nullable = 'false': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Collection<? extends E>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@42['Collection']
-    memberScope = SubstitutingScope@49
-    nullable = 'true': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@17['Collection<E>'] {
-    classifier = JavaClassImpl@52['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@53['E'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@57['E'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@69['E'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@63['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@55['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@59['E']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaClassifierType@22['List<E>'] {
-    arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
-    classifier = JavaClassImpl@77['List']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@27['List<E>'] {
-    classifier = JavaClassImpl@79['List']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@80['Object'] {
-    classifier = JavaClassImpl@81['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@83['Object'] {
-    classifier = JavaClassImpl@84['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@85['Object'] {
-    classifier = JavaClassImpl@86['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@28['RandomAccess'] {
-    classifier = JavaClassImpl@87['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassifierType@88['Serializable'] {
-    classifier = JavaClassImpl@89['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@90 {
-    packageFragments('<root>': FqName@91) = LazyJavaPackageFragment@92['<root>']
-    packageFragments('ArrayList': FqName@93) = null
-    packageFragments('List': FqName@94) = null
-    packageFragments('S': FqName@95) = null
-    packageFragments('String': FqName@96) = null
-    packageFragments('java': FqName@97) = LazyJavaPackageFragment@98['java']
-    packageFragments('java.io': FqName@99) = LazyJavaPackageFragment@100['io']
-    packageFragments('java.lang': FqName@101) = LazyJavaPackageFragment@102['lang']
-    packageFragments('java.lang.ArrayList': FqName@103) = null
-    packageFragments('java.lang.List': FqName@104) = null
-    packageFragments('java.lang.S': FqName@105) = null
-    packageFragments('java.lang.String': FqName@106) = null
-    packageFragments('java.util': FqName@107) = LazyJavaPackageFragment@108['util']
-    packageFragments('java.util.ArrayList': FqName@109) = null
-    packageFragments('java.util.List': FqName@110) = null
-    packageFragments('java.util.S': FqName@111) = null
-    packageFragments('java.util.String': FqName@112) = null
-    packageFragments('kotlin': FqName@113) = null
-    packageFragments('kotlin.ArrayList': FqName@114) = null
-    packageFragments('kotlin.List': FqName@115) = null
-    packageFragments('kotlin.S': FqName@116) = null
-    packageFragments('kotlin.String': FqName@117) = null
-    packageFragments('kotlin.io': FqName@118) = null
-    packageFragments('kotlin.jvm': FqName@119) = null
-    packageFragments('noInformationForParameter': FqName@120) = null
-    packageFragments('noInformationForParameter.ArrayList': FqName@121) = null
-    packageFragments('noInformationForParameter.List': FqName@122) = null
-    packageFragments('noInformationForParameter.S': FqName@123) = null
-    packageFragments('noInformationForParameter.String': FqName@124) = null
-    topLevelClasses(JavaClassImpl@32['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@35['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@125['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@126['List']) = LazyJavaClassDescriptor@127['List']
-    topLevelClasses(JavaClassImpl@87['RandomAccess']) = LazyJavaClassDescriptor@12['RandomAccess']
-    topLevelClasses(JavaClassImpl@89['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@98['java'] {
-    classes('lang': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('util': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    deserializedPackageScope = Empty@131 // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('lang': Name@132) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('util': Name@134) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@129
-}
-
-LazyJavaPackageFragment@102['lang'] {
-    classes('ArrayList': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('newList': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    deserializedPackageScope = Empty@131 // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('ArrayList': Name@136) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('newList': Name@138) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    memberIndex = computeMemberIndex$1@139 // through LazyPackageFragmentScopeForJavaPackage@137
-}
-
-LazyJavaPackageFragment@108['util'] {
-    classes('ArrayList': Name@140) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('List': Name@142) = LazyJavaClassDescriptor@127['List'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('String': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('newList': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = Empty@131 // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('ArrayList': Name@136) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('newList': Name@138) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@141
-}
-
-LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@145['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@146[1] { NullableType@147 }
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-LazyJavaTypeParameterResolver@148 {
-    resolve(JavaTypeParameterImpl@149['E']) = LazyJavaTypeParameterDescriptor@24['E']
-}
-
-LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@59['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-null {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@164[3] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
deleted file mode 100644
index 363423d29ba..00000000000
--- a/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('D': FqName@3) = null
-    packageFragments('JV': FqName@4) = null
-    packageFragments('R': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('java.lang.JV': FqName@13) = null
-    packageFragments('java.lang.R': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.D': FqName@18) = null
-    packageFragments('kotlin.JV': FqName@19) = null
-    packageFragments('kotlin.R': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('o': FqName@25) = null
-    packageFragments('o.D': FqName@26) = null
-    packageFragments('o.JV': FqName@27) = null
-    packageFragments('o.R': FqName@28) = null
-    packageFragments('o.String': FqName@29) = null
-    packageFragments('o.Unit': FqName@30) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('JV': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('accept': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('JV': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('accept': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/opposite.lazy.log b/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
deleted file mode 100644
index 6f79736dd71..00000000000
--- a/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Relation<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Persistent': FqName@5) = null
-    packageFragments('PersistentFactory': FqName@6) = null
-    packageFragments('Source': FqName@7) = null
-    packageFragments('Target': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.Persistent': FqName@10) = null
-    packageFragments('a.PersistentFactory': FqName@11) = null
-    packageFragments('a.Relation': FqName@12) = null
-    packageFragments('a.Source': FqName@13) = null
-    packageFragments('a.Target': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Persistent': FqName@19) = null
-    packageFragments('java.lang.PersistentFactory': FqName@20) = null
-    packageFragments('java.lang.Source': FqName@21) = null
-    packageFragments('java.lang.Target': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Persistent': FqName@24) = null
-    packageFragments('kotlin.PersistentFactory': FqName@25) = null
-    packageFragments('kotlin.Source': FqName@26) = null
-    packageFragments('kotlin.Target': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('Relation': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('sources': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('targets': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Relation': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
deleted file mode 100644
index df38cd9e411..00000000000
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
+++ /dev/null
@@ -1,230 +0,0 @@
-LazyJavaClassDescriptor@0['Collections'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('emptyList': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['emptyList'] } // through LazyJavaStaticClassScope@6
-    functions('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('emptyList': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('emptyList': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Collections']
-}
-
-LazyJavaClassTypeConstructor@11['Collections'] {
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['List<T>'] {
-    arguments = ArrayList@15[1] { TypeProjectionImpl@16 }
-    classifier = JavaClassImpl@17['List']
-    memberScope = SubstitutingScope@18
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['List<T>'] {
-    arguments = ArrayList@22[1] { TypeProjectionImpl@23 }
-    classifier = JavaClassImpl@17['List']
-    memberScope = SubstitutingScope@24
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaClassifierType@27['Object'] {
-    classifier = JavaClassImpl@28['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['T'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'false': Boolean@19
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@34['T'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'false': Boolean@19
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@37['T'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'true': Boolean@25
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@39['T'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'true': Boolean@25
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('Collections': FqName@44) = null
-    packageFragments('Int': FqName@45) = null
-    packageFragments('List': FqName@46) = null
-    packageFragments('T': FqName@47) = null
-    packageFragments('a': FqName@48) = null
-    packageFragments('a.Collections': FqName@49) = null
-    packageFragments('a.Int': FqName@50) = null
-    packageFragments('a.List': FqName@51) = null
-    packageFragments('a.T': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Collections': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.List': FqName@59) = null
-    packageFragments('java.lang.T': FqName@60) = null
-    packageFragments('java.util': FqName@61) = LazyJavaPackageFragment@62['util']
-    packageFragments('java.util.Collections': FqName@63) = null
-    packageFragments('java.util.Int': FqName@64) = null
-    packageFragments('java.util.List': FqName@65) = null
-    packageFragments('java.util.T': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Collections': FqName@68) = null
-    packageFragments('kotlin.Int': FqName@69) = null
-    packageFragments('kotlin.List': FqName@70) = null
-    packageFragments('kotlin.T': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    topLevelClasses(JavaClassImpl@74['Collections']) = LazyJavaClassDescriptor@0['Collections']
-    topLevelClasses(JavaClassImpl@75['List']) = LazyJavaClassDescriptor@76['List']
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('util': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('lang': Name@81) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('util': Name@82) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('g': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('g': Name@84) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@62['util'] {
-    classes('Collections': Name@87) = LazyJavaClassDescriptor@0['Collections'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Int': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('List': Name@90) = LazyJavaClassDescriptor@76['List'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('g': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('g': Name@84) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaTypeParameterDescriptor@92['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@93[1] { NullableType@94 }
-    upperBoundsAsType = NullableType@94
-}
-
-LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@92['T']
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
deleted file mode 100644
index cbbd470531b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
+++ /dev/null
@@ -1,214 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('Comparable': FqName@51) = null
-    packageFragments('Int': FqName@52) = null
-    packageFragments('Item': FqName@53) = null
-    packageFragments('String': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.Comparable': FqName@61) = null
-    packageFragments('java.lang.Int': FqName@62) = null
-    packageFragments('java.lang.Item': FqName@63) = null
-    packageFragments('java.lang.String': FqName@64) = null
-    packageFragments('java.lang.T': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Any': FqName@67) = null
-    packageFragments('kotlin.Comparable': FqName@68) = null
-    packageFragments('kotlin.Int': FqName@69) = null
-    packageFragments('kotlin.Item': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    topLevelClasses(JavaClassImpl@75['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Comparable': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Exception': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('compareBy': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('name': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('rating': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Exception': Name@79) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('compareBy': Name@82) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@79) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('compareBy': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('name': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('rating': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('Exception': Name@79) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('compareBy': Name@82) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-null {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
deleted file mode 100644
index 52d8fa78dd4..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('Iterable': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('i': FqName@7) = null
-    packageFragments('i.Boolean': FqName@8) = null
-    packageFragments('i.Int': FqName@9) = null
-    packageFragments('i.Iterable': FqName@10) = null
-    packageFragments('i.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Boolean': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Iterable': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Boolean': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Iterable': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('from': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('where': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('from': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('where': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@71[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@72[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
deleted file mode 100644
index 069a7cfa9e7..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
+++ /dev/null
@@ -1,160 +0,0 @@
-LazyJavaClassDescriptor@0['ArrayList'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Iterable': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('TItem': FqName@8) = null
-    packageFragments('TResult': FqName@9) = null
-    packageFragments('i': FqName@10) = null
-    packageFragments('i.Boolean': FqName@11) = null
-    packageFragments('i.Int': FqName@12) = null
-    packageFragments('i.Iterable': FqName@13) = null
-    packageFragments('i.String': FqName@14) = null
-    packageFragments('i.TItem': FqName@15) = null
-    packageFragments('i.TResult': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Boolean': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.Iterable': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('java.lang.TItem': FqName@25) = null
-    packageFragments('java.lang.TResult': FqName@26) = null
-    packageFragments('java.util': FqName@27) = LazyJavaPackageFragment@28['util']
-    packageFragments('java.util.ArrayList': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.Boolean': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.Iterable': FqName@33) = null
-    packageFragments('kotlin.String': FqName@34) = null
-    packageFragments('kotlin.TItem': FqName@35) = null
-    packageFragments('kotlin.TResult': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    topLevelClasses(JavaClassImpl@39['ArrayList']) = LazyJavaClassDescriptor@0['ArrayList']
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('util': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('util': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('select': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('where': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('select': Name@48) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('where': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@28['util'] {
-    classes('ArrayList': Name@52) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('ArrayList': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@123[7] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@124[7] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@125[7] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
deleted file mode 100644
index 7107d6d4e3a..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('d': FqName@7) = null
-    packageFragments('d.Array': FqName@8) = null
-    packageFragments('d.List': FqName@9) = null
-    packageFragments('d.String': FqName@10) = null
-    packageFragments('d.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.List': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.List': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('asList': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('asList': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
deleted file mode 100644
index b74e78b4669..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Iterable': FqName@4) = null
-    packageFragments('List': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('d': FqName@8) = null
-    packageFragments('d.Int': FqName@9) = null
-    packageFragments('d.Iterable': FqName@10) = null
-    packageFragments('d.List': FqName@11) = null
-    packageFragments('d.R': FqName@12) = null
-    packageFragments('d.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Iterable': FqName@19) = null
-    packageFragments('java.lang.List': FqName@20) = null
-    packageFragments('java.lang.R': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.Iterable': FqName@25) = null
-    packageFragments('kotlin.List': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.T': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('map': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('fold': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('map': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
deleted file mode 100644
index 484fa5c198e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('d': FqName@5) = null
-    packageFragments('d.Any': FqName@6) = null
-    packageFragments('d.T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Any': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('sure': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('sure': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
deleted file mode 100644
index faac680b00e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
+++ /dev/null
@@ -1,182 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('MutableCollection': FqName@5) = null
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('d': FqName@9) = null
-    packageFragments('d.Any': FqName@10) = null
-    packageFragments('d.Boolean': FqName@11) = null
-    packageFragments('d.MutableCollection': FqName@12) = null
-    packageFragments('d.MutableList': FqName@13) = null
-    packageFragments('d.String': FqName@14) = null
-    packageFragments('d.T': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.Boolean': FqName@21) = null
-    packageFragments('java.lang.MutableCollection': FqName@22) = null
-    packageFragments('java.lang.MutableList': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('java.lang.T': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.Boolean': FqName@28) = null
-    packageFragments('kotlin.MutableCollection': FqName@29) = null
-    packageFragments('kotlin.MutableList': FqName@30) = null
-    packageFragments('kotlin.String': FqName@31) = null
-    packageFragments('kotlin.T': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('filter': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('filterToMy': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('startsWith': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filter': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filterToMy': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('startsWith': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@134[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
deleted file mode 100644
index 4867d9a6953..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
+++ /dev/null
@@ -1,269 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('E': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('List': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('j': FqName@9) = null
-    packageFragments('j.Any': FqName@10) = null
-    packageFragments('j.Array': FqName@11) = null
-    packageFragments('j.E': FqName@12) = null
-    packageFragments('j.Int': FqName@13) = null
-    packageFragments('j.List': FqName@14) = null
-    packageFragments('j.T': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.Array': FqName@21) = null
-    packageFragments('java.lang.E': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.List': FqName@24) = null
-    packageFragments('java.lang.T': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.Array': FqName@28) = null
-    packageFragments('kotlin.E': FqName@29) = null
-    packageFragments('kotlin.Int': FqName@30) = null
-    packageFragments('kotlin.List': FqName@31) = null
-    packageFragments('kotlin.T': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('sure': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('toArray': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Array': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('sure': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('toArray': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
deleted file mode 100644
index b63392e8fac..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
+++ /dev/null
@@ -1,336 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@6['AbstractList'] {
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassDescriptor@10['ArrayList'] {
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functionTypeForSamInterface = null
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@12
-    nestedClasses('plus': Name@1) = null // through LazyJavaClassMemberScope@12
-    properties('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@15['ArrayList']
-}
-
-LazyJavaClassDescriptor@16['RandomAccess'] {
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['RandomAccess']
-}
-
-LazyJavaClassDescriptor@20['Serializable'] {
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    properties('plus': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaClassTypeConstructor@5['AbstractCollection'] {
-    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
-    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@9['AbstractList'] {
-    parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
-    supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@15['ArrayList'] {
-    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@19['RandomAccess'] {
-    parameters = ArrayList@39[empty]
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Serializable'] {
-    parameters = ArrayList@42[empty]
-    supertypes = ArrayList@43[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@31['AbstractCollection<E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['AbstractCollection']
-    memberScope = SubstitutingScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassifierType@36['AbstractList<E>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['AbstractList']
-    memberScope = SubstitutingScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassifierType@52['Cloneable'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['Cloneable']
-    memberScope = DeserializedClassMemberScope@55
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@27['Collection<E>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@59['Collection']
-    memberScope = SubstitutingScope@60
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@67['E'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@69['E']
-    nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@69['E']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@37['List<E>'] {
-    arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
-    classifier = JavaClassImpl@94['List']
-    memberScope = SubstitutingScope@95
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@32['List<E>'] {
-    arguments = ArrayList@97[1] { TypeProjectionImpl@98 }
-    classifier = JavaClassImpl@99['List']
-    memberScope = SubstitutingScope@100
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@101['Object'] {
-    classifier = JavaClassImpl@102['Object']
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@104['Object'] {
-    classifier = JavaClassImpl@105['Object']
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@106['Object'] {
-    classifier = JavaClassImpl@107['Object']
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@38['RandomAccess'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['RandomAccess']
-}
-
-LazyJavaClassifierType@110['Serializable'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['Serializable']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@113 {
-    packageFragments('<root>': FqName@114) = LazyJavaPackageFragment@115['<root>']
-    packageFragments('ArrayList': FqName@116) = null
-    packageFragments('Int': FqName@117) = null
-    packageFragments('Iterable': FqName@118) = null
-    packageFragments('List': FqName@119) = null
-    packageFragments('String': FqName@120) = null
-    packageFragments('T': FqName@121) = null
-    packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
-    packageFragments('java.io': FqName@124) = LazyJavaPackageFragment@125['io']
-    packageFragments('java.lang': FqName@126) = LazyJavaPackageFragment@127['lang']
-    packageFragments('java.lang.ArrayList': FqName@128) = null
-    packageFragments('java.lang.Int': FqName@129) = null
-    packageFragments('java.lang.Iterable': FqName@130) = null
-    packageFragments('java.lang.List': FqName@131) = null
-    packageFragments('java.lang.String': FqName@132) = null
-    packageFragments('java.lang.T': FqName@133) = null
-    packageFragments('java.util': FqName@134) = LazyJavaPackageFragment@135['util']
-    packageFragments('java.util.ArrayList': FqName@136) = null
-    packageFragments('kotlin': FqName@137) = null
-    packageFragments('kotlin.ArrayList': FqName@138) = null
-    packageFragments('kotlin.Int': FqName@139) = null
-    packageFragments('kotlin.Iterable': FqName@140) = null
-    packageFragments('kotlin.List': FqName@141) = null
-    packageFragments('kotlin.String': FqName@142) = null
-    packageFragments('kotlin.T': FqName@143) = null
-    packageFragments('kotlin.io': FqName@144) = null
-    packageFragments('kotlin.jvm': FqName@145) = null
-    packageFragments('n': FqName@146) = null
-    packageFragments('n.ArrayList': FqName@147) = null
-    packageFragments('n.Int': FqName@148) = null
-    packageFragments('n.Iterable': FqName@149) = null
-    packageFragments('n.List': FqName@150) = null
-    packageFragments('n.String': FqName@151) = null
-    packageFragments('n.T': FqName@152) = null
-    topLevelClasses(JavaClassImpl@46['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@50['AbstractList']) = LazyJavaClassDescriptor@6['AbstractList']
-    topLevelClasses(JavaClassImpl@153['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
-    topLevelClasses(JavaClassImpl@109['RandomAccess']) = LazyJavaClassDescriptor@16['RandomAccess']
-    topLevelClasses(JavaClassImpl@112['Serializable']) = LazyJavaClassDescriptor@20['Serializable']
-}
-
-LazyJavaPackageFragment@123['java'] {
-    classes('lang': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('util': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    deserializedPackageScope = Empty@157 // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('lang': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('util': Name@159) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@155
-}
-
-LazyJavaPackageFragment@127['lang'] {
-    classes('arrayList': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('plus': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@157 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('arrayList': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('plus': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@135['util'] {
-    classes('ArrayList': Name@164) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@157 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('ArrayList': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@165
-}
-
-LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-    upperBounds = LinkedHashSet@168[1] { NullableType@169 }
-}
-
-LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@29['E']
-}
-
-LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@25['E']
-}
-
-LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@34['E']
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@196[2] { ResolutionCandidate@190, ResolutionCandidate@191 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
deleted file mode 100644
index 5396f05e8d1..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
+++ /dev/null
@@ -1,87 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('j': FqName@6) = null
-    packageFragments('j.Int': FqName@7) = null
-    packageFragments('j.P': FqName@8) = null
-    packageFragments('j.T': FqName@9) = null
-    packageFragments('j.Unit': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('java.lang.Unit': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.Unit': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('x': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
deleted file mode 100644
index 1546a2f612a..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
+++ /dev/null
@@ -1,700 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@16[1] { LazyJavaTypeParameterDescriptor@17['E'] }
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['E'] }
-    supertypes = ArrayList@22[2] { LazyJavaClassifierType@23['AbstractCollection<E>'], LazyJavaClassifierType@24['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['E'] }
-    supertypes = ArrayList@27[5] { LazyJavaClassifierType@28['AbstractList<E>'], LazyJavaClassifierType@29['List<E>'], LazyJavaClassifierType@30['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@13['RandomAccess'] {
-    supertypes = ArrayList@31[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@33[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassifierType@23['AbstractCollection<E>'] {
-    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
-    classifier = JavaClassImpl@36['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@28['AbstractList<E>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@39['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@40['Cloneable'] {
-    classifier = JavaClassImpl@41['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Collection<? extends E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['Collection']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['Collection<? extends E>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@46['Collection']
-    memberScope = SubstitutingScope@53
-    nullable = 'true': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@19['Collection<E>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@58['Collection']
-    memberScope = SubstitutingScope@59
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@60['E'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@66['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@73['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@89['E'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@62['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaClassifierType@24['List<E>'] {
-    arguments = ArrayList@93[1] { TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@95['List']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@29['List<E>'] {
-    classifier = JavaClassImpl@97['List']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@98['Object'] {
-    classifier = JavaClassImpl@99['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@101['Object'] {
-    classifier = JavaClassImpl@102['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@103['Object'] {
-    classifier = JavaClassImpl@104['Object']
-    typeConstructor = DeserializedClassTypeConstructor@100
-}
-
-LazyJavaClassifierType@30['RandomAccess'] {
-    classifier = JavaClassImpl@105['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@13['RandomAccess']
-}
-
-LazyJavaClassifierType@106['Serializable'] {
-    classifier = JavaClassImpl@107['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@108 {
-    packageFragments('<root>': FqName@109) = LazyJavaPackageFragment@110['<root>']
-    packageFragments('Array': FqName@111) = null
-    packageFragments('ArrayList': FqName@112) = null
-    packageFragments('C': FqName@113) = null
-    packageFragments('Collection': FqName@114) = null
-    packageFragments('Int': FqName@115) = null
-    packageFragments('List': FqName@116) = null
-    packageFragments('MutableCollection': FqName@117) = null
-    packageFragments('R': FqName@118) = null
-    packageFragments('T': FqName@119) = null
-    packageFragments('i': FqName@120) = null
-    packageFragments('i.Array': FqName@121) = null
-    packageFragments('i.ArrayList': FqName@122) = null
-    packageFragments('i.C': FqName@123) = null
-    packageFragments('i.Collection': FqName@124) = null
-    packageFragments('i.Int': FqName@125) = null
-    packageFragments('i.List': FqName@126) = null
-    packageFragments('i.MutableCollection': FqName@127) = null
-    packageFragments('i.R': FqName@128) = null
-    packageFragments('i.T': FqName@129) = null
-    packageFragments('i.java': FqName@130) = null
-    packageFragments('i.size': FqName@131) = null
-    packageFragments('java': FqName@132) = LazyJavaPackageFragment@133['java']
-    packageFragments('java.io': FqName@134) = LazyJavaPackageFragment@135['io']
-    packageFragments('java.lang': FqName@136) = LazyJavaPackageFragment@137['lang']
-    packageFragments('java.lang.Array': FqName@138) = null
-    packageFragments('java.lang.ArrayList': FqName@139) = null
-    packageFragments('java.lang.C': FqName@140) = null
-    packageFragments('java.lang.Collection': FqName@141) = null
-    packageFragments('java.lang.Int': FqName@142) = null
-    packageFragments('java.lang.List': FqName@143) = null
-    packageFragments('java.lang.MutableCollection': FqName@144) = null
-    packageFragments('java.lang.R': FqName@145) = null
-    packageFragments('java.lang.T': FqName@146) = null
-    packageFragments('java.util': FqName@147) = LazyJavaPackageFragment@148['util']
-    packageFragments('java.util.Array': FqName@149) = null
-    packageFragments('java.util.ArrayList': FqName@150) = null
-    packageFragments('java.util.C': FqName@151) = null
-    packageFragments('java.util.Collection': FqName@152) = null
-    packageFragments('java.util.Int': FqName@153) = null
-    packageFragments('java.util.List': FqName@154) = null
-    packageFragments('java.util.MutableCollection': FqName@155) = null
-    packageFragments('java.util.R': FqName@156) = null
-    packageFragments('java.util.T': FqName@157) = null
-    packageFragments('kotlin': FqName@158) = null
-    packageFragments('kotlin.Array': FqName@159) = null
-    packageFragments('kotlin.ArrayList': FqName@160) = null
-    packageFragments('kotlin.C': FqName@161) = null
-    packageFragments('kotlin.Collection': FqName@162) = null
-    packageFragments('kotlin.Int': FqName@163) = null
-    packageFragments('kotlin.List': FqName@164) = null
-    packageFragments('kotlin.MutableCollection': FqName@165) = null
-    packageFragments('kotlin.R': FqName@166) = null
-    packageFragments('kotlin.T': FqName@167) = null
-    packageFragments('kotlin.io': FqName@168) = null
-    packageFragments('kotlin.jvm': FqName@169) = null
-    topLevelClasses(JavaClassImpl@36['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@39['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@170['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@171['Collection']) = LazyJavaClassDescriptor@172['Collection']
-    topLevelClasses(JavaClassImpl@173['List']) = LazyJavaClassDescriptor@174['List']
-    topLevelClasses(JavaClassImpl@105['RandomAccess']) = LazyJavaClassDescriptor@12['RandomAccess']
-    topLevelClasses(JavaClassImpl@107['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-}
-
-LazyJavaPackageFragment@133['java'] {
-    classes('lang': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('util': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('lang': Name@179) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('util': Name@181) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    memberIndex = computeMemberIndex$1@182 // through LazyPackageFragmentScopeForJavaPackage@176
-}
-
-LazyJavaPackageFragment@137['lang'] {
-    classes('ArrayList': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('arrayList': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('map': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('mapTo': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('size': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('toCollection': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('transform': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('arrayList': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('map': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('mapTo': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('size': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('toCollection': Name@190) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('transform': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@184
-}
-
-LazyJavaPackageFragment@148['util'] {
-    classes('Array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('ArrayList': Name@195) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('Collection': Name@196) = LazyJavaClassDescriptor@172['Collection'] // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('List': Name@198) = LazyJavaClassDescriptor@174['List'] // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('MutableCollection': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('arrayList': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('map': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('mapTo': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('size': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('toCollection': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('transform': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('arrayList': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('map': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('mapTo': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('size': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('toCollection': Name@190) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('transform': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@194
-}
-
-LazyJavaTypeParameterDescriptor@26['E'] {
-    defaultType = JetTypeImpl@201['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-    upperBounds = LinkedHashSet@202[1] { NullableType@203 }
-}
-
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaTypeParameterResolver@204 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
-}
-
-LazyJavaTypeParameterResolver@205 {
-    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@17['E']
-}
-
-LazyJavaTypeParameterResolver@206 {
-    resolve(JavaTypeParameterImpl@207['E']) = LazyJavaTypeParameterDescriptor@26['E']
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-null {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@400[3] { ResolutionCandidate@350, ResolutionCandidate@351, ResolutionCandidate@352 }
-    <name not found> = ArrayList@401[3] { ResolutionCandidate@345, ResolutionCandidate@346, ResolutionCandidate@347 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
deleted file mode 100644
index 7bfb0add424..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('n': FqName@22) = null
-    packageFragments('n.Array': FqName@23) = null
-    packageFragments('n.Int': FqName@24) = null
-    packageFragments('n.String': FqName@25) = null
-    packageFragments('n.T': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('array': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('array': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
deleted file mode 100644
index 437864c252c..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Foo': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('a': FqName@11) = null
-    packageFragments('a.A': FqName@12) = null
-    packageFragments('a.B': FqName@13) = null
-    packageFragments('a.Foo': FqName@14) = null
-    packageFragments('a.String': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.B': FqName@21) = null
-    packageFragments('java.lang.Foo': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.B': FqName@26) = null
-    packageFragments('kotlin.Foo': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('map': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
deleted file mode 100644
index 5340f4258e3..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
+++ /dev/null
@@ -1,164 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Collection': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Iterable': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Collection': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Iterable': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Boolean': FqName@21) = null
-    packageFragments('kotlin.Collection': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.Iterable': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('n': FqName@28) = null
-    packageFragments('n.Any': FqName@29) = null
-    packageFragments('n.Boolean': FqName@30) = null
-    packageFragments('n.Buggy': FqName@31) = null
-    packageFragments('n.Collection': FqName@32) = null
-    packageFragments('n.Int': FqName@33) = null
-    packageFragments('n.Iterable': FqName@34) = null
-    packageFragments('n.T': FqName@35) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('coll': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('find': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('find': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@114[7] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@115[7] { ResolutionCandidate@89, ResolutionCandidate@90, ResolutionCandidate@91, ... }
-    <name not found> = ArrayList@116[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = ArrayList@117[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
deleted file mode 100644
index 0ccba270020..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('a.Array': FqName@8) = null
-    packageFragments('a.E': FqName@9) = null
-    packageFragments('a.Int': FqName@10) = null
-    packageFragments('a.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.E': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.E': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('array': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('array': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
deleted file mode 100644
index 68005456802..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['NotMap<1>']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('B': FqName@52) = null
-    packageFragments('C': FqName@53) = null
-    packageFragments('Entry': FqName@54) = null
-    packageFragments('NotMap': FqName@55) = null
-    packageFragments('R': FqName@56) = null
-    packageFragments('V': FqName@57) = null
-    packageFragments('i': FqName@58) = null
-    packageFragments('i.B': FqName@59) = null
-    packageFragments('i.C': FqName@60) = null
-    packageFragments('i.Entry': FqName@61) = null
-    packageFragments('i.NotMap': FqName@62) = null
-    packageFragments('i.R': FqName@63) = null
-    packageFragments('i.V': FqName@64) = null
-    packageFragments('java': FqName@65) = LazyJavaPackageFragment@66['java']
-    packageFragments('java.lang': FqName@67) = LazyJavaPackageFragment@68['lang']
-    packageFragments('java.lang.B': FqName@69) = null
-    packageFragments('java.lang.C': FqName@70) = null
-    packageFragments('java.lang.Entry': FqName@71) = null
-    packageFragments('java.lang.NotMap': FqName@72) = null
-    packageFragments('java.lang.R': FqName@73) = null
-    packageFragments('java.lang.V': FqName@74) = null
-    packageFragments('kotlin': FqName@75) = null
-    packageFragments('kotlin.B': FqName@76) = null
-    packageFragments('kotlin.C': FqName@77) = null
-    packageFragments('kotlin.Entry': FqName@78) = null
-    packageFragments('kotlin.NotMap': FqName@79) = null
-    packageFragments('kotlin.R': FqName@80) = null
-    packageFragments('kotlin.V': FqName@81) = null
-    packageFragments('kotlin.io': FqName@82) = null
-    packageFragments('kotlin.jvm': FqName@83) = null
-    topLevelClasses(JavaClassImpl@84['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@66['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@68['lang'] {
-    classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('f': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('mapValuesOriginal': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('f': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('mapValuesOriginal': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@121[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
deleted file mode 100644
index eeaff06d067..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
+++ /dev/null
@@ -1,712 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassDescriptor@19['ArrayList'] {
-    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
-    defaultType = JetTypeImpl@25['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
-    functionTypeForSamInterface = null
-    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
-    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
-}
-
-LazyJavaClassDescriptor@35['RandomAccess'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
-    supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@18['AbstractList'] {
-    parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
-    supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@34['ArrayList'] {
-    parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
-    supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@39['RandomAccess'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@43['Serializable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@51['AbstractCollection<E>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@66['AbstractCollection']
-    memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@56['AbstractList<E>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['AbstractList']
-    memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassifierType@72['Cloneable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Cloneable']
-    memberScope = DeserializedClassMemberScope@75
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Collection<? extends E>'] {
-    arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@81
-    nullable = 'false': Boolean@82
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@84['Collection<? extends E>'] {
-    arguments = ArrayList@85[1] { TypeProjectionImpl@86 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@87
-    nullable = 'true': Boolean@88
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@47['Collection<E>'] {
-    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    classifier = JavaClassImpl@92['Collection']
-    memberScope = SubstitutingScope@93
-    nullable = 'false': Boolean@82
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@108['E'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@133['E'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@139['E'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@96['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@145['E'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@149['E'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@151['E'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@155['E'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@52['List<E>'] {
-    arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
-    classifier = JavaClassImpl@159['List']
-    memberScope = SubstitutingScope@160
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@57['List<E>'] {
-    arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
-    classifier = JavaClassImpl@164['List']
-    memberScope = SubstitutingScope@165
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@166['Object'] {
-    classifier = JavaClassImpl@167['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@169['Object'] {
-    classifier = JavaClassImpl@170['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@171['Object'] {
-    classifier = JavaClassImpl@172['Object']
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@58['RandomAccess'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@174['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
-}
-
-LazyJavaClassifierType@175['Serializable'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['Serializable']
-    memberScope = LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@178 {
-    packageFragments('<root>': FqName@179) = LazyJavaPackageFragment@180['<root>']
-    packageFragments('Any': FqName@181) = null
-    packageFragments('Array': FqName@182) = null
-    packageFragments('ArrayList': FqName@183) = null
-    packageFragments('C': FqName@184) = null
-    packageFragments('Int': FqName@185) = null
-    packageFragments('K': FqName@186) = null
-    packageFragments('List': FqName@187) = null
-    packageFragments('MutableCollection': FqName@188) = null
-    packageFragments('String': FqName@189) = null
-    packageFragments('T': FqName@190) = null
-    packageFragments('i': FqName@191) = null
-    packageFragments('i.Any': FqName@192) = null
-    packageFragments('i.Array': FqName@193) = null
-    packageFragments('i.ArrayList': FqName@194) = null
-    packageFragments('i.C': FqName@195) = null
-    packageFragments('i.Int': FqName@196) = null
-    packageFragments('i.K': FqName@197) = null
-    packageFragments('i.List': FqName@198) = null
-    packageFragments('i.MutableCollection': FqName@199) = null
-    packageFragments('i.String': FqName@200) = null
-    packageFragments('i.T': FqName@201) = null
-    packageFragments('java': FqName@202) = LazyJavaPackageFragment@203['java']
-    packageFragments('java.io': FqName@204) = LazyJavaPackageFragment@205['io']
-    packageFragments('java.lang': FqName@206) = LazyJavaPackageFragment@207['lang']
-    packageFragments('java.lang.Any': FqName@208) = null
-    packageFragments('java.lang.Array': FqName@209) = null
-    packageFragments('java.lang.ArrayList': FqName@210) = null
-    packageFragments('java.lang.C': FqName@211) = null
-    packageFragments('java.lang.Int': FqName@212) = null
-    packageFragments('java.lang.K': FqName@213) = null
-    packageFragments('java.lang.List': FqName@214) = null
-    packageFragments('java.lang.MutableCollection': FqName@215) = null
-    packageFragments('java.lang.String': FqName@216) = null
-    packageFragments('java.lang.T': FqName@217) = null
-    packageFragments('java.util': FqName@218) = LazyJavaPackageFragment@219['util']
-    packageFragments('java.util.Any': FqName@220) = null
-    packageFragments('java.util.Array': FqName@221) = null
-    packageFragments('java.util.ArrayList': FqName@222) = null
-    packageFragments('java.util.C': FqName@223) = null
-    packageFragments('java.util.Int': FqName@224) = null
-    packageFragments('java.util.K': FqName@225) = null
-    packageFragments('java.util.List': FqName@226) = null
-    packageFragments('java.util.MutableCollection': FqName@227) = null
-    packageFragments('java.util.String': FqName@228) = null
-    packageFragments('java.util.T': FqName@229) = null
-    packageFragments('kotlin': FqName@230) = null
-    packageFragments('kotlin.Any': FqName@231) = null
-    packageFragments('kotlin.Array': FqName@232) = null
-    packageFragments('kotlin.ArrayList': FqName@233) = null
-    packageFragments('kotlin.C': FqName@234) = null
-    packageFragments('kotlin.Int': FqName@235) = null
-    packageFragments('kotlin.K': FqName@236) = null
-    packageFragments('kotlin.List': FqName@237) = null
-    packageFragments('kotlin.MutableCollection': FqName@238) = null
-    packageFragments('kotlin.String': FqName@239) = null
-    packageFragments('kotlin.T': FqName@240) = null
-    packageFragments('kotlin.io': FqName@241) = null
-    packageFragments('kotlin.jvm': FqName@242) = null
-    topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@243['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
-    topLevelClasses(JavaClassImpl@244['List']) = LazyJavaClassDescriptor@245['List']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
-    topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
-}
-
-LazyJavaPackageFragment@203['java'] {
-    classes('lang': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('util': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('lang': Name@250) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('util': Name@251) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    memberIndex = computeMemberIndex$1@252 // through LazyPackageFragmentScopeForJavaPackage@247
-}
-
-LazyJavaPackageFragment@207['lang'] {
-    classes('ArrayList': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('someFunction': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('toCollection': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('transform': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('ArrayList': Name@253) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('arrayList': Name@255) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('assertEquals': Name@256) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('someFunction': Name@257) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('toCollection': Name@258) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('transform': Name@259) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    memberIndex = computeMemberIndex$1@260 // through LazyPackageFragmentScopeForJavaPackage@254
-}
-
-LazyJavaPackageFragment@219['util'] {
-    classes('Any': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Array': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('ArrayList': Name@264) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Int': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('List': Name@266) = LazyJavaClassDescriptor@245['List'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('MutableCollection': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('String': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('someFunction': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('toCollection': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('transform': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('ArrayList': Name@253) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('arrayList': Name@255) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('assertEquals': Name@256) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('someFunction': Name@257) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('toCollection': Name@258) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('transform': Name@259) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    memberIndex = computeMemberIndex$1@269 // through LazyPackageFragmentScopeForJavaPackage@262
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@270['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@271[1] { NullableType@272 }
-    upperBoundsAsType = NullableType@272
-}
-
-LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@273['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-    upperBounds = LinkedHashSet@274[1] { NullableType@275 }
-    upperBoundsAsType = NullableType@275
-}
-
-LazyJavaTypeParameterDescriptor@49['E'] {
-    defaultType = JetTypeImpl@276['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@277[1] { NullableType@278 }
-    upperBoundsAsType = NullableType@278
-}
-
-LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@45['E']
-}
-
-LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@282['E']) = LazyJavaTypeParameterDescriptor@49['E']
-}
-
-LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@54['E']
-}
-
-LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@286 {
-    resolve(JavaTypeParameterImpl@116['E']) = null
-}
-
-LazyJavaTypeParameterResolver@287 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
-}
-
-LazyJavaTypeParameterResolver@288 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
-}
-
-LazyJavaTypeParameterResolver@289 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@435[2] { ResolutionCandidate@394, ResolutionCandidate@395 }
-    <name not found> = ArrayList@436[3] { ResolutionCandidate@398, ResolutionCandidate@399, ResolutionCandidate@400 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
deleted file mode 100644
index 638cd4ecc29..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
+++ /dev/null
@@ -1,436 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@6['AbstractList'] {
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassDescriptor@10['ArrayList'] {
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@12
-    nestedClasses('map': Name@1) = null // through LazyJavaClassMemberScope@12
-    properties('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@15['ArrayList']
-}
-
-LazyJavaClassDescriptor@16['Math'] {
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@18
-    functions('max': Name@19) = ArrayList@20[4] { JavaMethodDescriptor@21['max'], JavaMethodDescriptor@22['max'], JavaMethodDescriptor@23['max'], ... } // through LazyJavaStaticClassScope@24
-    functions('max': Name@19) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaStaticClassScope@24
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@18
-    nestedClasses('max': Name@19) = null // through LazyJavaClassMemberScope@18
-    properties('max': Name@19) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    properties('max': Name@19) = EmptyList@2[empty] // through LazyJavaStaticClassScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@28['Math']
-}
-
-LazyJavaClassDescriptor@29['RandomAccess'] {
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@30
-    properties('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['RandomAccess']
-}
-
-LazyJavaClassDescriptor@33['Serializable'] {
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@34
-    properties('map': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@36['Serializable']
-}
-
-LazyJavaClassTypeConstructor@5['AbstractCollection'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['E'] }
-    supertypes = ArrayList@39[1] { LazyJavaClassifierType@40['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@9['AbstractList'] {
-    parameters = ArrayList@41[1] { LazyJavaTypeParameterDescriptor@42['E'] }
-    supertypes = ArrayList@43[2] { LazyJavaClassifierType@44['AbstractCollection<E>'], LazyJavaClassifierType@45['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@15['ArrayList'] {
-    parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
-    supertypes = ArrayList@48[5] { LazyJavaClassifierType@49['AbstractList<E>'], LazyJavaClassifierType@50['List<E>'], LazyJavaClassifierType@51['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@28['Math'] {
-    supertypes = ArrayList@52[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassTypeConstructor@32['RandomAccess'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassTypeConstructor@36['Serializable'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { JetTypeImpl@53['Any'] }
-}
-
-LazyJavaClassifierType@44['AbstractCollection<E>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['AbstractCollection']
-    memberScope = SubstitutingScope@61
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassifierType@49['AbstractList<E>'] {
-    arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
-    classifier = JavaClassImpl@64['AbstractList']
-    memberScope = SubstitutingScope@65
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassifierType@66['Cloneable'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['Cloneable']
-    memberScope = DeserializedClassMemberScope@69
-    typeConstructor = DeserializedClassTypeConstructor@70
-}
-
-LazyJavaClassifierType@40['Collection<E>'] {
-    arguments = ArrayList@71[1] { TypeProjectionImpl@72 }
-    classifier = JavaClassImpl@73['Collection']
-    memberScope = SubstitutingScope@74
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['E']
-    nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['E']
-    nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['E']
-    nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-}
-
-LazyJavaClassifierType@95['E'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@87['E']
-    nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@90['E']
-    nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@78['E']
-    nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@45['List<E>'] {
-    arguments = ArrayList@106[1] { TypeProjectionImpl@107 }
-    classifier = JavaClassImpl@108['List']
-    memberScope = SubstitutingScope@109
-    typeConstructor = DeserializedClassTypeConstructor@110
-}
-
-LazyJavaClassifierType@50['List<E>'] {
-    arguments = ArrayList@111[1] { TypeProjectionImpl@112 }
-    classifier = JavaClassImpl@113['List']
-    memberScope = SubstitutingScope@114
-    typeConstructor = DeserializedClassTypeConstructor@110
-}
-
-LazyJavaClassifierType@115['Object'] {
-    classifier = JavaClassImpl@116['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@118['Object'] {
-    classifier = JavaClassImpl@119['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@120['Object'] {
-    classifier = JavaClassImpl@121['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@122['Object'] {
-    classifier = JavaClassImpl@123['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@51['RandomAccess'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['RandomAccess']
-}
-
-LazyJavaClassifierType@126['Serializable'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['Serializable']
-    memberScope = LazyJavaClassMemberScope@34
-    typeConstructor = LazyJavaClassTypeConstructor@36['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@129 {
-    packageFragments('<root>': FqName@130) = LazyJavaPackageFragment@131['<root>']
-    packageFragments('ArrayList': FqName@132) = null
-    packageFragments('Collection': FqName@133) = null
-    packageFragments('Int': FqName@134) = null
-    packageFragments('Iterable': FqName@135) = null
-    packageFragments('List': FqName@136) = null
-    packageFragments('Math': FqName@137) = null
-    packageFragments('R': FqName@138) = null
-    packageFragments('String': FqName@139) = null
-    packageFragments('T': FqName@140) = null
-    packageFragments('java': FqName@141) = LazyJavaPackageFragment@142['java']
-    packageFragments('java.io': FqName@143) = LazyJavaPackageFragment@144['io']
-    packageFragments('java.lang': FqName@145) = LazyJavaPackageFragment@146['lang']
-    packageFragments('java.lang.ArrayList': FqName@147) = null
-    packageFragments('java.lang.Collection': FqName@148) = null
-    packageFragments('java.lang.Int': FqName@149) = null
-    packageFragments('java.lang.Iterable': FqName@150) = null
-    packageFragments('java.lang.List': FqName@151) = null
-    packageFragments('java.lang.Math': FqName@152) = null
-    packageFragments('java.lang.R': FqName@153) = null
-    packageFragments('java.lang.String': FqName@154) = null
-    packageFragments('java.lang.T': FqName@155) = null
-    packageFragments('java.util': FqName@156) = LazyJavaPackageFragment@157['util']
-    packageFragments('java.util.ArrayList': FqName@158) = null
-    packageFragments('java.util.Collection': FqName@159) = null
-    packageFragments('java.util.Int': FqName@160) = null
-    packageFragments('java.util.Iterable': FqName@161) = null
-    packageFragments('java.util.List': FqName@162) = null
-    packageFragments('java.util.Math': FqName@163) = null
-    packageFragments('java.util.R': FqName@164) = null
-    packageFragments('java.util.String': FqName@165) = null
-    packageFragments('java.util.T': FqName@166) = null
-    packageFragments('kotlin': FqName@167) = null
-    packageFragments('kotlin.ArrayList': FqName@168) = null
-    packageFragments('kotlin.Collection': FqName@169) = null
-    packageFragments('kotlin.Int': FqName@170) = null
-    packageFragments('kotlin.Iterable': FqName@171) = null
-    packageFragments('kotlin.List': FqName@172) = null
-    packageFragments('kotlin.Math': FqName@173) = null
-    packageFragments('kotlin.R': FqName@174) = null
-    packageFragments('kotlin.String': FqName@175) = null
-    packageFragments('kotlin.T': FqName@176) = null
-    packageFragments('kotlin.io': FqName@177) = null
-    packageFragments('kotlin.jvm': FqName@178) = null
-    packageFragments('n': FqName@179) = null
-    packageFragments('n.ArrayList': FqName@180) = null
-    packageFragments('n.Collection': FqName@181) = null
-    packageFragments('n.Int': FqName@182) = null
-    packageFragments('n.Iterable': FqName@183) = null
-    packageFragments('n.List': FqName@184) = null
-    packageFragments('n.Math': FqName@185) = null
-    packageFragments('n.R': FqName@186) = null
-    packageFragments('n.String': FqName@187) = null
-    packageFragments('n.T': FqName@188) = null
-    topLevelClasses(JavaClassImpl@60['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@64['AbstractList']) = LazyJavaClassDescriptor@6['AbstractList']
-    topLevelClasses(JavaClassImpl@189['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
-    topLevelClasses(JavaClassImpl@190['Collection']) = LazyJavaClassDescriptor@191['Collection']
-    topLevelClasses(JavaClassImpl@192['List']) = LazyJavaClassDescriptor@193['List']
-    topLevelClasses(JavaClassImpl@194['Math']) = LazyJavaClassDescriptor@16['Math']
-    topLevelClasses(JavaClassImpl@125['RandomAccess']) = LazyJavaClassDescriptor@29['RandomAccess']
-    topLevelClasses(JavaClassImpl@128['Serializable']) = LazyJavaClassDescriptor@33['Serializable']
-}
-
-LazyJavaPackageFragment@142['java'] {
-    classes('lang': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('util': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('lang': Name@199) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('util': Name@200) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    memberIndex = computeMemberIndex$1@201 // through LazyPackageFragmentScopeForJavaPackage@196
-}
-
-LazyJavaPackageFragment@146['lang'] {
-    classes('Math': Name@202) = LazyJavaClassDescriptor@16['Math'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('arrayList': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('fold': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('map': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('arrayList': Name@204) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('fold': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    memberIndex = computeMemberIndex$1@206 // through LazyPackageFragmentScopeForJavaPackage@203
-}
-
-LazyJavaPackageFragment@157['util'] {
-    classes('ArrayList': Name@207) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Collection': Name@209) = LazyJavaClassDescriptor@191['Collection'] // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Int': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Iterable': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('List': Name@212) = LazyJavaClassDescriptor@193['List'] // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Math': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('String': Name@213) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('arrayList': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('fold': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('map': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('arrayList': Name@204) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('fold': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('map': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@208
-}
-
-LazyJavaTypeParameterDescriptor@47['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-    upperBounds = LinkedHashSet@215[1] { NullableType@216 }
-}
-
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaTypeParameterDescriptor@42['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@42['E']
-}
-
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@38['E']
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@265[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
deleted file mode 100644
index d90443d2f41..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
+++ /dev/null
@@ -1,70 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('R': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('a.Array': FqName@8) = null
-    packageFragments('a.R': FqName@9) = null
-    packageFragments('a.String': FqName@10) = null
-    packageFragments('a.Unit': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.R': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.Unit': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.R': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.Unit': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('callback': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('test': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('callback': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
deleted file mode 100644
index 3b0b568cf1f..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
+++ /dev/null
@@ -1,236 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassDescriptor@6['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@7['RandomAccess']
-}
-
-LazyJavaClassDescriptor@8['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@10[1] { LazyJavaClassifierType@11['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@12[1] { LazyJavaTypeParameterDescriptor@13['E'] }
-    supertypes = ArrayList@14[2] { LazyJavaClassifierType@15['AbstractCollection<E>'], LazyJavaClassifierType@16['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['ArrayList'] {
-    parameters = ArrayList@17[1] { LazyJavaTypeParameterDescriptor@18['E'] }
-    supertypes = ArrayList@19[5] { LazyJavaClassifierType@20['AbstractList<E>'], LazyJavaClassifierType@21['List<E>'], LazyJavaClassifierType@22['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@7['RandomAccess'] {
-    supertypes = ArrayList@23[1] { JetTypeImpl@24['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['Serializable'] {
-    supertypes = ArrayList@25[1] { JetTypeImpl@24['Any'] }
-}
-
-LazyJavaClassifierType@15['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@26['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@20['AbstractList<E>'] {
-    arguments = ArrayList@27[1] { TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@30['Cloneable'] {
-    classifier = JavaClassImpl@31['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@11['Collection<E>'] {
-    classifier = JavaClassImpl@33['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['E'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaTypeParameterImpl@37['E']
-    nullable = 'false': Boolean@38
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-LazyJavaClassifierType@40['E'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@42['E']
-    nullable = 'false': Boolean@38
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-LazyJavaClassifierType@44['E'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@37['E']
-    nullable = 'true': Boolean@46
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-LazyJavaClassifierType@47['E'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@42['E']
-    nullable = 'true': Boolean@46
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-LazyJavaClassifierType@16['List<E>'] {
-    arguments = ArrayList@49[1] { TypeProjectionImpl@50 }
-    classifier = JavaClassImpl@51['List']
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@21['List<E>'] {
-    classifier = JavaClassImpl@53['List']
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@54['Object'] {
-    classifier = JavaClassImpl@55['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@57['Object'] {
-    classifier = JavaClassImpl@58['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@59['Object'] {
-    classifier = JavaClassImpl@60['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@22['RandomAccess'] {
-    classifier = JavaClassImpl@61['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@7['RandomAccess']
-}
-
-LazyJavaClassifierType@62['Serializable'] {
-    classifier = JavaClassImpl@63['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@9['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@64 {
-    packageFragments('<root>': FqName@65) = LazyJavaPackageFragment@66['<root>']
-    packageFragments('ArrayList': FqName@67) = null
-    packageFragments('B': FqName@68) = null
-    packageFragments('List': FqName@69) = null
-    packageFragments('T': FqName@70) = null
-    packageFragments('b': FqName@71) = null
-    packageFragments('b.ArrayList': FqName@72) = null
-    packageFragments('b.B': FqName@73) = null
-    packageFragments('b.List': FqName@74) = null
-    packageFragments('b.T': FqName@75) = null
-    packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
-    packageFragments('java.io': FqName@78) = LazyJavaPackageFragment@79['io']
-    packageFragments('java.lang': FqName@80) = LazyJavaPackageFragment@81['lang']
-    packageFragments('java.lang.ArrayList': FqName@82) = null
-    packageFragments('java.lang.B': FqName@83) = null
-    packageFragments('java.lang.List': FqName@84) = null
-    packageFragments('java.lang.T': FqName@85) = null
-    packageFragments('java.util': FqName@86) = LazyJavaPackageFragment@87['util']
-    packageFragments('java.util.ArrayList': FqName@88) = null
-    packageFragments('java.util.B': FqName@89) = null
-    packageFragments('java.util.List': FqName@90) = null
-    packageFragments('java.util.T': FqName@91) = null
-    packageFragments('kotlin': FqName@92) = null
-    packageFragments('kotlin.ArrayList': FqName@93) = null
-    packageFragments('kotlin.B': FqName@94) = null
-    packageFragments('kotlin.List': FqName@95) = null
-    packageFragments('kotlin.T': FqName@96) = null
-    packageFragments('kotlin.io': FqName@97) = null
-    packageFragments('kotlin.jvm': FqName@98) = null
-    topLevelClasses(JavaClassImpl@26['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@29['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@99['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@100['List']) = LazyJavaClassDescriptor@101['List']
-    topLevelClasses(JavaClassImpl@61['RandomAccess']) = LazyJavaClassDescriptor@6['RandomAccess']
-    topLevelClasses(JavaClassImpl@63['Serializable']) = LazyJavaClassDescriptor@8['Serializable']
-}
-
-LazyJavaPackageFragment@77['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    classes('util': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@106) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('util': Name@108) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@81['lang'] {
-    classes('B': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('arrayList': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('B': Name@110) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('arrayList': Name@112) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-LazyJavaPackageFragment@87['util'] {
-    classes('ArrayList': Name@114) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('B': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('List': Name@116) = LazyJavaClassDescriptor@101['List'] // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('arrayList': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('B': Name@110) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('arrayList': Name@112) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaTypeParameterDescriptor@18['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
-}
-
-LazyJavaTypeParameterDescriptor@13['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-LazyJavaTypeParameterResolver@120 {
-    resolve(JavaTypeParameterImpl@121['E']) = LazyJavaTypeParameterDescriptor@18['E']
-}
-
-LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@37['E']) = LazyJavaTypeParameterDescriptor@13['E']
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-null {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-    <name not found> = EmptyList@107[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
deleted file mode 100644
index cb2a8674ec3..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
+++ /dev/null
@@ -1,309 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Array': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.Array': FqName@10) = null
-    packageFragments('a.String': FqName@11) = null
-    packageFragments('a.T': FqName@12) = null
-    packageFragments('a.Unit': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Array': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.T': FqName@20) = null
-    packageFragments('java.lang.Unit': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Array': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('forEach': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('operation': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('bar': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('forEach': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('operation': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-null {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
deleted file mode 100644
index 5173fd8aef2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
+++ /dev/null
@@ -1,194 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('HttpResponse': FqName@51) = null
-    packageFragments('MyClass': FqName@52) = null
-    packageFragments('MyType': FqName@53) = null
-    packageFragments('R': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('a': FqName@56) = null
-    packageFragments('a.Any': FqName@57) = null
-    packageFragments('a.HttpResponse': FqName@58) = null
-    packageFragments('a.MyClass': FqName@59) = null
-    packageFragments('a.MyType': FqName@60) = null
-    packageFragments('a.R': FqName@61) = null
-    packageFragments('a.T': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.Any': FqName@67) = null
-    packageFragments('java.lang.HttpResponse': FqName@68) = null
-    packageFragments('java.lang.MyClass': FqName@69) = null
-    packageFragments('java.lang.MyType': FqName@70) = null
-    packageFragments('java.lang.R': FqName@71) = null
-    packageFragments('java.lang.T': FqName@72) = null
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.Any': FqName@74) = null
-    packageFragments('kotlin.HttpResponse': FqName@75) = null
-    packageFragments('kotlin.MyClass': FqName@76) = null
-    packageFragments('kotlin.MyType': FqName@77) = null
-    packageFragments('kotlin.R': FqName@78) = null
-    packageFragments('kotlin.T': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    topLevelClasses(JavaClassImpl@82['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@64['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@66['lang'] {
-    classes('Exception': Name@89) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
deleted file mode 100644
index 783eb5a31cf..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
+++ /dev/null
@@ -1,483 +0,0 @@
-LazyJavaClassDescriptor@0['AutoCloseable'] {
-    defaultType = JetTypeImpl@1['AutoCloseable']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('close': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['close'] } // through LazyJavaClassMemberScope@4
-    functions('equals': Name@8) = ArrayList@9[1] { DeserializedSimpleFunctionDescriptor@10['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toString': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['toString'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@25['Closeable'] {
-    allDescriptors = ArrayList@26[4] { DeserializedSimpleFunctionDescriptor@27['hashCode'], JavaMethodDescriptor@28['close'], DeserializedSimpleFunctionDescriptor@29['toString'], ... } // through LazyJavaClassMemberScope@30
-    annotations = LazyJavaAnnotations@31
-    defaultType = JetTypeImpl@32['Closeable']
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@30
-    functionTypeForSamInterface = JetTypeImpl@34['Function0<1>']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    functions('close': Name@35) = ArrayList@36[1] { JavaMethodDescriptor@28['close'] } // through LazyJavaClassMemberScope@30
-    functions('equals': Name@8) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['equals'] } // through LazyJavaClassMemberScope@30
-    functions('finalize': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    functions('hashCode': Name@13) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@27['hashCode'] } // through LazyJavaClassMemberScope@30
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    functions('toString': Name@18) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@30
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@44['Closeable']
-}
-
-LazyJavaClassDescriptor@45['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@46['Function0<1>']
-    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
-    functions('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@48
-    properties('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@51['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassDescriptor@53['Thread'] {
-    constructors = ArrayList@54[13] { JavaConstructorDescriptor@55['<init>'], JavaConstructorDescriptor@56['<init>'], SamAdapterConstructorDescriptor@57['<init>'], ... } // through LazyJavaClassMemberScope@58
-    defaultType = JetTypeImpl@59['Thread']
-    enumEntryIndex = LinkedHashMap@60 // through LazyJavaClassMemberScope@58
-    functionTypeForSamInterface = null
-    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
-    functions('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@58
-    nestedClassIndex = LinkedHashMap@62 // through LazyJavaClassMemberScope@58
-    nestedClasses('use': Name@49) = null // through LazyJavaClassMemberScope@58
-    properties('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
-    typeConstructor = LazyJavaClassTypeConstructor@63['Thread']
-}
-
-LazyJavaClassTypeConstructor@24['AutoCloseable'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { JetTypeImpl@66['Any'] }
-}
-
-LazyJavaClassTypeConstructor@44['Closeable'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@52['Runnable'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[1] { JetTypeImpl@66['Any'] }
-}
-
-LazyJavaClassTypeConstructor@63['Thread'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { LazyJavaClassifierType@74['Runnable'] }
-}
-
-LazyJavaClassifierType@69['AutoCloseable'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@4
-    typeConstructor = LazyJavaClassTypeConstructor@24['AutoCloseable']
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@80['Object'] {
-    classifier = JavaClassImpl@81['Object']
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@82['Object'] {
-    classifier = JavaClassImpl@83['Object']
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@74['Runnable'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['Runnable']
-    memberScope = LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@86['Runnable'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['Runnable']
-    nullable = 'false': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@90['Runnable'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['Runnable']
-    nullable = 'false': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@93['Runnable'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['Runnable']
-    nullable = 'false': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@96['Runnable'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['Runnable']
-    nullable = 'false': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@99['Runnable'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['Runnable']
-    nullable = 'false': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@102['Runnable'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@95['Runnable']
-    nullable = 'true': Boolean@104
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@105['Runnable'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@92['Runnable']
-    nullable = 'true': Boolean@104
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@107['Runnable'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@88['Runnable']
-    nullable = 'true': Boolean@104
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@109['Runnable'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@101['Runnable']
-    nullable = 'true': Boolean@104
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@111['Runnable'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@98['Runnable']
-    nullable = 'true': Boolean@104
-    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
-}
-
-LazyJavaClassifierType@113['String'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['String']
-    nullable = 'false': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@117['String'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'false': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@120['String'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['String']
-    nullable = 'false': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@123['String'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'false': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['String']
-    nullable = 'false': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@129['String'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@128['String']
-    nullable = 'true': Boolean@104
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@131['String'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@115['String']
-    nullable = 'true': Boolean@104
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@133['String'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'true': Boolean@104
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@135['String'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@122['String']
-    nullable = 'true': Boolean@104
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@137['String'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'true': Boolean@104
-    typeConstructor = DeserializedClassTypeConstructor@116
-}
-
-LazyJavaClassifierType@139['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@89
-    typeConstructor = TypeConstructorImpl$1@140
-}
-
-LazyJavaClassifierType@141['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@89
-    typeConstructor = TypeConstructorImpl$1@142
-}
-
-LazyJavaClassifierType@143['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@89
-    typeConstructor = TypeConstructorImpl$1@144
-}
-
-LazyJavaClassifierType@145['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@89
-    typeConstructor = TypeConstructorImpl$1@146
-}
-
-LazyJavaClassifierType@147['ThreadGroup'] {
-    nullable = 'true': Boolean@104
-}
-
-LazyJavaClassifierType@148['ThreadGroup'] {
-    nullable = 'true': Boolean@104
-}
-
-LazyJavaClassifierType@149['ThreadGroup'] {
-    nullable = 'true': Boolean@104
-}
-
-LazyJavaClassifierType@150['ThreadGroup'] {
-    nullable = 'true': Boolean@104
-}
-
-LazyJavaPackageFragmentProvider@151 {
-    packageFragments('<root>': FqName@152) = LazyJavaPackageFragment@153['<root>']
-    packageFragments('Array': FqName@154) = null
-    packageFragments('Closeable': FqName@155) = null
-    packageFragments('Int': FqName@156) = null
-    packageFragments('R': FqName@157) = null
-    packageFragments('String': FqName@158) = null
-    packageFragments('T': FqName@159) = null
-    packageFragments('Thread': FqName@160) = null
-    packageFragments('Unit': FqName@161) = null
-    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
-    packageFragments('java.io': FqName@164) = LazyJavaPackageFragment@165['io']
-    packageFragments('java.io.Closeable': FqName@166) = null
-    packageFragments('java.lang': FqName@167) = LazyJavaPackageFragment@168['lang']
-    packageFragments('java.lang.Array': FqName@169) = null
-    packageFragments('java.lang.Closeable': FqName@170) = null
-    packageFragments('java.lang.Int': FqName@171) = null
-    packageFragments('java.lang.R': FqName@172) = null
-    packageFragments('java.lang.String': FqName@173) = null
-    packageFragments('java.lang.T': FqName@174) = null
-    packageFragments('java.lang.Thread': FqName@175) = null
-    packageFragments('java.lang.Unit': FqName@176) = null
-    packageFragments('kotlin': FqName@177) = null
-    packageFragments('kotlin.Array': FqName@178) = null
-    packageFragments('kotlin.Closeable': FqName@179) = null
-    packageFragments('kotlin.Int': FqName@180) = null
-    packageFragments('kotlin.R': FqName@181) = null
-    packageFragments('kotlin.String': FqName@182) = null
-    packageFragments('kotlin.T': FqName@183) = null
-    packageFragments('kotlin.Thread': FqName@184) = null
-    packageFragments('kotlin.Unit': FqName@185) = null
-    packageFragments('kotlin.io': FqName@186) = null
-    packageFragments('kotlin.jvm': FqName@187) = null
-    packageFragments('kt2514': FqName@188) = null
-    packageFragments('kt2514.Array': FqName@189) = null
-    packageFragments('kt2514.Closeable': FqName@190) = null
-    packageFragments('kt2514.Int': FqName@191) = null
-    packageFragments('kt2514.R': FqName@192) = null
-    packageFragments('kt2514.String': FqName@193) = null
-    packageFragments('kt2514.T': FqName@194) = null
-    packageFragments('kt2514.Thread': FqName@195) = null
-    packageFragments('kt2514.Unit': FqName@196) = null
-    topLevelClasses(JavaClassImpl@76['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@197['Closeable']) = LazyJavaClassDescriptor@25['Closeable']
-    topLevelClasses(JavaClassImpl@85['Runnable']) = LazyJavaClassDescriptor@45['Runnable']
-    topLevelClasses(JavaClassImpl@198['Thread']) = LazyJavaClassDescriptor@53['Thread']
-}
-
-LazyJavaPackageFragment@165['io'] {
-    classes('Closeable': Name@199) = LazyJavaClassDescriptor@25['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('Closeable': Name@202) = ArrayList@203[1] { SamConstructorDescriptor@204['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
-}
-
-LazyJavaPackageFragment@163['java'] {
-    classes('io': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@207
-    classes('lang': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@207
-    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@207
-    functions('io': Name@209) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@207
-    functions('lang': Name@210) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@207
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@207
-}
-
-LazyJavaPackageFragment@168['lang'] {
-    classes('Thread': Name@212) = LazyJavaClassDescriptor@53['Thread'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('block': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('invoke': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('use': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('Thread': Name@215) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('block': Name@214) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('use': Name@49) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[8] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@251, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[8] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@256, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[8] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@261, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[8] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@266, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-}
-
-null {
-    <name not found> = ArrayList@277[13] { ResolutionCandidate@254, ResolutionCandidate@255, ResolutionCandidate@278, ... }
-    <name not found> = ArrayList@279[13] { ResolutionCandidate@259, ResolutionCandidate@260, ResolutionCandidate@280, ... }
-    <name not found> = ArrayList@281[13] { ResolutionCandidate@264, ResolutionCandidate@265, ResolutionCandidate@282, ... }
-    <name not found> = ArrayList@283[13] { ResolutionCandidate@249, ResolutionCandidate@250, ResolutionCandidate@284, ... }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@290[2] { ResolutionCandidate@245, ResolutionCandidate@246 }
-    <name not found> = ArrayList@291[2] { ResolutionCandidate@241, ResolutionCandidate@242 }
-    <name not found> = ArrayList@292[2] { ResolutionCandidate@237, ResolutionCandidate@238 }
-    <name not found> = ArrayList@293[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
-    <name not found> = ArrayList@294[8] { ResolutionCandidate@274, ResolutionCandidate@275, ResolutionCandidate@276, ... }
-    <name not found> = ArrayList@295[8] { ResolutionCandidate@269, ResolutionCandidate@270, ResolutionCandidate@271, ... }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
deleted file mode 100644
index a236f86ff6e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
+++ /dev/null
@@ -1,259 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A': FqName@50) = null
-    packageFragments('Comparable': FqName@51) = null
-    packageFragments('Iterable': FqName@52) = null
-    packageFragments('List': FqName@53) = null
-    packageFragments('R': FqName@54) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('a': FqName@56) = null
-    packageFragments('a.A': FqName@57) = null
-    packageFragments('a.Comparable': FqName@58) = null
-    packageFragments('a.Iterable': FqName@59) = null
-    packageFragments('a.List': FqName@60) = null
-    packageFragments('a.R': FqName@61) = null
-    packageFragments('a.T': FqName@62) = null
-    packageFragments('a._Pair': FqName@63) = null
-    packageFragments('a.xxx': FqName@64) = null
-    packageFragments('java': FqName@65) = LazyJavaPackageFragment@66['java']
-    packageFragments('java.lang': FqName@67) = LazyJavaPackageFragment@68['lang']
-    packageFragments('java.lang.A': FqName@69) = null
-    packageFragments('java.lang.Comparable': FqName@70) = null
-    packageFragments('java.lang.Iterable': FqName@71) = null
-    packageFragments('java.lang.List': FqName@72) = null
-    packageFragments('java.lang.R': FqName@73) = null
-    packageFragments('java.lang.T': FqName@74) = null
-    packageFragments('java.lang.xxx': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.A': FqName@77) = null
-    packageFragments('kotlin.Comparable': FqName@78) = null
-    packageFragments('kotlin.Iterable': FqName@79) = null
-    packageFragments('kotlin.List': FqName@80) = null
-    packageFragments('kotlin.R': FqName@81) = null
-    packageFragments('kotlin.T': FqName@82) = null
-    packageFragments('kotlin.io': FqName@83) = null
-    packageFragments('kotlin.jvm': FqName@84) = null
-    packageFragments('kotlin.xxx': FqName@85) = null
-    packageFragments('xxx': FqName@86) = null
-    topLevelClasses(JavaClassImpl@87['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@66['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@68['lang'] {
-    classes('Exception': Name@94) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('_Pair': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('_arrayList': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('_sortBy': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('xxx': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('Exception': Name@94) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('_Pair': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('_arrayList': Name@97) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('_sortBy': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('xxx': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[4] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[4] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@126[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-    <name not found> = ArrayList@127[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
deleted file mode 100644
index dec600dc932..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
+++ /dev/null
@@ -1,258 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-    <name not found> = NullableType@2
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Int': FqName@53) = null
-    packageFragments('Map': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('a': FqName@57) = null
-    packageFragments('a.Int': FqName@58) = null
-    packageFragments('a.Map': FqName@59) = null
-    packageFragments('a.String': FqName@60) = null
-    packageFragments('a.T': FqName@61) = null
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Map': FqName@67) = null
-    packageFragments('java.lang.String': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Int': FqName@71) = null
-    packageFragments('kotlin.Map': FqName@72) = null
-    packageFragments('kotlin.String': FqName@73) = null
-    packageFragments('kotlin.T': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    topLevelClasses(JavaClassImpl@77['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('Exception': Name@84) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Exception': Name@84) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('bar': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[4] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[4] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@155[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@156[5] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
deleted file mode 100644
index 7bc7d36b614..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Array': FqName@7) = null
-    packageFragments('Closeable': FqName@8) = null
-    packageFragments('R': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('T': FqName@11) = null
-    packageFragments('a': FqName@12) = null
-    packageFragments('a.Array': FqName@13) = null
-    packageFragments('a.C': FqName@14) = null
-    packageFragments('a.Closeable': FqName@15) = null
-    packageFragments('a.R': FqName@16) = null
-    packageFragments('a.String': FqName@17) = null
-    packageFragments('a.T': FqName@18) = null
-    packageFragments('a.inline': FqName@19) = null
-    packageFragments('a.x': FqName@20) = null
-    packageFragments('inline': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.Array': FqName@26) = null
-    packageFragments('java.lang.Closeable': FqName@27) = null
-    packageFragments('java.lang.R': FqName@28) = null
-    packageFragments('java.lang.String': FqName@29) = null
-    packageFragments('java.lang.T': FqName@30) = null
-    packageFragments('java.lang.inline': FqName@31) = null
-    packageFragments('java.lang.x': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.Array': FqName@34) = null
-    packageFragments('kotlin.Closeable': FqName@35) = null
-    packageFragments('kotlin.R': FqName@36) = null
-    packageFragments('kotlin.String': FqName@37) = null
-    packageFragments('kotlin.T': FqName@38) = null
-    packageFragments('kotlin.inline': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('kotlin.x': FqName@42) = null
-    packageFragments('x': FqName@43) = null
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('C': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('block': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('use1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('C': Name@50) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('block': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('use1': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('x': Name@55) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
deleted file mode 100644
index 480f93157fe..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
+++ /dev/null
@@ -1,140 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Closeable': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.C': FqName@11) = null
-    packageFragments('a.Closeable': FqName@12) = null
-    packageFragments('a.R': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('a.inline': FqName@15) = null
-    packageFragments('a.x': FqName@16) = null
-    packageFragments('inline': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Closeable': FqName@22) = null
-    packageFragments('java.lang.R': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.inline': FqName@25) = null
-    packageFragments('java.lang.x': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Closeable': FqName@28) = null
-    packageFragments('kotlin.R': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.inline': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('kotlin.x': FqName@34) = null
-    packageFragments('x': FqName@35) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
deleted file mode 100644
index f859a3b509c..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.lazy.log
+++ /dev/null
@@ -1,234 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Closeable': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.C': FqName@11) = null
-    packageFragments('a.Closeable': FqName@12) = null
-    packageFragments('a.R': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('a.inline': FqName@15) = null
-    packageFragments('a.xx': FqName@16) = null
-    packageFragments('inline': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Closeable': FqName@22) = null
-    packageFragments('java.lang.R': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.inline': FqName@25) = null
-    packageFragments('java.lang.xx': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Closeable': FqName@28) = null
-    packageFragments('kotlin.R': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.inline': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('kotlin.xx': FqName@34) = null
-    packageFragments('xx': FqName@35) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('xx': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('xx': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
deleted file mode 100644
index b21a3c98d41..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
+++ /dev/null
@@ -1,216 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Closeable': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.C': FqName@11) = null
-    packageFragments('a.Closeable': FqName@12) = null
-    packageFragments('a.R': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('a.inline': FqName@15) = null
-    packageFragments('a.x': FqName@16) = null
-    packageFragments('inline': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Closeable': FqName@22) = null
-    packageFragments('java.lang.R': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.inline': FqName@25) = null
-    packageFragments('java.lang.x': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Closeable': FqName@28) = null
-    packageFragments('kotlin.R': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.inline': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('kotlin.x': FqName@34) = null
-    packageFragments('x': FqName@35) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
deleted file mode 100644
index 28093993591..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
+++ /dev/null
@@ -1,151 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Iterator': FqName@7) = null
-    packageFragments('K': FqName@8) = null
-    packageFragments('List': FqName@9) = null
-    packageFragments('Map': FqName@10) = null
-    packageFragments('R': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('V': FqName@13) = null
-    packageFragments('c': FqName@14) = null
-    packageFragments('c.A': FqName@15) = null
-    packageFragments('c.Any': FqName@16) = null
-    packageFragments('c.Boolean': FqName@17) = null
-    packageFragments('c.Int': FqName@18) = null
-    packageFragments('c.Iterator': FqName@19) = null
-    packageFragments('c.K': FqName@20) = null
-    packageFragments('c.List': FqName@21) = null
-    packageFragments('c.Map': FqName@22) = null
-    packageFragments('c.R': FqName@23) = null
-    packageFragments('c.String': FqName@24) = null
-    packageFragments('c.V': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.A': FqName@30) = null
-    packageFragments('java.lang.Any': FqName@31) = null
-    packageFragments('java.lang.Boolean': FqName@32) = null
-    packageFragments('java.lang.Int': FqName@33) = null
-    packageFragments('java.lang.Iterator': FqName@34) = null
-    packageFragments('java.lang.K': FqName@35) = null
-    packageFragments('java.lang.List': FqName@36) = null
-    packageFragments('java.lang.Map': FqName@37) = null
-    packageFragments('java.lang.R': FqName@38) = null
-    packageFragments('java.lang.String': FqName@39) = null
-    packageFragments('java.lang.V': FqName@40) = null
-    packageFragments('kotlin': FqName@41) = null
-    packageFragments('kotlin.A': FqName@42) = null
-    packageFragments('kotlin.Any': FqName@43) = null
-    packageFragments('kotlin.Boolean': FqName@44) = null
-    packageFragments('kotlin.Int': FqName@45) = null
-    packageFragments('kotlin.Iterator': FqName@46) = null
-    packageFragments('kotlin.K': FqName@47) = null
-    packageFragments('kotlin.List': FqName@48) = null
-    packageFragments('kotlin.Map': FqName@49) = null
-    packageFragments('kotlin.R': FqName@50) = null
-    packageFragments('kotlin.String': FqName@51) = null
-    packageFragments('kotlin.V': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('contains': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('foo': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('getNullableList': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('iterator': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('contains': Name@61) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@63) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('getNullableList': Name@64) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('iterator': Name@65) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-    <name not found> = EmptyList@59[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
deleted file mode 100644
index 667ba4ca010..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
+++ /dev/null
@@ -1,156 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('MutableCollection': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('TItem': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('Y': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Int': FqName@11) = null
-    packageFragments('a.MutableCollection': FqName@12) = null
-    packageFragments('a.String': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('a.TItem': FqName@15) = null
-    packageFragments('a.Unit': FqName@16) = null
-    packageFragments('a.Y': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.MutableCollection': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('java.lang.T': FqName@25) = null
-    packageFragments('java.lang.TItem': FqName@26) = null
-    packageFragments('java.lang.Unit': FqName@27) = null
-    packageFragments('java.lang.Y': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Int': FqName@30) = null
-    packageFragments('kotlin.MutableCollection': FqName@31) = null
-    packageFragments('kotlin.String': FqName@32) = null
-    packageFragments('kotlin.T': FqName@33) = null
-    packageFragments('kotlin.TItem': FqName@34) = null
-    packageFragments('kotlin.Unit': FqName@35) = null
-    packageFragments('kotlin.Y': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('Y': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('bar': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('doAction': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('Y': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('bar': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('doAction': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-null {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@106[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@93, ResolutionCandidate@94 }
-    <name not found> = ArrayList@108[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
deleted file mode 100644
index 05987ca0860..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
+++ /dev/null
@@ -1,443 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Iterable': FqName@4) = null
-    packageFragments('R': FqName@5) = null
-    packageFragments('SomeEnum': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.Int': FqName@9) = null
-    packageFragments('a.Iterable': FqName@10) = null
-    packageFragments('a.R': FqName@11) = null
-    packageFragments('a.SomeEnum': FqName@12) = null
-    packageFragments('a.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Iterable': FqName@19) = null
-    packageFragments('java.lang.R': FqName@20) = null
-    packageFragments('java.lang.SomeEnum': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.Iterable': FqName@25) = null
-    packageFragments('kotlin.R': FqName@26) = null
-    packageFragments('kotlin.SomeEnum': FqName@27) = null
-    packageFragments('kotlin.T': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tempFun': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('fold': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('tempFun': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
deleted file mode 100644
index 48610a4557f..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
+++ /dev/null
@@ -1,181 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('TestEnum': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.Any': FqName@9) = null
-    packageFragments('a.T': FqName@10) = null
-    packageFragments('a.TestEnum': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.TestEnum': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.TestEnum': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('inferenceTest': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('use': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('inferenceTest': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('use': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
deleted file mode 100644
index 0773329c014..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
+++ /dev/null
@@ -1,249 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Class<1>']
-    <name not found> = JetTypeImpl@2['Class<1>']
-    <name not found> = JetTypeImpl@3['Function1<2>']
-    <name not found> = JetTypeImpl@4['Function1<2>']
-    <name not found> = JetTypeImpl@5['Some<1>']
-}
-
-LazyJavaClassDescriptor@6['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@8['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@9['Class']
-}
-
-LazyJavaClassDescriptor@10['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@12['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['Serializable']
-}
-
-LazyJavaClassDescriptor@14['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Type']
-}
-
-LazyJavaClassTypeConstructor@7['AnnotatedElement'] {
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['Class'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['T'] }
-    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['Serializable'], LazyJavaClassifierType@22['GenericDeclaration'], LazyJavaClassifierType@23['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['GenericDeclaration'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Serializable'] {
-    supertypes = ArrayList@25[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Type'] {
-    supertypes = ArrayList@26[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@27['AnnotatedElement'] {
-    classifier = JavaClassImpl@28['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
-}
-
-LazyJavaClassifierType@22['GenericDeclaration'] {
-    classifier = JavaClassImpl@29['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@11['GenericDeclaration']
-}
-
-LazyJavaClassifierType@30['Object'] {
-    classifier = JavaClassImpl@31['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@35['Object'] {
-    classifier = JavaClassImpl@36['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@37['Object'] {
-    classifier = JavaClassImpl@38['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Object'] {
-    classifier = JavaClassImpl@40['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@21['Serializable'] {
-    classifier = JavaClassImpl@41['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@13['Serializable']
-}
-
-LazyJavaClassifierType@23['Type'] {
-    classifier = JavaClassImpl@42['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Type']
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('Class': FqName@46) = null
-    packageFragments('Int': FqName@47) = null
-    packageFragments('Some': FqName@48) = null
-    packageFragments('SomeTemplate': FqName@49) = null
-    packageFragments('T': FqName@50) = null
-    packageFragments('Unit': FqName@51) = null
-    packageFragments('aa': FqName@52) = null
-    packageFragments('aa.Class': FqName@53) = null
-    packageFragments('aa.Int': FqName@54) = null
-    packageFragments('aa.Some': FqName@55) = null
-    packageFragments('aa.SomeTemplate': FqName@56) = null
-    packageFragments('aa.T': FqName@57) = null
-    packageFragments('aa.Unit': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.io': FqName@61) = LazyJavaPackageFragment@62['io']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Class': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Some': FqName@67) = null
-    packageFragments('java.lang.SomeTemplate': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('java.lang.Unit': FqName@70) = null
-    packageFragments('java.lang.reflect': FqName@71) = LazyJavaPackageFragment@72['reflect']
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.Class': FqName@74) = null
-    packageFragments('kotlin.Int': FqName@75) = null
-    packageFragments('kotlin.Some': FqName@76) = null
-    packageFragments('kotlin.SomeTemplate': FqName@77) = null
-    packageFragments('kotlin.T': FqName@78) = null
-    packageFragments('kotlin.Unit': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    topLevelClasses(JavaClassImpl@28['AnnotatedElement']) = LazyJavaClassDescriptor@6['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@82['Class']) = LazyJavaClassDescriptor@8['Class']
-    topLevelClasses(JavaClassImpl@29['GenericDeclaration']) = LazyJavaClassDescriptor@10['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@41['Serializable']) = LazyJavaClassDescriptor@12['Serializable']
-    topLevelClasses(JavaClassImpl@42['Type']) = LazyJavaClassDescriptor@14['Type']
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@86) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('Class': Name@89) = LazyJavaClassDescriptor@8['Class'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('SomeTemplate': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('query': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('query1': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('SomeTemplate': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('query': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('query1': Name@93) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaTypeParameterDescriptor@19['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-    upperBounds = LinkedHashSet@96[1] { NullableType@97 }
-}
-
-LazyJavaTypeParameterResolver@98 {
-    resolve(JavaTypeParameterImpl@99['T']) = LazyJavaTypeParameterDescriptor@19['T']
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-null {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@157[2] { ResolutionCandidate@114, ResolutionCandidate@115 }
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-    <name not found> = EmptyList@87[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
deleted file mode 100644
index e53a185c447..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = NullableType@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Any': FqName@6) = null
-    packageFragments('MutableList': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Any': FqName@11) = null
-    packageFragments('a.MutableList': FqName@12) = null
-    packageFragments('a.String': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Any': FqName@19) = null
-    packageFragments('java.lang.MutableList': FqName@20) = null
-    packageFragments('java.lang.String': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.MutableList': FqName@25) = null
-    packageFragments('kotlin.String': FqName@26) = null
-    packageFragments('kotlin.T': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('fff': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('fff': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
deleted file mode 100644
index bc699690a3c..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('arrays': FqName@7) = null
-    packageFragments('arrays.A': FqName@8) = null
-    packageFragments('arrays.Array': FqName@9) = null
-    packageFragments('arrays.B': FqName@10) = null
-    packageFragments('arrays.CAB': FqName@11) = null
-    packageFragments('arrays.DAB': FqName@12) = null
-    packageFragments('arrays.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.Array': FqName@19) = null
-    packageFragments('java.lang.B': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.Array': FqName@24) = null
-    packageFragments('kotlin.B': FqName@25) = null
-    packageFragments('kotlin.T': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('array': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('m': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('array': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('m': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
deleted file mode 100644
index 830e36f004b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
+++ /dev/null
@@ -1,740 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ArrayList<1>']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    defaultType = JetTypeImpl@3['AbstractCollection<1>']
-    functions('add': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['add'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@11['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-}
-
-LazyJavaClassDescriptor@21['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
-}
-
-LazyJavaClassDescriptor@23['ArrayList'] {
-    constructors = ArrayList@24[3] { JavaConstructorDescriptor@25['<init>'], JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'] } // through LazyJavaClassMemberScope@28
-    defaultType = JetTypeImpl@29['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@28
-    functionTypeForSamInterface = null
-    functions('add': Name@31) = ArrayList@32[2] { JavaMethodDescriptor@33['add'], JavaMethodDescriptor@34['add'] } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@28
-    nestedClasses('add': Name@31) = null // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
-}
-
-LazyJavaClassDescriptor@39['HashMap'] {
-    constructors = ArrayList@40[4] { JavaConstructorDescriptor@41['<init>'], JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], ... } // through LazyJavaClassMemberScope@44
-    defaultType = JetTypeImpl@45['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@46['HashMap']
-}
-
-LazyJavaClassDescriptor@47['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['RandomAccess']
-}
-
-LazyJavaClassDescriptor@52['Serializable'] {
-    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['Serializable']
-}
-
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
-    parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
-    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@20['AbstractList'] {
-    parameters = ArrayList@60[1] { LazyJavaTypeParameterDescriptor@61['E'] }
-    supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['AbstractCollection<E>'], LazyJavaClassifierType@64['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@22['AbstractMap'] {
-    parameters = ArrayList@65[2] { LazyJavaTypeParameterDescriptor@66['K'], LazyJavaTypeParameterDescriptor@67['V'] }
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@38['ArrayList'] {
-    parameters = ArrayList@70[1] { LazyJavaTypeParameterDescriptor@71['E'] }
-    supertypes = ArrayList@72[5] { LazyJavaClassifierType@73['AbstractList<E>'], LazyJavaClassifierType@74['List<E>'], LazyJavaClassifierType@75['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@46['HashMap'] {
-    parameters = ArrayList@76[2] { LazyJavaTypeParameterDescriptor@77['K'], LazyJavaTypeParameterDescriptor@78['V'] }
-    supertypes = ArrayList@79[4] { LazyJavaClassifierType@80['AbstractMap<K, V>'], LazyJavaClassifierType@81['Map<K, V>'], LazyJavaClassifierType@82['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@51['RandomAccess'] {
-    parameters = ArrayList@83[empty]
-    supertypes = ArrayList@84[1] { JetTypeImpl@85['Any'] }
-}
-
-LazyJavaClassTypeConstructor@55['Serializable'] {
-    parameters = ArrayList@86[empty]
-    supertypes = ArrayList@87[1] { JetTypeImpl@85['Any'] }
-}
-
-LazyJavaClassifierType@63['AbstractCollection<E>'] {
-    arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@90['AbstractCollection']
-    memberScope = SubstitutingScope@91
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassifierType@73['AbstractList<E>'] {
-    arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
-    classifier = JavaClassImpl@94['AbstractList']
-    memberScope = SubstitutingScope@95
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
-}
-
-LazyJavaClassifierType@80['AbstractMap<K, V>'] {
-    arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
-    classifier = JavaClassImpl@99['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
-}
-
-LazyJavaClassifierType@100['Cloneable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['Cloneable']
-    memberScope = DeserializedClassMemberScope@103
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@82['Cloneable'] {
-    classifier = JavaClassImpl@105['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@106['Collection<? extends E>'] {
-    arguments = ArrayList@107[1] { TypeProjectionImpl@108 }
-    classifier = JavaClassImpl@109['Collection']
-    memberScope = SubstitutingScope@110
-    nullable = 'false': Boolean@111
-    typeConstructor = DeserializedClassTypeConstructor@112
-}
-
-LazyJavaClassifierType@113['Collection<? extends E>'] {
-    arguments = ArrayList@114[1] { TypeProjectionImpl@115 }
-    classifier = JavaClassImpl@109['Collection']
-    memberScope = SubstitutingScope@116
-    nullable = 'true': Boolean@117
-    typeConstructor = DeserializedClassTypeConstructor@118
-}
-
-LazyJavaClassifierType@59['Collection<E>'] {
-    arguments = ArrayList@119[1] { TypeProjectionImpl@120 }
-    classifier = JavaClassImpl@121['Collection']
-    memberScope = SubstitutingScope@122
-    typeConstructor = DeserializedClassTypeConstructor@112
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@131['E'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@134['E'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@139['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@149['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@152['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@155['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@158['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@159['E'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@161['E']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@162['E'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@161['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@164['E'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@158['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@166['E'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@168['E'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@136['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@170['E'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@152['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@172['E'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@139['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@176['E'] {
-    arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@178['E'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@180['E'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@182['E'] {
-    arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@149['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@184['E'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@155['E']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-}
-
-LazyJavaClassifierType@186['K'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaTypeParameterImpl@188['K']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@190['K'] {
-    arguments = ArrayList@191[empty]
-    classifier = JavaTypeParameterImpl@192['K']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@193['K'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@195['K']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@196['K'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaTypeParameterImpl@198['K']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
-}
-
-LazyJavaClassifierType@200['K'] {
-    arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@188['K']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@202['K'] {
-    arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@195['K']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@204['K'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaTypeParameterImpl@192['K']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-}
-
-LazyJavaClassifierType@206['K'] {
-    arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@198['K']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
-}
-
-LazyJavaClassifierType@74['List<E>'] {
-    arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
-    classifier = JavaClassImpl@210['List']
-    memberScope = SubstitutingScope@211
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@64['List<E>'] {
-    arguments = ArrayList@213[1] { TypeProjectionImpl@214 }
-    classifier = JavaClassImpl@215['List']
-    memberScope = SubstitutingScope@216
-    typeConstructor = DeserializedClassTypeConstructor@212
-}
-
-LazyJavaClassifierType@217['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@218[2] { TypeProjectionImpl@219, TypeProjectionImpl@220 }
-    classifier = JavaClassImpl@221['Map']
-    memberScope = SubstitutingScope@222
-    nullable = 'false': Boolean@111
-    typeConstructor = DeserializedClassTypeConstructor@223
-}
-
-LazyJavaClassifierType@224['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@225[2] { TypeProjectionImpl@226, TypeProjectionImpl@227 }
-    classifier = JavaClassImpl@221['Map']
-    memberScope = SubstitutingScope@228
-    nullable = 'true': Boolean@117
-    typeConstructor = DeserializedClassTypeConstructor@229
-}
-
-LazyJavaClassifierType@69['Map<K, V>'] {
-    arguments = ArrayList@230[2] { TypeProjectionImpl@231, TypeProjectionImpl@232 }
-    classifier = JavaClassImpl@233['Map']
-    typeConstructor = DeserializedClassTypeConstructor@223
-}
-
-LazyJavaClassifierType@81['Map<K, V>'] {
-    classifier = JavaClassImpl@234['Map']
-    typeConstructor = DeserializedClassTypeConstructor@223
-}
-
-LazyJavaClassifierType@235['Object'] {
-    classifier = JavaClassImpl@236['Object']
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@238['Object'] {
-    classifier = JavaClassImpl@239['Object']
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@240['Object'] {
-    classifier = JavaClassImpl@241['Object']
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@242['Object'] {
-    classifier = JavaClassImpl@243['Object']
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@75['RandomAccess'] {
-    arguments = ArrayList@244[empty]
-    classifier = JavaClassImpl@245['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['RandomAccess']
-}
-
-LazyJavaClassifierType@246['Serializable'] {
-    arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@248['Serializable']
-    memberScope = LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['Serializable']
-}
-
-LazyJavaClassifierType@249['Serializable'] {
-    classifier = JavaClassImpl@250['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@55['Serializable']
-}
-
-LazyJavaClassifierType@251['V'] {
-    arguments = ArrayList@252[empty]
-    classifier = JavaTypeParameterImpl@253['V']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaClassifierType@255['V'] {
-    arguments = ArrayList@256[empty]
-    classifier = JavaTypeParameterImpl@257['V']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaClassifierType@258['V'] {
-    arguments = ArrayList@259[empty]
-    classifier = JavaTypeParameterImpl@260['V']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaClassifierType@261['V'] {
-    arguments = ArrayList@262[empty]
-    classifier = JavaTypeParameterImpl@263['V']
-    nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
-}
-
-LazyJavaClassifierType@265['V'] {
-    arguments = ArrayList@266[empty]
-    classifier = JavaTypeParameterImpl@263['V']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
-}
-
-LazyJavaClassifierType@267['V'] {
-    arguments = ArrayList@268[empty]
-    classifier = JavaTypeParameterImpl@260['V']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaClassifierType@269['V'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaTypeParameterImpl@257['V']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaClassifierType@271['V'] {
-    arguments = ArrayList@272[empty]
-    classifier = JavaTypeParameterImpl@253['V']
-    nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-}
-
-LazyJavaPackageFragmentProvider@273 {
-    packageFragments('<root>': FqName@274) = LazyJavaPackageFragment@275['<root>']
-    packageFragments('Foo': FqName@276) = null
-    packageFragments('Map': FqName@277) = null
-    packageFragments('String': FqName@278) = null
-    packageFragments('i': FqName@279) = null
-    packageFragments('i.Bar': FqName@280) = null
-    packageFragments('i.Foo': FqName@281) = null
-    packageFragments('i.Map': FqName@282) = null
-    packageFragments('i.String': FqName@283) = null
-    packageFragments('java': FqName@284) = LazyJavaPackageFragment@285['java']
-    packageFragments('java.io': FqName@286) = LazyJavaPackageFragment@287['io']
-    packageFragments('java.lang': FqName@288) = LazyJavaPackageFragment@289['lang']
-    packageFragments('java.lang.Foo': FqName@290) = null
-    packageFragments('java.lang.Map': FqName@291) = null
-    packageFragments('java.lang.String': FqName@292) = null
-    packageFragments('java.util': FqName@293) = LazyJavaPackageFragment@294['util']
-    packageFragments('java.util.ArrayList': FqName@295) = null
-    packageFragments('java.util.HashMap': FqName@296) = null
-    packageFragments('kotlin': FqName@297) = null
-    packageFragments('kotlin.Foo': FqName@298) = null
-    packageFragments('kotlin.Map': FqName@299) = null
-    packageFragments('kotlin.String': FqName@300) = null
-    packageFragments('kotlin.io': FqName@301) = null
-    packageFragments('kotlin.jvm': FqName@302) = null
-    topLevelClasses(JavaClassImpl@90['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@94['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@99['AbstractMap']) = LazyJavaClassDescriptor@21['AbstractMap']
-    topLevelClasses(JavaClassImpl@303['ArrayList']) = LazyJavaClassDescriptor@23['ArrayList']
-    topLevelClasses(JavaClassImpl@304['HashMap']) = LazyJavaClassDescriptor@39['HashMap']
-    topLevelClasses(JavaClassImpl@245['RandomAccess']) = LazyJavaClassDescriptor@47['RandomAccess']
-    topLevelClasses(JavaClassImpl@250['Serializable']) = LazyJavaClassDescriptor@52['Serializable']
-}
-
-LazyJavaPackageFragment@285['java'] {
-    classes('lang': Name@305) = null // through LazyPackageFragmentScopeForJavaPackage@306
-    classes('util': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@306
-    deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('lang': Name@309) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('util': Name@310) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@306
-    memberIndex = computeMemberIndex$1@311 // through LazyPackageFragmentScopeForJavaPackage@306
-}
-
-LazyJavaPackageFragment@289['lang'] {
-    classes('ArrayList': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@313
-    classes('Foo': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@313
-    classes('HashMap': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@313
-    classes('foos': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@313
-    deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('ArrayList': Name@312) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('Foo': Name@314) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('HashMap': Name@315) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    memberIndex = computeMemberIndex$1@317 // through LazyPackageFragmentScopeForJavaPackage@313
-}
-
-LazyJavaPackageFragment@294['util'] {
-    classes('ArrayList': Name@318) = LazyJavaClassDescriptor@23['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('HashMap': Name@320) = LazyJavaClassDescriptor@39['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@319
-    deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('ArrayList': Name@321) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('HashMap': Name@322) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@319
-}
-
-LazyJavaTypeParameterDescriptor@61['E'] {
-    defaultType = JetTypeImpl@324['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@325[1] { NullableType@326 }
-    upperBoundsAsType = NullableType@326
-}
-
-LazyJavaTypeParameterDescriptor@57['E'] {
-    defaultType = JetTypeImpl@327['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-    upperBounds = LinkedHashSet@328[1] { NullableType@329 }
-    upperBoundsAsType = NullableType@329
-}
-
-LazyJavaTypeParameterDescriptor@71['E'] {
-    defaultType = JetTypeImpl@330['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    upperBounds = LinkedHashSet@331[1] { NullableType@332 }
-    upperBoundsAsType = NullableType@332
-}
-
-LazyJavaTypeParameterDescriptor@77['K'] {
-    defaultType = JetTypeImpl@333['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
-    upperBounds = LinkedHashSet@334[1] { NullableType@335 }
-}
-
-LazyJavaTypeParameterDescriptor@66['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
-}
-
-LazyJavaTypeParameterDescriptor@78['V'] {
-    defaultType = JetTypeImpl@336['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
-    upperBounds = LinkedHashSet@337[1] { NullableType@338 }
-}
-
-LazyJavaTypeParameterDescriptor@67['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
-}
-
-LazyJavaTypeParameterResolver@339 {
-    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@57['E']
-}
-
-LazyJavaTypeParameterResolver@341 {
-    resolve(JavaTypeParameterImpl@342['E']) = LazyJavaTypeParameterDescriptor@61['E']
-}
-
-LazyJavaTypeParameterResolver@343 {
-    resolve(JavaTypeParameterImpl@344['E']) = LazyJavaTypeParameterDescriptor@71['E']
-}
-
-LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@152['E']) = null
-}
-
-LazyJavaTypeParameterResolver@346 {
-    resolve(JavaTypeParameterImpl@161['E']) = null
-}
-
-LazyJavaTypeParameterResolver@347 {
-    resolve(JavaTypeParameterImpl@155['E']) = null
-}
-
-LazyJavaTypeParameterResolver@348 {
-    resolve(JavaTypeParameterImpl@149['E']) = null
-}
-
-LazyJavaTypeParameterResolver@349 {
-    resolve(JavaTypeParameterImpl@158['E']) = null
-}
-
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@198['K']) = LazyJavaTypeParameterDescriptor@66['K']
-    resolve(JavaTypeParameterImpl@263['V']) = LazyJavaTypeParameterDescriptor@67['V']
-}
-
-LazyJavaTypeParameterResolver@351 {
-    resolve(JavaTypeParameterImpl@352['K']) = LazyJavaTypeParameterDescriptor@77['K']
-    resolve(JavaTypeParameterImpl@353['V']) = LazyJavaTypeParameterDescriptor@78['V']
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-null {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@384[2] { ResolutionCandidate@368, ResolutionCandidate@369 }
-    <name not found> = ArrayList@385[3] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374 }
-    <name not found> = ArrayList@386[4] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
deleted file mode 100644
index 200b68421f0..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
+++ /dev/null
@@ -1,466 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@7['Class'] {
-    defaultType = JetTypeImpl@8['Class<1>']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functions('cast': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['cast'] } // through LazyJavaClassMemberScope@10
-    functions('isInstance': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@10
-    nestedClasses('cast': Name@11) = null // through LazyJavaClassMemberScope@10
-    nestedClasses('isInstance': Name@14) = null // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['Class']
-}
-
-LazyJavaClassDescriptor@21['Error'] {
-    typeConstructor = LazyJavaClassTypeConstructor@22['Error']
-}
-
-LazyJavaClassDescriptor@23['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
-}
-
-LazyJavaClassDescriptor@25['GenericDeclaration'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@29['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@30['RuntimeException']
-}
-
-LazyJavaClassDescriptor@31['Serializable'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
-}
-
-LazyJavaClassDescriptor@35['Type'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
-}
-
-LazyJavaClassTypeConstructor@6['AnnotatedElement'] {
-    parameters = ArrayList@39[empty]
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['Class'] {
-    parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['T'] }
-    supertypes = ArrayList@44[4] { LazyJavaClassifierType@45['Serializable'], LazyJavaClassifierType@46['GenericDeclaration'], LazyJavaClassifierType@47['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@22['Error'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@24['Exception'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@28['GenericDeclaration'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['RuntimeException'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@34['Serializable'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['Type'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@63['AnnotatedElement'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@65['AnnotatedElement']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
-}
-
-LazyJavaClassifierType@58['Exception'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
-}
-
-LazyJavaClassifierType@46['GenericDeclaration'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['GenericDeclaration']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
-}
-
-LazyJavaClassifierType@70['Object'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'false': Boolean@74
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@76['Object'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'false': Boolean@74
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@79['Object'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@72['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'true': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@82['Object'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'true': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@84['Object'] {
-    classifier = JavaClassImpl@85['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@45['Serializable'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['Serializable']
-    memberScope = LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
-}
-
-LazyJavaClassifierType@96['T'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['T']
-    nullable = 'false': Boolean@74
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@98['T']
-    nullable = 'true': Boolean@81
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@53['Throwable'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@47['Type'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Type']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
-}
-
-LazyJavaPackageFragmentProvider@109 {
-    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    packageFragments('Class': FqName@112) = null
-    packageFragments('Error': FqName@113) = null
-    packageFragments('RuntimeException': FqName@114) = null
-    packageFragments('T': FqName@115) = null
-    packageFragments('Throwable': FqName@116) = null
-    packageFragments('Unit': FqName@117) = null
-    packageFragments('X': FqName@118) = null
-    packageFragments('a': FqName@119) = null
-    packageFragments('a.Class': FqName@120) = null
-    packageFragments('a.Error': FqName@121) = null
-    packageFragments('a.RuntimeException': FqName@122) = null
-    packageFragments('a.T': FqName@123) = null
-    packageFragments('a.Throwable': FqName@124) = null
-    packageFragments('a.Throwables': FqName@125) = null
-    packageFragments('a.Unit': FqName@126) = null
-    packageFragments('a.X': FqName@127) = null
-    packageFragments('a.java': FqName@128) = null
-    packageFragments('java': FqName@129) = LazyJavaPackageFragment@130['java']
-    packageFragments('java.io': FqName@131) = LazyJavaPackageFragment@132['io']
-    packageFragments('java.lang': FqName@133) = LazyJavaPackageFragment@134['lang']
-    packageFragments('java.lang.Class': FqName@135) = null
-    packageFragments('java.lang.Error': FqName@136) = null
-    packageFragments('java.lang.RuntimeException': FqName@137) = null
-    packageFragments('java.lang.T': FqName@138) = null
-    packageFragments('java.lang.Throwable': FqName@139) = null
-    packageFragments('java.lang.Unit': FqName@140) = null
-    packageFragments('java.lang.X': FqName@141) = null
-    packageFragments('java.lang.reflect': FqName@142) = LazyJavaPackageFragment@143['reflect']
-    packageFragments('kotlin': FqName@144) = null
-    packageFragments('kotlin.Class': FqName@145) = null
-    packageFragments('kotlin.Error': FqName@146) = null
-    packageFragments('kotlin.RuntimeException': FqName@147) = null
-    packageFragments('kotlin.T': FqName@148) = null
-    packageFragments('kotlin.Throwable': FqName@149) = null
-    packageFragments('kotlin.Unit': FqName@150) = null
-    packageFragments('kotlin.X': FqName@151) = null
-    packageFragments('kotlin.io': FqName@152) = null
-    packageFragments('kotlin.jvm': FqName@153) = null
-    topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@154['Class']) = LazyJavaClassDescriptor@7['Class']
-    topLevelClasses(JavaClassImpl@155['Error']) = LazyJavaClassDescriptor@21['Error']
-    topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@23['Exception']
-    topLevelClasses(JavaClassImpl@69['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@156['RuntimeException']) = LazyJavaClassDescriptor@29['RuntimeException']
-    topLevelClasses(JavaClassImpl@95['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@108['Type']) = LazyJavaClassDescriptor@35['Type']
-}
-
-LazyJavaPackageFragment@130['java'] {
-    classes('lang': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('lang': Name@160) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-LazyJavaPackageFragment@134['lang'] {
-    classes('Class': Name@162) = LazyJavaClassDescriptor@7['Class'] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('Error': Name@164) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('RuntimeException': Name@165) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('equals': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('getJavaClass': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('java': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('propagateIfInstanceOf': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('equals': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('getJavaClass': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('propagateIfInstanceOf': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@163
-}
-
-LazyJavaTypeParameterDescriptor@43['T'] {
-    defaultType = JetTypeImpl@171['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@172[1] { NullableType@173 }
-}
-
-LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['T']) = LazyJavaTypeParameterDescriptor@43['T']
-}
-
-LazyJavaTypeParameterResolver@176 {
-    resolve(JavaTypeParameterImpl@98['T']) = null
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-null {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
deleted file mode 100644
index 6b32de734d6..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('G': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.A': FqName@11) = null
-    packageFragments('a.Array': FqName@12) = null
-    packageFragments('a.G': FqName@13) = null
-    packageFragments('a.String': FqName@14) = null
-    packageFragments('a.T': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.Array': FqName@21) = null
-    packageFragments('java.lang.G': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.Array': FqName@27) = null
-    packageFragments('kotlin.G': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('A': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('A': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('x': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
deleted file mode 100644
index daad897f102..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
+++ /dev/null
@@ -1,214 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('Q': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('a.Any': FqName@8) = null
-    packageFragments('a.List': FqName@9) = null
-    packageFragments('a.Q': FqName@10) = null
-    packageFragments('a.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.List': FqName@17) = null
-    packageFragments('java.lang.Q': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.List': FqName@22) = null
-    packageFragments('kotlin.Q': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('map1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('map2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('map3': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('sure': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('tail': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('map1': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('map2': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('map3': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('sure': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
deleted file mode 100644
index 8eba6115555..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T': FqName@3) = null
-    packageFragments('a': FqName@4) = null
-    packageFragments('a.T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.T': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('fooT2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('fooT2': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
deleted file mode 100644
index c900ee36f4b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
+++ /dev/null
@@ -1,517 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['inline']
-    valueArguments(ValueParameterDescriptorImpl@4['strategy']) = null
-}
-
-LazyJavaClassDescriptor@5['Collections'] {
-    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
-    functionTypeForSamInterface = null
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    functions('max': Name@11) = ArrayList@12[3] { JavaMethodDescriptor@13['max'], JavaMethodDescriptor@14['max'], SamAdapterFunctionDescriptor@15['max'] } // through LazyJavaStaticClassScope@10
-    functions('max': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('sure': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('sure': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@7
-    nestedClasses('Any': Name@20) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('Int': Name@21) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('List': Name@22) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('String': Name@23) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('comparator': Name@8) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('inline': Name@24) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('max': Name@11) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('sure': Name@16) = null // through LazyJavaClassMemberScope@7
-    properties('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    properties('max': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('max': Name@11) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@25['Collections']
-}
-
-LazyJavaClassDescriptor@26['Comparator'] {
-    functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassTypeConstructor@25['Collections'] {
-    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
-}
-
-LazyJavaClassTypeConstructor@29['Comparator'] {
-    parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
-    supertypes = ArrayList@34[1] { JetTypeImpl@31['Any'] }
-}
-
-LazyJavaClassifierType@35['Collection<? extends T>'] {
-    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    classifier = JavaClassImpl@38['Collection']
-    memberScope = SubstitutingScope@39
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Collection<? extends T>'] {
-    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    classifier = JavaClassImpl@45['Collection']
-    memberScope = SubstitutingScope@46
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Collection<? extends T>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@45['Collection']
-    memberScope = SubstitutingScope@50
-    nullable = 'true': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@53['Collection<? extends T>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@38['Collection']
-    memberScope = SubstitutingScope@56
-    nullable = 'true': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@57['Comparable<? super T>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Comparable']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Comparable<? super T>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@60['Comparable']
-    memberScope = SubstitutingScope@66
-    nullable = 'true': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@67['Comparator<? super T>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['Comparator']
-    memberScope = SubstitutingScope@71
-    nullable = 'false': Boolean@40
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassifierType@72['Comparator<? super T>'] {
-    arguments = ArrayList@73[1] { TypeProjectionImpl@74 }
-    classifier = JavaClassImpl@70['Comparator']
-    memberScope = SubstitutingScope@75
-    nullable = 'true': Boolean@51
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassifierType@76['Object'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@79
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@81['Object'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@79
-    nullable = 'true': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@83['Object'] {
-    classifier = JavaClassImpl@84['Object']
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@85['Object'] {
-    classifier = JavaClassImpl@86['Object']
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@87['T'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@91['T'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@94['T'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['T'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@102['T'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@105['T'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@108['T'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@110['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@111['T'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@114['T'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@117['T'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@120['T'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@123['T'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@126['T'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@110['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@128['T'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@119['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@130['T'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@113['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@132['T'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@116['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@134['T'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@89['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@136['T'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@125['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@138['T'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@100['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@140['T'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@122['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@142['T'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@107['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@144['T'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@104['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@146['T'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@148['T'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'true': Boolean@51
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaPackageFragmentProvider@150 {
-    packageFragments('<root>': FqName@151) = LazyJavaPackageFragment@152['<root>']
-    packageFragments('Any': FqName@153) = null
-    packageFragments('Comparator': FqName@154) = null
-    packageFragments('Int': FqName@155) = null
-    packageFragments('List': FqName@156) = null
-    packageFragments('String': FqName@157) = null
-    packageFragments('T': FqName@158) = null
-    packageFragments('inline': FqName@159) = null
-    packageFragments('java': FqName@160) = LazyJavaPackageFragment@161['java']
-    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
-    packageFragments('java.lang.Any': FqName@164) = null
-    packageFragments('java.lang.Comparator': FqName@165) = null
-    packageFragments('java.lang.Int': FqName@166) = null
-    packageFragments('java.lang.List': FqName@167) = null
-    packageFragments('java.lang.String': FqName@168) = null
-    packageFragments('java.lang.T': FqName@169) = null
-    packageFragments('java.lang.inline': FqName@170) = null
-    packageFragments('java.util': FqName@171) = LazyJavaPackageFragment@172['util']
-    packageFragments('java.util.Any': FqName@173) = null
-    packageFragments('java.util.Collections': FqName@174) = null
-    packageFragments('java.util.Comparator': FqName@175) = null
-    packageFragments('java.util.Int': FqName@176) = null
-    packageFragments('java.util.List': FqName@177) = null
-    packageFragments('java.util.String': FqName@178) = null
-    packageFragments('java.util.T': FqName@179) = null
-    packageFragments('java.util.inline': FqName@180) = null
-    packageFragments('kotlin': FqName@181) = null
-    packageFragments('kotlin.Any': FqName@182) = null
-    packageFragments('kotlin.Comparator': FqName@183) = null
-    packageFragments('kotlin.Int': FqName@184) = null
-    packageFragments('kotlin.List': FqName@185) = null
-    packageFragments('kotlin.String': FqName@186) = null
-    packageFragments('kotlin.T': FqName@187) = null
-    packageFragments('kotlin.inline': FqName@188) = null
-    packageFragments('kotlin.io': FqName@189) = null
-    packageFragments('kotlin.jvm': FqName@190) = null
-    packageFragments('maze': FqName@191) = null
-    packageFragments('maze.Any': FqName@192) = null
-    packageFragments('maze.Comparator': FqName@193) = null
-    packageFragments('maze.Int': FqName@194) = null
-    packageFragments('maze.List': FqName@195) = null
-    packageFragments('maze.String': FqName@196) = null
-    packageFragments('maze.T': FqName@197) = null
-    packageFragments('maze.inline': FqName@198) = null
-    topLevelClasses(JavaClassImpl@199['Collections']) = LazyJavaClassDescriptor@5['Collections']
-    topLevelClasses(JavaClassImpl@200['Comparator']) = LazyJavaClassDescriptor@26['Comparator']
-    topLevelClasses(JavaClassImpl@201['List']) = LazyJavaClassDescriptor@202['List']
-}
-
-LazyJavaPackageFragment@161['java'] {
-    classes('lang': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('util': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('lang': Name@207) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('util': Name@208) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@204
-}
-
-LazyJavaPackageFragment@163['lang'] {
-    classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('sure': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('sure': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@210
-}
-
-LazyJavaPackageFragment@172['util'] {
-    classes('Any': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('Collections': Name@213) = LazyJavaClassDescriptor@5['Collections'] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('Comparator': Name@214) = LazyJavaClassDescriptor@26['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('List': Name@22) = LazyJavaClassDescriptor@202['List'] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('inline': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('sure': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('Collections': Name@215) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('sure': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@212
-}
-
-LazyJavaTypeParameterDescriptor@33['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@217[1] { NullableType@218 }
-    upperBoundsAsType = NullableType@218
-}
-
-LazyJavaTypeParameterDescriptor@219['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@220[1] { NullableType@221 }
-    upperBoundsAsType = NullableType@221
-}
-
-LazyJavaTypeParameterDescriptor@222['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-    upperBounds = LinkedHashSet@223[2] { DelegatingFlexibleType@224, DelegatingFlexibleType@225 }
-    upperBoundsAsType = NotNullType@226
-}
-
-LazyJavaTypeParameterResolver@227 {
-    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@33['T']
-}
-
-LazyJavaTypeParameterResolver@229 {
-    resolve(JavaTypeParameterImpl@230['T']) = LazyJavaTypeParameterDescriptor@219['T']
-}
-
-LazyJavaTypeParameterResolver@231 {
-    resolve(JavaTypeParameterImpl@232['T']) = LazyJavaTypeParameterDescriptor@222['T']
-}
-
-LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@96['T']) = null
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[2] { ResolutionCandidate@272, ResolutionCandidate@273 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-}
-
-null {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@291[3] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@292 }
-    <name not found> = ArrayList@293[8] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
deleted file mode 100644
index 1c9654df0ba..00000000000
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.lazy.log
+++ /dev/null
@@ -1,334 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['List<1>']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@4['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassDescriptor@6['ArrayList'] {
-    constructors = ArrayList@7[3] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'] } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['ArrayList']
-}
-
-LazyJavaClassDescriptor@14['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassDescriptor@16['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['AbstractList'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['E'] }
-    supertypes = ArrayList@22[2] { LazyJavaClassifierType@23['AbstractCollection<E>'], LazyJavaClassifierType@24['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@13['ArrayList'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['E'] }
-    supertypes = ArrayList@27[5] { LazyJavaClassifierType@28['AbstractList<E>'], LazyJavaClassifierType@29['List<E>'], LazyJavaClassifierType@30['RandomAccess'], ... }
-}
-
-LazyJavaClassifierType@23['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@31['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassifierType@28['AbstractList<E>'] {
-    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
-    classifier = JavaClassImpl@34['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassifierType@35['Cloneable'] {
-    classifier = JavaClassImpl@36['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['Collection<? extends E>'] {
-    arguments = ArrayList@39[1] { TypeProjectionImpl@40 }
-    classifier = JavaClassImpl@41['Collection']
-    memberScope = SubstitutingScope@42
-    nullable = 'false': Boolean@43
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['Collection<? extends E>'] {
-    arguments = ArrayList@46[1] { TypeProjectionImpl@47 }
-    classifier = JavaClassImpl@41['Collection']
-    memberScope = SubstitutingScope@48
-    nullable = 'true': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@19['Collection<E>'] {
-    classifier = JavaClassImpl@51['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@52['E'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@54['E']
-    nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@56['E'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaTypeParameterImpl@58['E']
-    nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@59['E'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['E']
-    nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@63['E'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@66['E'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@54['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@58['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@61['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@65['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@24['List<E>'] {
-    arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
-    classifier = JavaClassImpl@76['List']
-    typeConstructor = DeserializedClassTypeConstructor@77
-}
-
-LazyJavaClassifierType@29['List<E>'] {
-    classifier = JavaClassImpl@78['List']
-    typeConstructor = DeserializedClassTypeConstructor@77
-}
-
-LazyJavaClassifierType@79['Object'] {
-    classifier = JavaClassImpl@80['Object']
-    typeConstructor = DeserializedClassTypeConstructor@81
-}
-
-LazyJavaClassifierType@30['RandomAccess'] {
-    classifier = JavaClassImpl@82['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassifierType@83['Serializable'] {
-    classifier = JavaClassImpl@84['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@85 {
-    packageFragments('<root>': FqName@86) = LazyJavaPackageFragment@87['<root>']
-    packageFragments('Int': FqName@88) = null
-    packageFragments('List': FqName@89) = null
-    packageFragments('T': FqName@90) = null
-    packageFragments('a': FqName@91) = null
-    packageFragments('a.Int': FqName@92) = null
-    packageFragments('a.List': FqName@93) = null
-    packageFragments('a.T': FqName@94) = null
-    packageFragments('java': FqName@95) = LazyJavaPackageFragment@96['java']
-    packageFragments('java.io': FqName@97) = LazyJavaPackageFragment@98['io']
-    packageFragments('java.lang': FqName@99) = LazyJavaPackageFragment@100['lang']
-    packageFragments('java.lang.Int': FqName@101) = null
-    packageFragments('java.lang.List': FqName@102) = null
-    packageFragments('java.lang.T': FqName@103) = null
-    packageFragments('java.util': FqName@104) = LazyJavaPackageFragment@105['util']
-    packageFragments('java.util.Int': FqName@106) = null
-    packageFragments('java.util.List': FqName@107) = null
-    packageFragments('java.util.T': FqName@108) = null
-    packageFragments('kotlin': FqName@109) = null
-    packageFragments('kotlin.Int': FqName@110) = null
-    packageFragments('kotlin.List': FqName@111) = null
-    packageFragments('kotlin.T': FqName@112) = null
-    packageFragments('kotlin.io': FqName@113) = null
-    packageFragments('kotlin.jvm': FqName@114) = null
-    topLevelClasses(JavaClassImpl@31['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@34['AbstractList']) = LazyJavaClassDescriptor@4['AbstractList']
-    topLevelClasses(JavaClassImpl@115['ArrayList']) = LazyJavaClassDescriptor@6['ArrayList']
-    topLevelClasses(JavaClassImpl@116['List']) = LazyJavaClassDescriptor@117['List']
-    topLevelClasses(JavaClassImpl@82['RandomAccess']) = LazyJavaClassDescriptor@14['RandomAccess']
-    topLevelClasses(JavaClassImpl@84['Serializable']) = LazyJavaClassDescriptor@16['Serializable']
-}
-
-LazyJavaPackageFragment@96['java'] {
-    classes('lang': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('util': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('lang': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('util': Name@124) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@119
-}
-
-LazyJavaPackageFragment@100['lang'] {
-    classes('ArrayList': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('doWithList': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('emptyList': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('ArrayList': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('doWithList': Name@128) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('emptyList': Name@129) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
-}
-
-LazyJavaPackageFragment@105['util'] {
-    classes('ArrayList': Name@126) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Int': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('List': Name@133) = LazyJavaClassDescriptor@117['List'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('doWithList': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('emptyList': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('ArrayList': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('doWithList': Name@128) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('emptyList': Name@129) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaTypeParameterDescriptor@26['E'] {
-    defaultType = JetTypeImpl@135['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-    upperBounds = LinkedHashSet@136[1] { NullableType@137 }
-}
-
-LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@61['E']) = LazyJavaTypeParameterDescriptor@21['E']
-}
-
-LazyJavaTypeParameterResolver@139 {
-    resolve(JavaTypeParameterImpl@140['E']) = LazyJavaTypeParameterDescriptor@26['E']
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
-
-null {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@190[3] { ResolutionCandidate@176, ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-    <name not found> = EmptyList@123[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
deleted file mode 100644
index 0469a7f0753..00000000000
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
+++ /dev/null
@@ -1,125 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Array': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('S': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('a': FqName@11) = null
-    packageFragments('a.Array': FqName@12) = null
-    packageFragments('a.Int': FqName@13) = null
-    packageFragments('a.R': FqName@14) = null
-    packageFragments('a.S': FqName@15) = null
-    packageFragments('a.String': FqName@16) = null
-    packageFragments('a.T': FqName@17) = null
-    packageFragments('a.aaa': FqName@18) = null
-    packageFragments('aaa': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Array': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.R': FqName@26) = null
-    packageFragments('java.lang.S': FqName@27) = null
-    packageFragments('java.lang.String': FqName@28) = null
-    packageFragments('java.lang.T': FqName@29) = null
-    packageFragments('java.lang.aaa': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.Array': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.R': FqName@34) = null
-    packageFragments('kotlin.S': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.T': FqName@37) = null
-    packageFragments('kotlin.aaa': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = null
-    packageFragments('kotlin.jvm': FqName@40) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('aaa': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('foo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('aaa': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('foo': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
deleted file mode 100644
index cd5464ad6cd..00000000000
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
+++ /dev/null
@@ -1,237 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['A<2>']
-    <name not found> = JetTypeImpl@2['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.A': FqName@11) = null
-    packageFragments('a.Int': FqName@12) = null
-    packageFragments('a.R': FqName@13) = null
-    packageFragments('a.T': FqName@14) = null
-    packageFragments('a.it': FqName@15) = null
-    packageFragments('it': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.A': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.R': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.it': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.A': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.R': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.it': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('bar': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('foo': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('it': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('bar': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('foo': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('it': Name@44) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
deleted file mode 100644
index 1942ab71883..00000000000
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-    <name not found> = JetTypeImpl@2['Function2<3>']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Closeable': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('a': FqName@11) = null
-    packageFragments('a.Array': FqName@12) = null
-    packageFragments('a.C': FqName@13) = null
-    packageFragments('a.Closeable': FqName@14) = null
-    packageFragments('a.R': FqName@15) = null
-    packageFragments('a.String': FqName@16) = null
-    packageFragments('a.T': FqName@17) = null
-    packageFragments('a.xs': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Array': FqName@23) = null
-    packageFragments('java.lang.Closeable': FqName@24) = null
-    packageFragments('java.lang.R': FqName@25) = null
-    packageFragments('java.lang.String': FqName@26) = null
-    packageFragments('java.lang.T': FqName@27) = null
-    packageFragments('java.lang.xs': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Array': FqName@30) = null
-    packageFragments('kotlin.Closeable': FqName@31) = null
-    packageFragments('kotlin.R': FqName@32) = null
-    packageFragments('kotlin.String': FqName@33) = null
-    packageFragments('kotlin.T': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-    packageFragments('kotlin.xs': FqName@37) = null
-    packageFragments('xs': FqName@38) = null
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('C': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('foo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('xs': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('C': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('foo': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('xs': Name@49) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[2] { ResolutionCandidate@62, ResolutionCandidate@63 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@62, ResolutionCandidate@63 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
deleted file mode 100644
index 0a0aac41d30..00000000000
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('aa': FqName@9) = null
-    packageFragments('aa.A': FqName@10) = null
-    packageFragments('aa.R': FqName@11) = null
-    packageFragments('aa.T': FqName@12) = null
-    packageFragments('aa.Unit': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.A': FqName@18) = null
-    packageFragments('java.lang.R': FqName@19) = null
-    packageFragments('java.lang.T': FqName@20) = null
-    packageFragments('java.lang.Unit': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.R': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('bar': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('bar': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
deleted file mode 100644
index f1ce47f1edb..00000000000
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('MutableList': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.MutableList': FqName@10) = null
-    packageFragments('a.R': FqName@11) = null
-    packageFragments('a.T': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.MutableList': FqName@17) = null
-    packageFragments('java.lang.R': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.MutableList': FqName@21) = null
-    packageFragments('kotlin.R': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('arrayListOf': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('arrayListOf': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@87[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
deleted file mode 100644
index f5abaf2669e..00000000000
--- a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
+++ /dev/null
@@ -1,203 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('Iterator': FqName@51) = null
-    packageFragments('T': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Any': FqName@57) = null
-    packageFragments('java.lang.Iterator': FqName@58) = null
-    packageFragments('java.lang.T': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Any': FqName@61) = null
-    packageFragments('kotlin.Iterator': FqName@62) = null
-    packageFragments('kotlin.T': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Iterator': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('iterate': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('iterate': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('iterate': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('iterate': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@120[5] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@121[7] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
deleted file mode 100644
index 4e236534352..00000000000
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('List': FqName@3) = null
-    packageFragments('R': FqName@4) = null
-    packageFragments('Set': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.List': FqName@11) = null
-    packageFragments('java.lang.R': FqName@12) = null
-    packageFragments('java.lang.Set': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.util': FqName@15) = LazyJavaPackageFragment@16['util']
-    packageFragments('java.util.List': FqName@17) = null
-    packageFragments('java.util.R': FqName@18) = null
-    packageFragments('java.util.Set': FqName@19) = null
-    packageFragments('java.util.String': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.List': FqName@22) = null
-    packageFragments('kotlin.R': FqName@23) = null
-    packageFragments('kotlin.Set': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('typeConstructorMismatch': FqName@28) = null
-    packageFragments('typeConstructorMismatch.List': FqName@29) = null
-    packageFragments('typeConstructorMismatch.R': FqName@30) = null
-    packageFragments('typeConstructorMismatch.Set': FqName@31) = null
-    packageFragments('typeConstructorMismatch.String': FqName@32) = null
-    topLevelClasses(JavaClassImpl@33['List']) = LazyJavaClassDescriptor@34['List']
-    topLevelClasses(JavaClassImpl@35['Set']) = LazyJavaClassDescriptor@36['Set']
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('util': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('util': Name@43) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('elemAndList': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('elemAndListWithReceiver': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('elemAndList': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('elemAndListWithReceiver': Name@47) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@16['util'] {
-    classes('List': Name@49) = LazyJavaClassDescriptor@34['List'] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Set': Name@51) = LazyJavaClassDescriptor@36['Set'] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('String': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('elemAndList': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('elemAndListWithReceiver': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('elemAndList': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('elemAndListWithReceiver': Name@47) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
deleted file mode 100644
index 22a848b3494..00000000000
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
+++ /dev/null
@@ -1,598 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@4['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassDescriptor@6['ArrayList'] {
-    constructors = ArrayList@7[3] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'] } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['ArrayList']
-}
-
-LazyJavaClassDescriptor@14['Exception'] {
-    constructors = ArrayList@15[5] { JavaConstructorDescriptor@16['<init>'], JavaConstructorDescriptor@17['<init>'], JavaConstructorDescriptor@18['<init>'], ... } // through LazyJavaClassMemberScope@19
-    defaultType = JetTypeImpl@20['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@21['Exception']
-}
-
-LazyJavaClassDescriptor@22['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@23['RandomAccess']
-}
-
-LazyJavaClassDescriptor@24['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@25['Serializable']
-}
-
-LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['AbstractList'] {
-    supertypes = ArrayList@28[2] { LazyJavaClassifierType@29['AbstractCollection<E>'], LazyJavaClassifierType@30['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@13['ArrayList'] {
-    parameters = ArrayList@31[1] { LazyJavaTypeParameterDescriptor@32['E'] }
-    supertypes = ArrayList@33[5] { LazyJavaClassifierType@34['AbstractList<E>'], LazyJavaClassifierType@35['List<E>'], LazyJavaClassifierType@36['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@21['Exception'] {
-    parameters = ArrayList@37[empty]
-    supertypes = ArrayList@38[1] { LazyJavaClassifierType@39['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@23['RandomAccess'] {
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@25['Serializable'] {
-    supertypes = ArrayList@42[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@29['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@43['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassifierType@34['AbstractList<E>'] {
-    classifier = JavaClassImpl@44['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassifierType@45['Cloneable'] {
-    classifier = JavaClassImpl@46['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@47
-}
-
-LazyJavaClassifierType@48['Collection<? extends E>'] {
-    arguments = ArrayList@49[1] { TypeProjectionImpl@50 }
-    classifier = JavaClassImpl@51['Collection']
-    memberScope = SubstitutingScope@52
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaClassifierType@55['Collection<? extends E>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@51['Collection']
-    memberScope = SubstitutingScope@58
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@60
-}
-
-LazyJavaClassifierType@27['Collection<E>'] {
-    classifier = JavaClassImpl@61['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'false': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@66['E'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'false': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@69['E'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'true': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@30['List<E>'] {
-    classifier = JavaClassImpl@73['List']
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@35['List<E>'] {
-    classifier = JavaClassImpl@75['List']
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@76['Object'] {
-    classifier = JavaClassImpl@77['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@79['Object'] {
-    classifier = JavaClassImpl@80['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@36['RandomAccess'] {
-    classifier = JavaClassImpl@83['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@23['RandomAccess']
-}
-
-LazyJavaClassifierType@84['Serializable'] {
-    classifier = JavaClassImpl@85['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@25['Serializable']
-}
-
-LazyJavaClassifierType@86['String'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@90['String'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@93['String'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@96['String'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@88['String']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@98['String'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@92['String']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@100['String'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@95['String']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@102['Throwable'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['Throwable']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@106['Throwable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Throwable']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@109['Throwable'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@111['Throwable']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@112['Throwable'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@104['Throwable']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@114['Throwable'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@111['Throwable']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@116['Throwable'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@108['Throwable']
-    nullable = 'true': Boolean@59
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@105
-}
-
-LazyJavaPackageFragmentProvider@120 {
-    packageFragments('<root>': FqName@121) = LazyJavaPackageFragment@122['<root>']
-    packageFragments('A': FqName@123) = null
-    packageFragments('Any': FqName@124) = null
-    packageFragments('ArrayList': FqName@125) = null
-    packageFragments('B': FqName@126) = null
-    packageFragments('C': FqName@127) = null
-    packageFragments('In': FqName@128) = null
-    packageFragments('Int': FqName@129) = null
-    packageFragments('Out': FqName@130) = null
-    packageFragments('R': FqName@131) = null
-    packageFragments('S': FqName@132) = null
-    packageFragments('Set': FqName@133) = null
-    packageFragments('T': FqName@134) = null
-    packageFragments('Two': FqName@135) = null
-    packageFragments('java': FqName@136) = LazyJavaPackageFragment@137['java']
-    packageFragments('java.io': FqName@138) = LazyJavaPackageFragment@139['io']
-    packageFragments('java.lang': FqName@140) = LazyJavaPackageFragment@141['lang']
-    packageFragments('java.lang.A': FqName@142) = null
-    packageFragments('java.lang.Any': FqName@143) = null
-    packageFragments('java.lang.ArrayList': FqName@144) = null
-    packageFragments('java.lang.B': FqName@145) = null
-    packageFragments('java.lang.C': FqName@146) = null
-    packageFragments('java.lang.In': FqName@147) = null
-    packageFragments('java.lang.Int': FqName@148) = null
-    packageFragments('java.lang.Out': FqName@149) = null
-    packageFragments('java.lang.R': FqName@150) = null
-    packageFragments('java.lang.S': FqName@151) = null
-    packageFragments('java.lang.Set': FqName@152) = null
-    packageFragments('java.lang.T': FqName@153) = null
-    packageFragments('java.lang.Two': FqName@154) = null
-    packageFragments('java.util': FqName@155) = LazyJavaPackageFragment@156['util']
-    packageFragments('java.util.A': FqName@157) = null
-    packageFragments('java.util.Any': FqName@158) = null
-    packageFragments('java.util.ArrayList': FqName@159) = null
-    packageFragments('java.util.B': FqName@160) = null
-    packageFragments('java.util.C': FqName@161) = null
-    packageFragments('java.util.In': FqName@162) = null
-    packageFragments('java.util.Int': FqName@163) = null
-    packageFragments('java.util.Out': FqName@164) = null
-    packageFragments('java.util.R': FqName@165) = null
-    packageFragments('java.util.S': FqName@166) = null
-    packageFragments('java.util.Set': FqName@167) = null
-    packageFragments('java.util.T': FqName@168) = null
-    packageFragments('java.util.Two': FqName@169) = null
-    packageFragments('kotlin': FqName@170) = null
-    packageFragments('kotlin.A': FqName@171) = null
-    packageFragments('kotlin.Any': FqName@172) = null
-    packageFragments('kotlin.ArrayList': FqName@173) = null
-    packageFragments('kotlin.B': FqName@174) = null
-    packageFragments('kotlin.C': FqName@175) = null
-    packageFragments('kotlin.In': FqName@176) = null
-    packageFragments('kotlin.Int': FqName@177) = null
-    packageFragments('kotlin.Out': FqName@178) = null
-    packageFragments('kotlin.R': FqName@179) = null
-    packageFragments('kotlin.S': FqName@180) = null
-    packageFragments('kotlin.Set': FqName@181) = null
-    packageFragments('kotlin.T': FqName@182) = null
-    packageFragments('kotlin.Two': FqName@183) = null
-    packageFragments('kotlin.io': FqName@184) = null
-    packageFragments('kotlin.jvm': FqName@185) = null
-    packageFragments('typeInferenceExpectedTypeMismatch': FqName@186) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.A': FqName@187) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.Any': FqName@188) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.ArrayList': FqName@189) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.B': FqName@190) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.C': FqName@191) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.In': FqName@192) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.Int': FqName@193) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.Out': FqName@194) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.R': FqName@195) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.S': FqName@196) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.Set': FqName@197) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.T': FqName@198) = null
-    packageFragments('typeInferenceExpectedTypeMismatch.Two': FqName@199) = null
-    topLevelClasses(JavaClassImpl@43['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@44['AbstractList']) = LazyJavaClassDescriptor@4['AbstractList']
-    topLevelClasses(JavaClassImpl@200['ArrayList']) = LazyJavaClassDescriptor@6['ArrayList']
-    topLevelClasses(JavaClassImpl@201['Exception']) = LazyJavaClassDescriptor@14['Exception']
-    topLevelClasses(JavaClassImpl@83['RandomAccess']) = LazyJavaClassDescriptor@22['RandomAccess']
-    topLevelClasses(JavaClassImpl@85['Serializable']) = LazyJavaClassDescriptor@24['Serializable']
-    topLevelClasses(JavaClassImpl@202['Set']) = LazyJavaClassDescriptor@203['Set']
-}
-
-LazyJavaPackageFragment@137['java'] {
-    classes('lang': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('util': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('lang': Name@208) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('util': Name@210) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@205
-}
-
-LazyJavaPackageFragment@141['lang'] {
-    classes('ArrayList': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('Exception': Name@214) = LazyJavaClassDescriptor@14['Exception'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('bar': Name@215) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('foo': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('newList': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('use': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('ArrayList': Name@212) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('Exception': Name@214) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('bar': Name@215) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('foo': Name@216) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('newList': Name@217) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('use': Name@218) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@219 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-LazyJavaPackageFragment@156['util'] {
-    classes('Any': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('ArrayList': Name@222) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Exception': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Int': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('Set': Name@224) = LazyJavaClassDescriptor@203['Set'] // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('bar': Name@215) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('foo': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('newList': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('use': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('ArrayList': Name@212) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('Exception': Name@214) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('bar': Name@215) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('foo': Name@216) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('newList': Name@217) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('use': Name@218) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    memberIndex = computeMemberIndex$1@225 // through LazyPackageFragmentScopeForJavaPackage@221
-}
-
-LazyJavaTypeParameterDescriptor@32['E'] {
-    defaultType = JetTypeImpl@226['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-    upperBounds = LinkedHashSet@227[1] { NullableType@228 }
-}
-
-LazyJavaTypeParameterResolver@229 {
-    resolve(JavaTypeParameterImpl@230['E']) = LazyJavaTypeParameterDescriptor@32['E']
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[4] { ResolutionCandidate@310, ResolutionCandidate@311, ResolutionCandidate@312, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[4] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-null {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@342[3] { ResolutionCandidate@305, ResolutionCandidate@306, ResolutionCandidate@307 }
-    <name not found> = ArrayList@343[5] { ResolutionCandidate@310, ResolutionCandidate@311, ResolutionCandidate@312, ... }
-    <name not found> = ArrayList@344[5] { ResolutionCandidate@315, ResolutionCandidate@316, ResolutionCandidate@317, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
deleted file mode 100644
index 837e4c82df5..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/conflictingSubstitutionsFromUpperBound.lazy.log
+++ /dev/null
@@ -1,428 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractSet'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['Exception']
-}
-
-LazyJavaClassDescriptor@12['HashSet'] {
-    constructors = ArrayList@13[5] { JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], ... } // through LazyJavaClassMemberScope@17
-    defaultType = JetTypeImpl@18['HashSet<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@19['HashSet']
-}
-
-LazyJavaClassDescriptor@20['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractSet'] {
-    parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['E'] }
-    supertypes = ArrayList@28[2] { LazyJavaClassifierType@29['AbstractCollection<E>'], LazyJavaClassifierType@30['Set<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['Exception'] {
-    parameters = ArrayList@31[empty]
-    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@19['HashSet'] {
-    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['E'] }
-    supertypes = ArrayList@36[4] { LazyJavaClassifierType@37['AbstractSet<E>'], LazyJavaClassifierType@38['Set<E>'], LazyJavaClassifierType@39['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@21['Serializable'] {
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@29['AbstractCollection<E>'] {
-    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    classifier = JavaClassImpl@44['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@37['AbstractSet<E>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['AbstractSet']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractSet']
-}
-
-LazyJavaClassifierType@39['Cloneable'] {
-    classifier = JavaClassImpl@48['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@49
-}
-
-LazyJavaClassifierType@50['Collection<? extends E>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@53['Collection']
-    memberScope = SubstitutingScope@54
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@57['Collection<? extends E>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@53['Collection']
-    memberScope = SubstitutingScope@60
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@25['Collection<E>'] {
-    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@65['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@66['E'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@97['Object'] {
-    classifier = JavaClassImpl@98['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@99['Serializable'] {
-    classifier = JavaClassImpl@100['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
-}
-
-LazyJavaClassifierType@30['Set<E>'] {
-    classifier = JavaClassImpl@101['Set']
-    typeConstructor = DeserializedClassTypeConstructor@102
-}
-
-LazyJavaClassifierType@38['Set<E>'] {
-    classifier = JavaClassImpl@103['Set']
-    typeConstructor = DeserializedClassTypeConstructor@102
-}
-
-LazyJavaClassifierType@104['String'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@108['String'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@111['String'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@114['String'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@116['String'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@110['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@118['String'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@106['String']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@120['Throwable'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@124['Throwable'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@126['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@127['Throwable'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@129['Throwable']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@130['Throwable'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@129['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@132['Throwable'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@126['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@134['Throwable'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@122['Throwable']
-    nullable = 'true': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@137['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@123
-}
-
-LazyJavaPackageFragmentProvider@138 {
-    packageFragments('<root>': FqName@139) = LazyJavaPackageFragment@140['<root>']
-    packageFragments('C': FqName@141) = null
-    packageFragments('Collection': FqName@142) = null
-    packageFragments('Int': FqName@143) = null
-    packageFragments('List': FqName@144) = null
-    packageFragments('T': FqName@145) = null
-    packageFragments('g': FqName@146) = null
-    packageFragments('g.C': FqName@147) = null
-    packageFragments('g.Collection': FqName@148) = null
-    packageFragments('g.Int': FqName@149) = null
-    packageFragments('g.List': FqName@150) = null
-    packageFragments('g.T': FqName@151) = null
-    packageFragments('java': FqName@152) = LazyJavaPackageFragment@153['java']
-    packageFragments('java.io': FqName@154) = LazyJavaPackageFragment@155['io']
-    packageFragments('java.lang': FqName@156) = LazyJavaPackageFragment@157['lang']
-    packageFragments('java.lang.C': FqName@158) = null
-    packageFragments('java.lang.Collection': FqName@159) = null
-    packageFragments('java.lang.Int': FqName@160) = null
-    packageFragments('java.lang.List': FqName@161) = null
-    packageFragments('java.lang.T': FqName@162) = null
-    packageFragments('java.util': FqName@163) = LazyJavaPackageFragment@164['util']
-    packageFragments('java.util.HashSet': FqName@165) = null
-    packageFragments('kotlin': FqName@166) = null
-    packageFragments('kotlin.C': FqName@167) = null
-    packageFragments('kotlin.Collection': FqName@168) = null
-    packageFragments('kotlin.Int': FqName@169) = null
-    packageFragments('kotlin.List': FqName@170) = null
-    packageFragments('kotlin.T': FqName@171) = null
-    packageFragments('kotlin.io': FqName@172) = null
-    packageFragments('kotlin.jvm': FqName@173) = null
-    topLevelClasses(JavaClassImpl@44['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@47['AbstractSet']) = LazyJavaClassDescriptor@2['AbstractSet']
-    topLevelClasses(JavaClassImpl@174['Exception']) = LazyJavaClassDescriptor@4['Exception']
-    topLevelClasses(JavaClassImpl@175['HashSet']) = LazyJavaClassDescriptor@12['HashSet']
-    topLevelClasses(JavaClassImpl@100['Serializable']) = LazyJavaClassDescriptor@20['Serializable']
-}
-
-LazyJavaPackageFragment@153['java'] {
-    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('util': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('lang': Name@180) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('util': Name@182) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@177
-}
-
-LazyJavaPackageFragment@157['lang'] {
-    classes('Exception': Name@184) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('HashSet': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('convert': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('Exception': Name@184) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('HashSet': Name@186) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('convert': Name@187) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@188 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-LazyJavaPackageFragment@164['util'] {
-    classes('HashSet': Name@189) = LazyJavaClassDescriptor@12['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@179 // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('HashSet': Name@191) = EmptyList@181[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@190
-}
-
-LazyJavaTypeParameterDescriptor@35['E'] {
-    defaultType = JetTypeImpl@193['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-    upperBounds = LinkedHashSet@194[1] { NullableType@195 }
-}
-
-LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaTypeParameterDescriptor@27['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@23['E']
-}
-
-LazyJavaTypeParameterResolver@197 {
-    resolve(JavaTypeParameterImpl@198['E']) = LazyJavaTypeParameterDescriptor@35['E']
-}
-
-LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@27['E']
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[4] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[4] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-}
-
-null {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@230[5] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@231[5] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-    <name not found> = EmptyList@181[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
deleted file mode 100644
index 9f99f143ca3..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
+++ /dev/null
@@ -1,365 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A': FqName@50) = null
-    packageFragments('Int': FqName@51) = null
-    packageFragments('List': FqName@52) = null
-    packageFragments('Map': FqName@53) = null
-    packageFragments('MutableList': FqName@54) = null
-    packageFragments('R': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('U': FqName@57) = null
-    packageFragments('a': FqName@58) = null
-    packageFragments('a.A': FqName@59) = null
-    packageFragments('a.Int': FqName@60) = null
-    packageFragments('a.List': FqName@61) = null
-    packageFragments('a.Map': FqName@62) = null
-    packageFragments('a.MutableList': FqName@63) = null
-    packageFragments('a.R': FqName@64) = null
-    packageFragments('a.T': FqName@65) = null
-    packageFragments('a.U': FqName@66) = null
-    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    packageFragments('java.lang.A': FqName@71) = null
-    packageFragments('java.lang.Int': FqName@72) = null
-    packageFragments('java.lang.List': FqName@73) = null
-    packageFragments('java.lang.Map': FqName@74) = null
-    packageFragments('java.lang.MutableList': FqName@75) = null
-    packageFragments('java.lang.R': FqName@76) = null
-    packageFragments('java.lang.T': FqName@77) = null
-    packageFragments('java.lang.U': FqName@78) = null
-    packageFragments('kotlin': FqName@79) = null
-    packageFragments('kotlin.A': FqName@80) = null
-    packageFragments('kotlin.Int': FqName@81) = null
-    packageFragments('kotlin.List': FqName@82) = null
-    packageFragments('kotlin.Map': FqName@83) = null
-    packageFragments('kotlin.MutableList': FqName@84) = null
-    packageFragments('kotlin.R': FqName@85) = null
-    packageFragments('kotlin.T': FqName@86) = null
-    packageFragments('kotlin.U': FqName@87) = null
-    packageFragments('kotlin.io': FqName@88) = null
-    packageFragments('kotlin.jvm': FqName@89) = null
-    topLevelClasses(JavaClassImpl@90['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@68['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@94) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@70['lang'] {
-    classes('Exception': Name@97) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyList': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyListOfA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyStrangeMap': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyStrangeMap1': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyStrangeMap2': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyStrangeMap3': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('emptyStrangeMap4': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('foo': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@93 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('Exception': Name@97) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyList': Name@99) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyListOfA': Name@100) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyStrangeMap': Name@101) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyStrangeMap1': Name@102) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyStrangeMap2': Name@103) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyStrangeMap3': Name@104) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('emptyStrangeMap4': Name@105) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('foo': Name@106) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-null {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@212[5] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@213[5] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@214[5] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@215[5] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@216[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@217[5] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@218[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@219[5] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
deleted file mode 100644
index 3480165d5d2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
+++ /dev/null
@@ -1,324 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Any': FqName@53) = null
-    packageFragments('B': FqName@54) = null
-    packageFragments('C': FqName@55) = null
-    packageFragments('In': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.A': FqName@62) = null
-    packageFragments('java.lang.Any': FqName@63) = null
-    packageFragments('java.lang.B': FqName@64) = null
-    packageFragments('java.lang.C': FqName@65) = null
-    packageFragments('java.lang.In': FqName@66) = null
-    packageFragments('java.lang.T': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.A': FqName@69) = null
-    packageFragments('kotlin.Any': FqName@70) = null
-    packageFragments('kotlin.B': FqName@71) = null
-    packageFragments('kotlin.C': FqName@72) = null
-    packageFragments('kotlin.In': FqName@73) = null
-    packageFragments('kotlin.T': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('s': FqName@77) = null
-    packageFragments('s.A': FqName@78) = null
-    packageFragments('s.Any': FqName@79) = null
-    packageFragments('s.B': FqName@80) = null
-    packageFragments('s.C': FqName@81) = null
-    packageFragments('s.In': FqName@82) = null
-    packageFragments('s.T': FqName@83) = null
-    topLevelClasses(JavaClassImpl@84['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@61['lang'] {
-    classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('bar': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('use': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('bar': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('foo': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('use': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[4] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[4] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
-
-null {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@183[5] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@184[5] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-    <name not found> = EmptyList@89[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
deleted file mode 100644
index 9a796d9a7d9..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/kt2856.lazy.log
+++ /dev/null
@@ -1,436 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@4['AbstractMap'] {
-    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractMap']
-}
-
-LazyJavaClassDescriptor@10['HashMap'] {
-    constructors = ArrayList@11[4] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@15
-    nestedClasses('getOrElse1': Name@5) = null // through LazyJavaClassMemberScope@15
-    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@20['HashMap']
-}
-
-LazyJavaClassDescriptor@21['Serializable'] {
-    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassTypeConstructor@9['AbstractMap'] {
-    parameters = ArrayList@25[2] { LazyJavaTypeParameterDescriptor@26['K'], LazyJavaTypeParameterDescriptor@27['V'] }
-    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@20['HashMap'] {
-    parameters = ArrayList@30[2] { LazyJavaTypeParameterDescriptor@31['K'], LazyJavaTypeParameterDescriptor@32['V'] }
-    supertypes = ArrayList@33[4] { LazyJavaClassifierType@34['AbstractMap<K, V>'], LazyJavaClassifierType@35['Map<K, V>'], LazyJavaClassifierType@36['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@24['Serializable'] {
-    parameters = ArrayList@37[empty]
-    supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
-}
-
-LazyJavaClassifierType@34['AbstractMap<K, V>'] {
-    arguments = ArrayList@40[2] { TypeProjectionImpl@41, TypeProjectionImpl@42 }
-    classifier = JavaClassImpl@43['AbstractMap']
-    memberScope = SubstitutingScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractMap']
-}
-
-LazyJavaClassifierType@36['Cloneable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Cloneable']
-    memberScope = DeserializedClassMemberScope@47
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@49['K'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@51['K']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@63['K'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['K']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@67['K'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@72['K'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@65['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaClassifierType@74['K'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@76['K'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@51['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@79[2] { TypeProjectionImpl@80, TypeProjectionImpl@81 }
-    classifier = JavaClassImpl@82['Map']
-    memberScope = SubstitutingScope@83
-    nullable = 'false': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@85['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@86[2] { TypeProjectionImpl@87, TypeProjectionImpl@88 }
-    classifier = JavaClassImpl@82['Map']
-    memberScope = SubstitutingScope@89
-    nullable = 'true': Boolean@69
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@29['Map<K, V>'] {
-    arguments = ArrayList@91[2] { TypeProjectionImpl@92, TypeProjectionImpl@93 }
-    classifier = JavaClassImpl@94['Map']
-    memberScope = SubstitutingScope@95
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@35['Map<K, V>'] {
-    arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
-    classifier = JavaClassImpl@99['Map']
-    memberScope = SubstitutingScope@100
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@101['Object'] {
-    classifier = JavaClassImpl@102['Object']
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@104['Object'] {
-    classifier = JavaClassImpl@105['Object']
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@106['Serializable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Serializable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassifierType@109['V'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@113['V'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['V']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@116['V'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['V']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
-}
-
-LazyJavaClassifierType@120['V'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['V']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@123['V'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['V']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@126['V'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@125['V']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@128['V'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@122['V']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@130['V'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaClassifierType@132['V'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@118['V']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
-}
-
-LazyJavaClassifierType@134['V'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@115['V']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-LazyJavaPackageFragmentProvider@136 {
-    packageFragments('<root>': FqName@137) = LazyJavaPackageFragment@138['<root>']
-    packageFragments('Any': FqName@139) = null
-    packageFragments('Array': FqName@140) = null
-    packageFragments('Int': FqName@141) = null
-    packageFragments('K': FqName@142) = null
-    packageFragments('Map': FqName@143) = null
-    packageFragments('String': FqName@144) = null
-    packageFragments('V': FqName@145) = null
-    packageFragments('V1': FqName@146) = null
-    packageFragments('d': FqName@147) = null
-    packageFragments('d.Any': FqName@148) = null
-    packageFragments('d.Array': FqName@149) = null
-    packageFragments('d.Int': FqName@150) = null
-    packageFragments('d.K': FqName@151) = null
-    packageFragments('d.Map': FqName@152) = null
-    packageFragments('d.String': FqName@153) = null
-    packageFragments('d.V': FqName@154) = null
-    packageFragments('d.V1': FqName@155) = null
-    packageFragments('d.inline': FqName@156) = null
-    packageFragments('inline': FqName@157) = null
-    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
-    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
-    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
-    packageFragments('java.lang.Any': FqName@164) = null
-    packageFragments('java.lang.Array': FqName@165) = null
-    packageFragments('java.lang.Int': FqName@166) = null
-    packageFragments('java.lang.K': FqName@167) = null
-    packageFragments('java.lang.Map': FqName@168) = null
-    packageFragments('java.lang.String': FqName@169) = null
-    packageFragments('java.lang.V': FqName@170) = null
-    packageFragments('java.lang.V1': FqName@171) = null
-    packageFragments('java.lang.inline': FqName@172) = null
-    packageFragments('java.util': FqName@173) = LazyJavaPackageFragment@174['util']
-    packageFragments('java.util.HashMap': FqName@175) = null
-    packageFragments('kotlin': FqName@176) = null
-    packageFragments('kotlin.Any': FqName@177) = null
-    packageFragments('kotlin.Array': FqName@178) = null
-    packageFragments('kotlin.Int': FqName@179) = null
-    packageFragments('kotlin.K': FqName@180) = null
-    packageFragments('kotlin.Map': FqName@181) = null
-    packageFragments('kotlin.String': FqName@182) = null
-    packageFragments('kotlin.V': FqName@183) = null
-    packageFragments('kotlin.V1': FqName@184) = null
-    packageFragments('kotlin.inline': FqName@185) = null
-    packageFragments('kotlin.io': FqName@186) = null
-    packageFragments('kotlin.jvm': FqName@187) = null
-    topLevelClasses(JavaClassImpl@43['AbstractMap']) = LazyJavaClassDescriptor@4['AbstractMap']
-    topLevelClasses(JavaClassImpl@188['HashMap']) = LazyJavaClassDescriptor@10['HashMap']
-    topLevelClasses(JavaClassImpl@108['Serializable']) = LazyJavaClassDescriptor@21['Serializable']
-}
-
-LazyJavaPackageFragment@159['java'] {
-    classes('lang': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('util': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('lang': Name@193) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('util': Name@194) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@190
-}
-
-LazyJavaPackageFragment@163['lang'] {
-    classes('HashMap': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('defaultValue': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('getOrElse1': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('println': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('HashMap': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('defaultValue': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('println': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaPackageFragment@174['util'] {
-    classes('HashMap': Name@201) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('HashMap': Name@203) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@204 // through LazyPackageFragmentScopeForJavaPackage@202
-}
-
-LazyJavaTypeParameterDescriptor@31['K'] {
-    defaultType = JetTypeImpl@205['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
-}
-
-LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
-}
-
-LazyJavaTypeParameterDescriptor@32['V'] {
-    defaultType = JetTypeImpl@208['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
-}
-
-LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
-}
-
-LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['K']) = LazyJavaTypeParameterDescriptor@26['K']
-    resolve(JavaTypeParameterImpl@213['V']) = LazyJavaTypeParameterDescriptor@27['V']
-}
-
-LazyJavaTypeParameterResolver@214 {
-    resolve(JavaTypeParameterImpl@215['K']) = LazyJavaTypeParameterDescriptor@31['K']
-    resolve(JavaTypeParameterImpl@216['V']) = LazyJavaTypeParameterDescriptor@32['V']
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@266[4] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
deleted file mode 100644
index 40d98d8ef2d..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/nonNullUpperBound.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('A': FqName@50) = null
-    packageFragments('Any': FqName@51) = null
-    packageFragments('R': FqName@52) = null
-    packageFragments('T': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.A': FqName@58) = null
-    packageFragments('java.lang.Any': FqName@59) = null
-    packageFragments('java.lang.R': FqName@60) = null
-    packageFragments('java.lang.T': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.A': FqName@63) = null
-    packageFragments('kotlin.Any': FqName@64) = null
-    packageFragments('kotlin.R': FqName@65) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    topLevelClasses(JavaClassImpl@69['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Exception': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('unescape': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('unescapeA': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Exception': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('unescape': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('unescapeA': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@72) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('unescape': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('unescapeA': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Exception': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('unescape': Name@73) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('unescapeA': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@118[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@119[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
deleted file mode 100644
index 5b688e1da97..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Base': FqName@3) = null
-    packageFragments('Hello': FqName@4) = null
-    packageFragments('Hello.Base': FqName@5) = null
-    packageFragments('Hello.Client': FqName@6) = null
-    packageFragments('Hello.Int': FqName@7) = null
-    packageFragments('Hello.String': FqName@8) = null
-    packageFragments('Hello.StringBase': FqName@9) = null
-    packageFragments('Hello.T': FqName@10) = null
-    packageFragments('Hello.X': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('String': FqName@13) = null
-    packageFragments('T': FqName@14) = null
-    packageFragments('X': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Base': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.String': FqName@22) = null
-    packageFragments('java.lang.T': FqName@23) = null
-    packageFragments('java.lang.X': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Base': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.T': FqName@29) = null
-    packageFragments('kotlin.X': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Client': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('StringBase': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Client': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('StringBase': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
deleted file mode 100644
index c901ed71fdc..00000000000
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
+++ /dev/null
@@ -1,196 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['MutableSet<1>']
-    <name not found> = JetTypeImpl@2['U']
-    <name not found> = JetTypeImpl@3['U']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Any': FqName@7) = null
-    packageFragments('MutableList': FqName@8) = null
-    packageFragments('MutableSet': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('T': FqName@11) = null
-    packageFragments('U': FqName@12) = null
-    packageFragments('V': FqName@13) = null
-    packageFragments('a': FqName@14) = null
-    packageFragments('a.Any': FqName@15) = null
-    packageFragments('a.MutableList': FqName@16) = null
-    packageFragments('a.MutableSet': FqName@17) = null
-    packageFragments('a.String': FqName@18) = null
-    packageFragments('a.T': FqName@19) = null
-    packageFragments('a.U': FqName@20) = null
-    packageFragments('a.V': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.Any': FqName@26) = null
-    packageFragments('java.lang.MutableList': FqName@27) = null
-    packageFragments('java.lang.MutableSet': FqName@28) = null
-    packageFragments('java.lang.String': FqName@29) = null
-    packageFragments('java.lang.T': FqName@30) = null
-    packageFragments('java.lang.U': FqName@31) = null
-    packageFragments('java.lang.V': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.Any': FqName@34) = null
-    packageFragments('kotlin.MutableList': FqName@35) = null
-    packageFragments('kotlin.MutableSet': FqName@36) = null
-    packageFragments('kotlin.String': FqName@37) = null
-    packageFragments('kotlin.T': FqName@38) = null
-    packageFragments('kotlin.U': FqName@39) = null
-    packageFragments('kotlin.V': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('arrayListOf': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('baz': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('checkItIsExactlyAny': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('arrayListOf': Name@49) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('baz': Name@52) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('checkItIsExactlyAny': Name@53) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('foo': Name@54) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
deleted file mode 100644
index 664774839f6..00000000000
--- a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
+++ /dev/null
@@ -1,485 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Property<1>']
-    <name not found> = JetTypeImpl@2['Property<1>']
-}
-
-LazyJavaClassDescriptor@3['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@4['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@5['AbstractSet'] {
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractSet']
-}
-
-LazyJavaClassDescriptor@7['Exception'] {
-    constructors = ArrayList@8[5] { JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], JavaConstructorDescriptor@11['<init>'], ... } // through LazyJavaClassMemberScope@12
-    defaultType = JetTypeImpl@13['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@14['Exception']
-}
-
-LazyJavaClassDescriptor@15['HashSet'] {
-    constructors = ArrayList@16[5] { JavaConstructorDescriptor@17['<init>'], JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], ... } // through LazyJavaClassMemberScope@20
-    defaultType = JetTypeImpl@21['HashSet<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@22['HashSet']
-}
-
-LazyJavaClassDescriptor@23['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassTypeConstructor@4['AbstractCollection'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['E'] }
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@6['AbstractSet'] {
-    parameters = ArrayList@29[1] { LazyJavaTypeParameterDescriptor@30['E'] }
-    supertypes = ArrayList@31[2] { LazyJavaClassifierType@32['AbstractCollection<E>'], LazyJavaClassifierType@33['Set<E>'] }
-}
-
-LazyJavaClassTypeConstructor@14['Exception'] {
-    parameters = ArrayList@34[empty]
-    supertypes = ArrayList@35[1] { LazyJavaClassifierType@36['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@22['HashSet'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['E'] }
-    supertypes = ArrayList@39[4] { LazyJavaClassifierType@40['AbstractSet<E>'], LazyJavaClassifierType@41['Set<E>'], LazyJavaClassifierType@42['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@24['Serializable'] {
-    supertypes = ArrayList@43[1] { JetTypeImpl@44['Any'] }
-}
-
-LazyJavaClassifierType@32['AbstractCollection<E>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@4['AbstractCollection']
-}
-
-LazyJavaClassifierType@40['AbstractSet<E>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['AbstractSet']
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractSet']
-}
-
-LazyJavaClassifierType@42['Cloneable'] {
-    classifier = JavaClassImpl@51['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@53['Collection<? extends E>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@56['Collection']
-    memberScope = SubstitutingScope@57
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@60['Collection<? extends E>'] {
-    arguments = ArrayList@61[1] { TypeProjectionImpl@62 }
-    classifier = JavaClassImpl@56['Collection']
-    memberScope = SubstitutingScope@63
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaClassifierType@28['Collection<E>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@68['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@69['E'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@71['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['E']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@88['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@71['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@102['Object'] {
-    classifier = JavaClassImpl@103['Object']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@105['Object'] {
-    classifier = JavaClassImpl@106['Object']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@107['Serializable'] {
-    classifier = JavaClassImpl@108['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassifierType@33['Set<E>'] {
-    arguments = ArrayList@109[1] { TypeProjectionImpl@110 }
-    classifier = JavaClassImpl@111['Set']
-    typeConstructor = DeserializedClassTypeConstructor@112
-}
-
-LazyJavaClassifierType@41['Set<E>'] {
-    classifier = JavaClassImpl@113['Set']
-    typeConstructor = DeserializedClassTypeConstructor@112
-}
-
-LazyJavaClassifierType@114['String'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@118['String'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@120['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@121['String'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@116['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@128['String'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@120['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@130['Throwable'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@132['Throwable']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@134['Throwable'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@136['Throwable']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@137['Throwable'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@139['Throwable']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@140['Throwable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@132['Throwable']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@142['Throwable'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@136['Throwable']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@144['Throwable'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@139['Throwable']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@147['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaPackageFragmentProvider@148 {
-    packageFragments('<root>': FqName@149) = LazyJavaPackageFragment@150['<root>']
-    packageFragments('Comparable': FqName@151) = null
-    packageFragments('K': FqName@152) = null
-    packageFragments('MutableMap': FqName@153) = null
-    packageFragments('Set': FqName@154) = null
-    packageFragments('String': FqName@155) = null
-    packageFragments('T': FqName@156) = null
-    packageFragments('V': FqName@157) = null
-    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
-    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
-    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
-    packageFragments('java.lang.Comparable': FqName@164) = null
-    packageFragments('java.lang.K': FqName@165) = null
-    packageFragments('java.lang.MutableMap': FqName@166) = null
-    packageFragments('java.lang.Set': FqName@167) = null
-    packageFragments('java.lang.String': FqName@168) = null
-    packageFragments('java.lang.T': FqName@169) = null
-    packageFragments('java.lang.V': FqName@170) = null
-    packageFragments('java.util': FqName@171) = LazyJavaPackageFragment@172['util']
-    packageFragments('java.util.HashSet': FqName@173) = null
-    packageFragments('kotlin': FqName@174) = null
-    packageFragments('kotlin.Comparable': FqName@175) = null
-    packageFragments('kotlin.K': FqName@176) = null
-    packageFragments('kotlin.MutableMap': FqName@177) = null
-    packageFragments('kotlin.Set': FqName@178) = null
-    packageFragments('kotlin.String': FqName@179) = null
-    packageFragments('kotlin.T': FqName@180) = null
-    packageFragments('kotlin.V': FqName@181) = null
-    packageFragments('kotlin.io': FqName@182) = null
-    packageFragments('kotlin.jvm': FqName@183) = null
-    packageFragments('m': FqName@184) = null
-    packageFragments('m.Comparable': FqName@185) = null
-    packageFragments('m.K': FqName@186) = null
-    packageFragments('m.MutableMap': FqName@187) = null
-    packageFragments('m.Property': FqName@188) = null
-    packageFragments('m.Set': FqName@189) = null
-    packageFragments('m.String': FqName@190) = null
-    packageFragments('m.T': FqName@191) = null
-    packageFragments('m.V': FqName@192) = null
-    topLevelClasses(JavaClassImpl@47['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@50['AbstractSet']) = LazyJavaClassDescriptor@5['AbstractSet']
-    topLevelClasses(JavaClassImpl@193['Exception']) = LazyJavaClassDescriptor@7['Exception']
-    topLevelClasses(JavaClassImpl@194['HashSet']) = LazyJavaClassDescriptor@15['HashSet']
-    topLevelClasses(JavaClassImpl@108['Serializable']) = LazyJavaClassDescriptor@23['Serializable']
-}
-
-LazyJavaPackageFragment@159['java'] {
-    classes('lang': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('util': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('lang': Name@199) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('util': Name@201) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@196
-}
-
-LazyJavaPackageFragment@163['lang'] {
-    classes('Exception': Name@203) = LazyJavaClassDescriptor@7['Exception'] // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('HashSet': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('Property': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('getOrPut': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('Exception': Name@203) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('HashSet': Name@205) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('Property': Name@206) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('getOrPut': Name@207) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@204
-}
-
-LazyJavaPackageFragment@172['util'] {
-    classes('HashSet': Name@209) = LazyJavaClassDescriptor@15['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('HashSet': Name@211) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@212 // through LazyPackageFragmentScopeForJavaPackage@210
-}
-
-LazyJavaTypeParameterDescriptor@38['E'] {
-    defaultType = JetTypeImpl@213['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-    upperBounds = LinkedHashSet@214[1] { NullableType@215 }
-}
-
-LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaTypeParameterDescriptor@26['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@217['E']) = LazyJavaTypeParameterDescriptor@38['E']
-}
-
-LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@85['E']) = LazyJavaTypeParameterDescriptor@30['E']
-}
-
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@88['E']) = LazyJavaTypeParameterDescriptor@26['E']
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[4] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[4] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-}
-
-null {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@267[5] { ResolutionCandidate@251, ResolutionCandidate@252, ResolutionCandidate@253, ... }
-    <name not found> = ArrayList@268[5] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
-    <name not found> = ArrayList@269[8] { ResolutionCandidate@256, ResolutionCandidate@257, ResolutionCandidate@258, ... }
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-    <name not found> = EmptyList@200[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log b/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
deleted file mode 100644
index 95585198ac8..00000000000
--- a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Pair': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Pair': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Pair': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Pair': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('Pair': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
deleted file mode 100644
index a7c944b7e45..00000000000
--- a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
+++ /dev/null
@@ -1,217 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Super': FqName@10) = null
-    packageFragments('Test': FqName@11) = null
-    packageFragments('TestPCParameters': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.Super': FqName@18) = null
-    packageFragments('java.lang.x': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.Super': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kotlin.x': FqName@25) = null
-    packageFragments('x': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('c5': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('v5': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('v6': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('x': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('c5': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('v5': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('v6': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('x': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@79, ResolutionCandidate@80, ResolutionCandidate@81, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@69, ResolutionCandidate@70, ResolutionCandidate@71, ... }
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log b/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
deleted file mode 100644
index 56080c91cea..00000000000
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
+++ /dev/null
@@ -1,1733 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Char': FqName@7) = null
-    packageFragments('Function0': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('c': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.B': FqName@18) = null
-    packageFragments('java.lang.C': FqName@19) = null
-    packageFragments('java.lang.Char': FqName@20) = null
-    packageFragments('java.lang.Function0': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.c': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.Any': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.C': FqName@29) = null
-    packageFragments('kotlin.Char': FqName@30) = null
-    packageFragments('kotlin.Function0': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.String': FqName@33) = null
-    packageFragments('kotlin.c': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Char': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Function0': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Int': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('Unit': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('bar': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('c': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('bar': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('c': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('bar': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('c': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('compareTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('bar': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('c': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('compareTo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('equals': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@364 }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
-}
-
-ResolutionTaskHolder@368 {
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@370 }
-}
-
-ResolutionTaskHolder@371 {
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-}
-
-ResolutionTaskHolder@374 {
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@376 }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@379 }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@385 }
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-}
-
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-}
-
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-}
-
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-}
-
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[1] { ResolutionCandidate@475 }
-}
-
-ResolutionTaskHolder@476 {
-    <name not found> = ArrayList@477[1] { ResolutionCandidate@478 }
-}
-
-ResolutionTaskHolder@479 {
-    <name not found> = ArrayList@480[1] { ResolutionCandidate@481 }
-}
-
-ResolutionTaskHolder@482 {
-    <name not found> = ArrayList@483[1] { ResolutionCandidate@484 }
-}
-
-ResolutionTaskHolder@485 {
-    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
-}
-
-ResolutionTaskHolder@488 {
-    <name not found> = ArrayList@489[1] { ResolutionCandidate@490 }
-}
-
-ResolutionTaskHolder@491 {
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@493 }
-}
-
-ResolutionTaskHolder@494 {
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@496 }
-}
-
-ResolutionTaskHolder@497 {
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@499 }
-}
-
-ResolutionTaskHolder@500 {
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@502 }
-}
-
-ResolutionTaskHolder@503 {
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@505 }
-}
-
-ResolutionTaskHolder@506 {
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@508 }
-}
-
-ResolutionTaskHolder@509 {
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@511 }
-}
-
-ResolutionTaskHolder@512 {
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@514 }
-}
-
-ResolutionTaskHolder@515 {
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@517 }
-}
-
-ResolutionTaskHolder@518 {
-    <name not found> = ArrayList@519[1] { ResolutionCandidate@520 }
-}
-
-ResolutionTaskHolder@521 {
-    <name not found> = ArrayList@522[1] { ResolutionCandidate@523 }
-}
-
-ResolutionTaskHolder@524 {
-    <name not found> = ArrayList@525[1] { ResolutionCandidate@526 }
-}
-
-ResolutionTaskHolder@527 {
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@529 }
-}
-
-ResolutionTaskHolder@530 {
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@532 }
-}
-
-ResolutionTaskHolder@533 {
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@535 }
-}
-
-ResolutionTaskHolder@536 {
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@538 }
-}
-
-ResolutionTaskHolder@539 {
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@541 }
-}
-
-ResolutionTaskHolder@542 {
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@544 }
-}
-
-ResolutionTaskHolder@545 {
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@547 }
-}
-
-ResolutionTaskHolder@548 {
-    <name not found> = ArrayList@549[1] { ResolutionCandidate@550 }
-}
-
-ResolutionTaskHolder@551 {
-    <name not found> = ArrayList@552[1] { ResolutionCandidate@553 }
-}
-
-ResolutionTaskHolder@554 {
-    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
-}
-
-ResolutionTaskHolder@557 {
-    <name not found> = ArrayList@558[1] { ResolutionCandidate@559 }
-}
-
-ResolutionTaskHolder@560 {
-    <name not found> = ArrayList@561[1] { ResolutionCandidate@562 }
-}
-
-ResolutionTaskHolder@563 {
-    <name not found> = ArrayList@564[1] { ResolutionCandidate@565 }
-}
-
-ResolutionTaskHolder@566 {
-    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
-}
-
-ResolutionTaskHolder@569 {
-    <name not found> = ArrayList@570[1] { ResolutionCandidate@571 }
-}
-
-ResolutionTaskHolder@572 {
-    <name not found> = ArrayList@573[1] { ResolutionCandidate@574 }
-}
-
-ResolutionTaskHolder@575 {
-    <name not found> = ArrayList@576[1] { ResolutionCandidate@577 }
-}
-
-ResolutionTaskHolder@578 {
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
-}
-
-ResolutionTaskHolder@581 {
-    <name not found> = ArrayList@582[1] { ResolutionCandidate@583 }
-}
-
-ResolutionTaskHolder@584 {
-    <name not found> = ArrayList@585[1] { ResolutionCandidate@586 }
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = ArrayList@588[1] { ResolutionCandidate@589 }
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = ArrayList@591[2] { ResolutionCandidate@592, ResolutionCandidate@593 }
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[2] { ResolutionCandidate@596, ResolutionCandidate@597 }
-}
-
-ResolutionTaskHolder@598 {
-    <name not found> = ArrayList@599[2] { ResolutionCandidate@600, ResolutionCandidate@601 }
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = ArrayList@603[2] { ResolutionCandidate@604, ResolutionCandidate@605 }
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[2] { ResolutionCandidate@608, ResolutionCandidate@609 }
-}
-
-ResolutionTaskHolder@610 {
-    <name not found> = ArrayList@611[3] { ResolutionCandidate@612, ResolutionCandidate@613, ResolutionCandidate@614 }
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = ArrayList@616[3] { ResolutionCandidate@617, ResolutionCandidate@618, ResolutionCandidate@619 }
-}
-
-ResolutionTaskHolder@620 {
-    <name not found> = ArrayList@621[3] { ResolutionCandidate@622, ResolutionCandidate@623, ResolutionCandidate@624 }
-}
-
-ResolutionTaskHolder@625 {
-    <name not found> = ArrayList@626[3] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629 }
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[3] { ResolutionCandidate@632, ResolutionCandidate@633, ResolutionCandidate@634 }
-}
-
-ResolutionTaskHolder@635 {
-    <name not found> = ArrayList@636[3] { ResolutionCandidate@637, ResolutionCandidate@638, ResolutionCandidate@639 }
-}
-
-ResolutionTaskHolder@640 {
-    <name not found> = ArrayList@641[3] { ResolutionCandidate@642, ResolutionCandidate@643, ResolutionCandidate@644 }
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@646 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@647 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@649 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@650 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@651 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@652 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@653 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@655 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@656 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@658 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@659 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@661 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@662 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@663 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@664 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@665 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@667 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@668 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@670 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@671 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@673 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@674 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-null {
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@484 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@478 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@517 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@556 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@364 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@367 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@508 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@580 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@523 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@511 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@514 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@370 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@550 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@376 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@493 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@583 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@358 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@559 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@553 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@544 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@490 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@577 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@526 }
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@771[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@562 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@565 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@385 }
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@568 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@502 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@574 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@496 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@529 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@532 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@475 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@379 }
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@586 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@520 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@505 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@481 }
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@487 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@547 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@499 }
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@571 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@382 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@538 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@589 }
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@535 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@541 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@852[2] { ResolutionCandidate@600, ResolutionCandidate@601 }
-    <name not found> = ArrayList@853[2] { ResolutionCandidate@604, ResolutionCandidate@605 }
-    <name not found> = ArrayList@854[2] { ResolutionCandidate@596, ResolutionCandidate@597 }
-    <name not found> = ArrayList@855[2] { ResolutionCandidate@592, ResolutionCandidate@593 }
-    <name not found> = ArrayList@856[2] { ResolutionCandidate@72, ResolutionCandidate@73 }
-    <name not found> = ArrayList@857[2] { ResolutionCandidate@608, ResolutionCandidate@609 }
-    <name not found> = ArrayList@858[3] { ResolutionCandidate@612, ResolutionCandidate@613, ResolutionCandidate@614 }
-    <name not found> = ArrayList@859[3] { ResolutionCandidate@622, ResolutionCandidate@623, ResolutionCandidate@624 }
-    <name not found> = ArrayList@860[3] { ResolutionCandidate@642, ResolutionCandidate@643, ResolutionCandidate@644 }
-    <name not found> = ArrayList@861[3] { ResolutionCandidate@632, ResolutionCandidate@633, ResolutionCandidate@634 }
-    <name not found> = ArrayList@862[3] { ResolutionCandidate@637, ResolutionCandidate@638, ResolutionCandidate@639 }
-    <name not found> = ArrayList@863[3] { ResolutionCandidate@617, ResolutionCandidate@618, ResolutionCandidate@619 }
-    <name not found> = ArrayList@864[3] { ResolutionCandidate@627, ResolutionCandidate@628, ResolutionCandidate@629 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
deleted file mode 100644
index bd461d84229..00000000000
--- a/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['R']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('R': FqName@11) = null
-    packageFragments('inline': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.R': FqName@17) = null
-    packageFragments('java.lang.inline': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.R': FqName@20) = null
-    packageFragments('kotlin.inline': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('inline': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('p': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('p': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('p': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('p': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
deleted file mode 100644
index 7458c6d5e99..00000000000
--- a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Function1': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Function1': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.Unit': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Function1': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.Unit': FqName@25) = null
-    packageFragments('kotlin.inline': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Function1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Unit': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@42 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
deleted file mode 100644
index 6738bf6d91c..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
+++ /dev/null
@@ -1,144 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['noinline']
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Function1': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('Unit': FqName@18) = null
-    packageFragments('inline': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Function1': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.Unit': FqName@26) = null
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('java.lang.noinline': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Function1': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.Unit': FqName@32) = null
-    packageFragments('kotlin.inline': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    packageFragments('kotlin.noinline': FqName@36) = null
-    packageFragments('noinline': FqName@37) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Function1': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('inline': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('invoke': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('noinline': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('invoke': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('invoke': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('invoke': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
deleted file mode 100644
index 09178f9453a..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('ExtensionFunction1': FqName@16) = null
-    packageFragments('ExtensionFunction2': FqName@17) = null
-    packageFragments('Function1': FqName@18) = null
-    packageFragments('Function2': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('T': FqName@21) = null
-    packageFragments('U': FqName@22) = null
-    packageFragments('V': FqName@23) = null
-    packageFragments('W': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@30) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@31) = null
-    packageFragments('java.lang.Function1': FqName@32) = null
-    packageFragments('java.lang.Function2': FqName@33) = null
-    packageFragments('java.lang.Int': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('java.lang.U': FqName@36) = null
-    packageFragments('java.lang.V': FqName@37) = null
-    packageFragments('java.lang.W': FqName@38) = null
-    packageFragments('java.lang.inline': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@41) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@42) = null
-    packageFragments('kotlin.Function1': FqName@43) = null
-    packageFragments('kotlin.Function2': FqName@44) = null
-    packageFragments('kotlin.Int': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.U': FqName@47) = null
-    packageFragments('kotlin.V': FqName@48) = null
-    packageFragments('kotlin.W': FqName@49) = null
-    packageFragments('kotlin.inline': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('ExtensionFunction1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('ExtensionFunction2': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function1': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function2': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('get': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('inline': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('get': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('get': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('get': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@122[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@123[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@124[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
deleted file mode 100644
index accaba5f8ec..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
+++ /dev/null
@@ -1,731 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-    <name not found> = JetTypeImpl@2['Function0<1>']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('ExtensionFunction1': FqName@22) = null
-    packageFragments('Function1': FqName@23) = null
-    packageFragments('T': FqName@24) = null
-    packageFragments('U': FqName@25) = null
-    packageFragments('V': FqName@26) = null
-    packageFragments('inline': FqName@27) = null
-    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.T': FqName@34) = null
-    packageFragments('java.lang.U': FqName@35) = null
-    packageFragments('java.lang.V': FqName@36) = null
-    packageFragments('java.lang.inline': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@39) = null
-    packageFragments('kotlin.Function1': FqName@40) = null
-    packageFragments('kotlin.T': FqName@41) = null
-    packageFragments('kotlin.U': FqName@42) = null
-    packageFragments('kotlin.V': FqName@43) = null
-    packageFragments('kotlin.inline': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('ExtensionFunction1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Function1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inline': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minusAssign': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plus': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plusAssign': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@51) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minusAssign': Name@52) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plus': Name@53) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plusAssign': Name@54) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('minus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('minusAssign': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('plus': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('plusAssign': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('minus': Name@51) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('minusAssign': Name@52) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('plus': Name@53) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('plusAssign': Name@54) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[2] { ResolutionCandidate@153, ResolutionCandidate@154 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[2] { ResolutionCandidate@169, ResolutionCandidate@170 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[2] { ResolutionCandidate@185, ResolutionCandidate@186 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-null {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@224[2] { ResolutionCandidate@173, ResolutionCandidate@174 }
-    <name not found> = ArrayList@225[2] { ResolutionCandidate@153, ResolutionCandidate@154 }
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@169, ResolutionCandidate@170 }
-    <name not found> = ArrayList@227[2] { ResolutionCandidate@177, ResolutionCandidate@178 }
-    <name not found> = ArrayList@228[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@157, ResolutionCandidate@158 }
-    <name not found> = ArrayList@230[2] { ResolutionCandidate@181, ResolutionCandidate@182 }
-    <name not found> = ArrayList@231[2] { ResolutionCandidate@161, ResolutionCandidate@162 }
-    <name not found> = ArrayList@232[2] { ResolutionCandidate@185, ResolutionCandidate@186 }
-    <name not found> = ArrayList@233[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
deleted file mode 100644
index 71eda21b54e..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
+++ /dev/null
@@ -1,419 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('ExtensionFunction1': FqName@18) = null
-    packageFragments('ExtensionFunction2': FqName@19) = null
-    packageFragments('Function1': FqName@20) = null
-    packageFragments('Function2': FqName@21) = null
-    packageFragments('T': FqName@22) = null
-    packageFragments('U': FqName@23) = null
-    packageFragments('V': FqName@24) = null
-    packageFragments('W': FqName@25) = null
-    packageFragments('inline': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@31) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Function2': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('java.lang.U': FqName@36) = null
-    packageFragments('java.lang.V': FqName@37) = null
-    packageFragments('java.lang.W': FqName@38) = null
-    packageFragments('java.lang.inline': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@41) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@42) = null
-    packageFragments('kotlin.Function1': FqName@43) = null
-    packageFragments('kotlin.Function2': FqName@44) = null
-    packageFragments('kotlin.T': FqName@45) = null
-    packageFragments('kotlin.U': FqName@46) = null
-    packageFragments('kotlin.V': FqName@47) = null
-    packageFragments('kotlin.W': FqName@48) = null
-    packageFragments('kotlin.inline': FqName@49) = null
-    packageFragments('kotlin.io': FqName@50) = null
-    packageFragments('kotlin.jvm': FqName@51) = null
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('ExtensionFunction1': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('ExtensionFunction2': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Function1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Function2': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('compareTo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('inline': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('compareTo': Name@57) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('compareTo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('compareTo': Name@57) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[4] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[4] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[4] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[4] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[4] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-null {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@292[4] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@293[4] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-    <name not found> = ArrayList@294[4] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = ArrayList@295[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@296[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@297[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@298[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@299[4] { ResolutionCandidate@233, ResolutionCandidate@234, ResolutionCandidate@235, ... }
-    <name not found> = ArrayList@300[4] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = ArrayList@301[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@302[4] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-    <name not found> = ArrayList@303[4] { ResolutionCandidate@253, ResolutionCandidate@254, ResolutionCandidate@255, ... }
-    <name not found> = ArrayList@304[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@305[4] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@306[4] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
-    <name not found> = ArrayList@307[4] { ResolutionCandidate@228, ResolutionCandidate@229, ResolutionCandidate@230, ... }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
deleted file mode 100644
index db1e21ccd2e..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
+++ /dev/null
@@ -1,237 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@6 {
-    resolutionResults = OverloadResolutionResultsImpl@7
-    type = JetTypeImpl@8['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyAnnotationDescriptor@18 {
-    resolutionResults = OverloadResolutionResultsImpl@19
-    type = JetTypeImpl@20['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@21 {
-    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    packageFragments('ExtensionFunction1': FqName@24) = null
-    packageFragments('ExtensionFunction2': FqName@25) = null
-    packageFragments('Function1': FqName@26) = null
-    packageFragments('Function2': FqName@27) = null
-    packageFragments('T': FqName@28) = null
-    packageFragments('U': FqName@29) = null
-    packageFragments('V': FqName@30) = null
-    packageFragments('W': FqName@31) = null
-    packageFragments('inline': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@37) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@38) = null
-    packageFragments('java.lang.Function1': FqName@39) = null
-    packageFragments('java.lang.Function2': FqName@40) = null
-    packageFragments('java.lang.T': FqName@41) = null
-    packageFragments('java.lang.U': FqName@42) = null
-    packageFragments('java.lang.V': FqName@43) = null
-    packageFragments('java.lang.W': FqName@44) = null
-    packageFragments('java.lang.inline': FqName@45) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@47) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@48) = null
-    packageFragments('kotlin.Function1': FqName@49) = null
-    packageFragments('kotlin.Function2': FqName@50) = null
-    packageFragments('kotlin.T': FqName@51) = null
-    packageFragments('kotlin.U': FqName@52) = null
-    packageFragments('kotlin.V': FqName@53) = null
-    packageFragments('kotlin.W': FqName@54) = null
-    packageFragments('kotlin.inline': FqName@55) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-}
-
-LazyJavaPackageFragment@23['<root>'] {
-    classes('ExtensionFunction1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('ExtensionFunction2': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('Function1': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('Function2': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('component1': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('component2': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('inline': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('component1': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('component2': Name@64) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('lang': Name@71) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@36['lang'] {
-    classes('component1': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('component2': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('component1': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('component2': Name@64) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[4] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[4] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-null {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@155[4] { ResolutionCandidate@142, ResolutionCandidate@143, ResolutionCandidate@144, ... }
-    <name not found> = ArrayList@156[4] { ResolutionCandidate@137, ResolutionCandidate@138, ResolutionCandidate@139, ... }
-    <name not found> = ArrayList@157[4] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124, ... }
-    <name not found> = ArrayList@158[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
-    <name not found> = ArrayList@159[4] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134, ... }
-    <name not found> = ArrayList@160[4] { ResolutionCandidate@117, ResolutionCandidate@118, ResolutionCandidate@119, ... }
-    <name not found> = ArrayList@161[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@162[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
deleted file mode 100644
index d3a08464524..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
+++ /dev/null
@@ -1,328 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Boolean': FqName@16) = null
-    packageFragments('ExtensionFunction1': FqName@17) = null
-    packageFragments('ExtensionFunction2': FqName@18) = null
-    packageFragments('Function1': FqName@19) = null
-    packageFragments('Function2': FqName@20) = null
-    packageFragments('T': FqName@21) = null
-    packageFragments('U': FqName@22) = null
-    packageFragments('V': FqName@23) = null
-    packageFragments('W': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Boolean': FqName@30) = null
-    packageFragments('java.lang.ExtensionFunction1': FqName@31) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Function2': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('java.lang.U': FqName@36) = null
-    packageFragments('java.lang.V': FqName@37) = null
-    packageFragments('java.lang.W': FqName@38) = null
-    packageFragments('java.lang.inline': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.Boolean': FqName@41) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@42) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@43) = null
-    packageFragments('kotlin.Function1': FqName@44) = null
-    packageFragments('kotlin.Function2': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.U': FqName@47) = null
-    packageFragments('kotlin.V': FqName@48) = null
-    packageFragments('kotlin.W': FqName@49) = null
-    packageFragments('kotlin.inline': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Boolean': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('ExtensionFunction1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('ExtensionFunction2': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function1': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function2': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('contains': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('inline': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('contains': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('contains': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('contains': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[4] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[4] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[4] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-null {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@226[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
-    <name not found> = ArrayList@227[4] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = ArrayList@228[4] { ResolutionCandidate@149, ResolutionCandidate@150, ResolutionCandidate@151, ... }
-    <name not found> = ArrayList@229[4] { ResolutionCandidate@154, ResolutionCandidate@155, ResolutionCandidate@156, ... }
-    <name not found> = ArrayList@230[4] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196, ... }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = ArrayList@232[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@233[4] { ResolutionCandidate@199, ResolutionCandidate@200, ResolutionCandidate@201, ... }
-    <name not found> = ArrayList@234[4] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191, ... }
-    <name not found> = ArrayList@235[4] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186, ... }
-    <name not found> = ArrayList@236[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
-    <name not found> = ArrayList@237[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
deleted file mode 100644
index ecdb93ba3ac..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
+++ /dev/null
@@ -1,253 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('ExtensionFunction1': FqName@22) = null
-    packageFragments('Function1': FqName@23) = null
-    packageFragments('T': FqName@24) = null
-    packageFragments('U': FqName@25) = null
-    packageFragments('V': FqName@26) = null
-    packageFragments('inline': FqName@27) = null
-    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.T': FqName@34) = null
-    packageFragments('java.lang.U': FqName@35) = null
-    packageFragments('java.lang.V': FqName@36) = null
-    packageFragments('java.lang.inline': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@39) = null
-    packageFragments('kotlin.Function1': FqName@40) = null
-    packageFragments('kotlin.T': FqName@41) = null
-    packageFragments('kotlin.U': FqName@42) = null
-    packageFragments('kotlin.V': FqName@43) = null
-    packageFragments('kotlin.inline': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('ExtensionFunction1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Function1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inline': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plus': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('minus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('plus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('minus': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('plus': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[3] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[3] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[3] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-null {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@164[2] { ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@165[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@166[3] { ResolutionCandidate@135, ResolutionCandidate@136, ResolutionCandidate@137 }
-    <name not found> = ArrayList@167[3] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142 }
-    <name not found> = ArrayList@168[3] { ResolutionCandidate@145, ResolutionCandidate@146, ResolutionCandidate@147 }
-    <name not found> = ArrayList@169[3] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132 }
-    <name not found> = ArrayList@170[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@171[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
deleted file mode 100644
index 2901844f8be..00000000000
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
+++ /dev/null
@@ -1,352 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('ExtensionFunction1': FqName@16) = null
-    packageFragments('ExtensionFunction2': FqName@17) = null
-    packageFragments('Function1': FqName@18) = null
-    packageFragments('Function2': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('Range': FqName@21) = null
-    packageFragments('T': FqName@22) = null
-    packageFragments('U': FqName@23) = null
-    packageFragments('V': FqName@24) = null
-    packageFragments('W': FqName@25) = null
-    packageFragments('inline': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@31) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Function2': FqName@34) = null
-    packageFragments('java.lang.Int': FqName@35) = null
-    packageFragments('java.lang.Range': FqName@36) = null
-    packageFragments('java.lang.T': FqName@37) = null
-    packageFragments('java.lang.U': FqName@38) = null
-    packageFragments('java.lang.V': FqName@39) = null
-    packageFragments('java.lang.W': FqName@40) = null
-    packageFragments('java.lang.inline': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@43) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@44) = null
-    packageFragments('kotlin.Function1': FqName@45) = null
-    packageFragments('kotlin.Function2': FqName@46) = null
-    packageFragments('kotlin.Int': FqName@47) = null
-    packageFragments('kotlin.Range': FqName@48) = null
-    packageFragments('kotlin.T': FqName@49) = null
-    packageFragments('kotlin.U': FqName@50) = null
-    packageFragments('kotlin.V': FqName@51) = null
-    packageFragments('kotlin.W': FqName@52) = null
-    packageFragments('kotlin.inline': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('ExtensionFunction1': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('ExtensionFunction2': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Function1': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Function2': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Int': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Range': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('inline': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('rangeTo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('rangeTo': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('rangeTo': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('rangeTo': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[7] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[7] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[7] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-}
-
-null {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@250[4] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
-    <name not found> = ArrayList@251[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@252[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@253[4] { ResolutionCandidate@153, ResolutionCandidate@154, ResolutionCandidate@155, ... }
-    <name not found> = ArrayList@254[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@255[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@256[4] { ResolutionCandidate@198, ResolutionCandidate@199, ResolutionCandidate@200, ... }
-    <name not found> = ArrayList@257[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = ArrayList@258[4] { ResolutionCandidate@203, ResolutionCandidate@204, ResolutionCandidate@205, ... }
-    <name not found> = ArrayList@259[4] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@260[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@261[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@262[7] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225, ... }
-    <name not found> = ArrayList@263[7] { ResolutionCandidate@218, ResolutionCandidate@219, ResolutionCandidate@220, ... }
-    <name not found> = ArrayList@264[7] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-    <name not found> = ArrayList@265[7] { ResolutionCandidate@213, ResolutionCandidate@214, ResolutionCandidate@215, ... }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/capture.lazy.log b/compiler/testData/diagnostics/tests/inline/capture.lazy.log
deleted file mode 100644
index 84eab68cfb9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/capture.lazy.log
+++ /dev/null
@@ -1,341 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['noinline']
-}
-
-LazyJavaPackageFragmentProvider@22 {
-    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('Function1': FqName@25) = null
-    packageFragments('Int': FqName@26) = null
-    packageFragments('Unit': FqName@27) = null
-    packageFragments('inline': FqName@28) = null
-    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
-    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Int': FqName@34) = null
-    packageFragments('java.lang.Unit': FqName@35) = null
-    packageFragments('java.lang.inline': FqName@36) = null
-    packageFragments('java.lang.noinline': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.Function1': FqName@39) = null
-    packageFragments('kotlin.Int': FqName@40) = null
-    packageFragments('kotlin.Unit': FqName@41) = null
-    packageFragments('kotlin.inline': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('kotlin.noinline': FqName@45) = null
-    packageFragments('noinline': FqName@46) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('Function1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Int': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Unit': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inline': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inlineExt': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inlineExt2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noInlineExt': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noinline': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('s': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineExt': Name@52) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineExt2': Name@53) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('noInlineExt': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('s': Name@56) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@32['lang'] {
-    classes('inlineExt': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('inlineExt2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('noInlineExt': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('s': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('inlineExt': Name@52) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('inlineExt2': Name@53) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('noInlineExt': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('s': Name@56) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-null {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log b/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
deleted file mode 100644
index dbffe6620eb..00000000000
--- a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Z': FqName@8) = null
-    packageFragments('inline': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.inline': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.inline': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Z': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('inline': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Z': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Z': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('Z': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/default.lazy.log b/compiler/testData/diagnostics/tests/inline/default.lazy.log
deleted file mode 100644
index b2f15f01d7b..00000000000
--- a/compiler/testData/diagnostics/tests/inline/default.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Base': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('String': FqName@18) = null
-    packageFragments('inline': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.String': FqName@25) = null
-    packageFragments('java.lang.inline': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.inline': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
deleted file mode 100644
index d78cc363f54..00000000000
--- a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
+++ /dev/null
@@ -1,241 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['noinline']
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('Function1': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('Unit': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Function1': FqName@30) = null
-    packageFragments('java.lang.Int': FqName@31) = null
-    packageFragments('java.lang.Unit': FqName@32) = null
-    packageFragments('java.lang.inline': FqName@33) = null
-    packageFragments('java.lang.noinline': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = null
-    packageFragments('kotlin.Function1': FqName@36) = null
-    packageFragments('kotlin.Int': FqName@37) = null
-    packageFragments('kotlin.Unit': FqName@38) = null
-    packageFragments('kotlin.inline': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('kotlin.noinline': FqName@42) = null
-    packageFragments('noinline': FqName@43) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('Function1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('Int': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('Unit': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('inline': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('inlineExt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('inlineExt2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('noInlineExt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('noinline': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('inlineExt': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('inlineExt2': Name@50) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('noInlineExt': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('inlineExt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('inlineExt2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('noInlineExt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('inlineExt': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('inlineExt2': Name@50) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('noInlineExt': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log b/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
deleted file mode 100644
index e9d936cc489..00000000000
--- a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['noinline']
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('R': FqName@13) = null
-    packageFragments('inline': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.R': FqName@19) = null
-    packageFragments('java.lang.inline': FqName@20) = null
-    packageFragments('java.lang.noinline': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.R': FqName@23) = null
-    packageFragments('kotlin.inline': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('kotlin.noinline': FqName@27) = null
-    packageFragments('noinline': FqName@28) = null
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('inline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inlineAll': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('noinline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('p': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('inlineAll': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('p': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('inlineAll': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('p': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('inlineAll': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('p': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/functions.lazy.log b/compiler/testData/diagnostics/tests/inline/functions.lazy.log
deleted file mode 100644
index c20c126de5a..00000000000
--- a/compiler/testData/diagnostics/tests/inline/functions.lazy.log
+++ /dev/null
@@ -1,155 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Function1': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Function1': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.Unit': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Function1': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.Unit': FqName@25) = null
-    packageFragments('kotlin.inline': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Function1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Unit': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('getFun': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('getInlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inline': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('getFun': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('getInlineFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('getFun': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('getInlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('getFun': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('getInlineFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-null {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log b/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
deleted file mode 100644
index 285bc300f7b..00000000000
--- a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
+++ /dev/null
@@ -1,307 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['noinline']
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Function1': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('Unit': FqName@18) = null
-    packageFragments('inline': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Function1': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.Unit': FqName@26) = null
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('java.lang.noinline': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Function1': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.Unit': FqName@32) = null
-    packageFragments('kotlin.inline': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    packageFragments('kotlin.noinline': FqName@36) = null
-    packageFragments('noinline': FqName@37) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Function1': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('ext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('inline': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('noinline': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('s': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('ext': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('s': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('ext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('s': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('ext': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('s': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-null {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log b/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
deleted file mode 100644
index 61e7ef5aee1..00000000000
--- a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Int': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('inline': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.inline': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.inline': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar1': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar2': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bar1': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bar2': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
deleted file mode 100644
index 0402970bbf9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Array': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('inline': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.inline': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.inline': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Array': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
deleted file mode 100644
index 0404c055fa1..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
+++ /dev/null
@@ -1,151 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['R']
-}
-
-DescriptorResolver@6 {
-    <name not found> = JetTypeImpl@7['R']
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@11['strategy']) = null
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['inline']
-    valueArguments(ValueParameterDescriptorImpl@11['strategy']) = null
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@18['value']) = ArrayValue@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('R': FqName@23) = null
-    packageFragments('inline': FqName@24) = null
-    packageFragments('inlineOptions': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.R': FqName@30) = null
-    packageFragments('java.lang.inline': FqName@31) = null
-    packageFragments('java.lang.inlineOptions': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.InlineOption': FqName@34) = null
-    packageFragments('kotlin.R': FqName@35) = null
-    packageFragments('kotlin.inline': FqName@36) = null
-    packageFragments('kotlin.inlineOptions': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('inline': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('inlineOptions': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('kotlin': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('kotlin': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('p': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-null {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
deleted file mode 100644
index 54b169ea148..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
+++ /dev/null
@@ -1,310 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['R']
-}
-
-DescriptorResolver@6 {
-    <name not found> = JetTypeImpl@7['R']
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@11['strategy']) = null
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['inline']
-    valueArguments(ValueParameterDescriptorImpl@11['strategy']) = null
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['inline']
-    valueArguments(ValueParameterDescriptorImpl@11['strategy']) = null
-}
-
-LazyAnnotationDescriptor@18 {
-    resolutionResults = OverloadResolutionResultsImpl@19
-    type = JetTypeImpl@20['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@21['value']) = ArrayValue@22
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
-    packageFragments('R': FqName@26) = null
-    packageFragments('inline': FqName@27) = null
-    packageFragments('inlineOptions': FqName@28) = null
-    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
-    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
-    packageFragments('java.lang.R': FqName@33) = null
-    packageFragments('java.lang.inline': FqName@34) = null
-    packageFragments('java.lang.inlineOptions': FqName@35) = null
-    packageFragments('kotlin': FqName@36) = null
-    packageFragments('kotlin.InlineOption': FqName@37) = null
-    packageFragments('kotlin.R': FqName@38) = null
-    packageFragments('kotlin.inline': FqName@39) = null
-    packageFragments('kotlin.inlineOptions': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-}
-
-LazyJavaPackageFragment@25['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('doCall': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('inlineOptions': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('kotlin': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('doCall': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@49) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@32['lang'] {
-    classes('doCall': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('doCall': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@49) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
deleted file mode 100644
index 21799c3ab9e..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
+++ /dev/null
@@ -1,114 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('inline': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.inline': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.inline': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
deleted file mode 100644
index ce000ee1b80..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
+++ /dev/null
@@ -1,117 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@10['value']) = ArrayValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('R': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('inlineOptions': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('java.lang.inline': FqName@23) = null
-    packageFragments('java.lang.inlineOptions': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.InlineOption': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.inlineOptions': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inlineAll': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inlineOptions': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('inlineAll': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('inlineAll': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('inlineAll': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
deleted file mode 100644
index f5bd1421ce2..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
+++ /dev/null
@@ -1,156 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@13['value']) = ArrayValue@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('R': FqName@18) = null
-    packageFragments('inline': FqName@19) = null
-    packageFragments('inlineOptions': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.R': FqName@25) = null
-    packageFragments('java.lang.inline': FqName@26) = null
-    packageFragments('java.lang.inlineOptions': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.InlineOption': FqName@29) = null
-    packageFragments('kotlin.R': FqName@30) = null
-    packageFragments('kotlin.inline': FqName@31) = null
-    packageFragments('kotlin.inlineOptions': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inline': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inlineFun': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inlineOptions': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inlineFun': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('kotlin': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('p': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('inlineFun': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('inlineFun': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('p': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
deleted file mode 100644
index 6bb39f0158f..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('inline': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.inline': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.inline': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
deleted file mode 100644
index 4401c349333..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
+++ /dev/null
@@ -1,136 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@10['value']) = ArrayValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('R': FqName@15) = null
-    packageFragments('String': FqName@16) = null
-    packageFragments('Unit': FqName@17) = null
-    packageFragments('inline': FqName@18) = null
-    packageFragments('inlineOptions': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.R': FqName@24) = null
-    packageFragments('java.lang.String': FqName@25) = null
-    packageFragments('java.lang.Unit': FqName@26) = null
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('java.lang.inlineOptions': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.InlineOption': FqName@30) = null
-    packageFragments('kotlin.R': FqName@31) = null
-    packageFragments('kotlin.String': FqName@32) = null
-    packageFragments('kotlin.Unit': FqName@33) = null
-    packageFragments('kotlin.inline': FqName@34) = null
-    packageFragments('kotlin.inlineOptions': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('doWork': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('inline': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('inlineOptions': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('job': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('lambdaWithResultCaptured': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('doWork': Name@42) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('job': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lambdaWithResultCaptured': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('doWork': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('job': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('lambdaWithResultCaptured': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('doWork': Name@42) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('job': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lambdaWithResultCaptured': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
deleted file mode 100644
index 92fd942be35..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
+++ /dev/null
@@ -1,125 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@10['value']) = ArrayValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('R': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('inlineOptions': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('java.lang.inline': FqName@23) = null
-    packageFragments('java.lang.inlineOptions': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.InlineOption': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.inlineOptions': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inlineOptions': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('a': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('a': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
deleted file mode 100644
index 1bf0184a8d1..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
+++ /dev/null
@@ -1,286 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('External': FqName@7) = null
-    packageFragments('Global': FqName@8) = null
-    packageFragments('Internal': FqName@9) = null
-    packageFragments('Kind': FqName@10) = null
-    packageFragments('R': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.External': FqName@18) = null
-    packageFragments('java.lang.Global': FqName@19) = null
-    packageFragments('java.lang.Internal': FqName@20) = null
-    packageFragments('java.lang.Kind': FqName@21) = null
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.inline': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.External': FqName@26) = null
-    packageFragments('kotlin.Global': FqName@27) = null
-    packageFragments('kotlin.Internal': FqName@28) = null
-    packageFragments('kotlin.Kind': FqName@29) = null
-    packageFragments('kotlin.R': FqName@30) = null
-    packageFragments('kotlin.String': FqName@31) = null
-    packageFragments('kotlin.inline': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('EXT_RETURN': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('External': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('GLOBAL_RETURN': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Global': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Internal': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Kind': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('block': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('doCall': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inline': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('External': Name@37) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Global': Name@39) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Internal': Name@40) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Kind': Name@41) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('block': Name@43) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('doCall': Name@44) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('External': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Global': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Internal': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('block': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('doCall': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('External': Name@37) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('Global': Name@39) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('Internal': Name@40) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('block': Name@43) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('doCall': Name@44) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@47[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
-
-null {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-    <name not found> = EmptyList@47[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
deleted file mode 100644
index 1ca9c3d18e2..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
+++ /dev/null
@@ -1,98 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['noinline']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Array': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Array': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.Unit': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('java.lang.noinline': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Array': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin.inline': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('kotlin.noinline': FqName@30) = null
-    packageFragments('noinline': FqName@31) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Array': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Unit': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lambda': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('noinline': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lambda': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('test': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('lambda': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lambda': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('test': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
deleted file mode 100644
index e39b7806547..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
+++ /dev/null
@@ -1,121 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@10['value']) = ArrayValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('R': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('inlineOptions': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('java.lang.inline': FqName@23) = null
-    packageFragments('java.lang.inlineOptions': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.InlineOption': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.inlineOptions': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inlineOptions': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('p': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
deleted file mode 100644
index 0320e156cd9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
+++ /dev/null
@@ -1,143 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['R']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['R']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@14['value']) = ArrayValue@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('R': FqName@19) = null
-    packageFragments('inline': FqName@20) = null
-    packageFragments('inlineOptions': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.R': FqName@26) = null
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('java.lang.inlineOptions': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.InlineOption': FqName@30) = null
-    packageFragments('kotlin.R': FqName@31) = null
-    packageFragments('kotlin.inline': FqName@32) = null
-    packageFragments('kotlin.inlineOptions': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('inline': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('inlineOptions': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('kotlin': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('p': Name@41) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('p': Name@41) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
deleted file mode 100644
index 27e7742a091..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
+++ /dev/null
@@ -1,194 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@7['value']) = ArrayValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('R': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('inlineOptions': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.R': FqName@19) = null
-    packageFragments('java.lang.inline': FqName@20) = null
-    packageFragments('java.lang.inlineOptions': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.InlineOption': FqName@23) = null
-    packageFragments('kotlin.R': FqName@24) = null
-    packageFragments('kotlin.inline': FqName@25) = null
-    packageFragments('kotlin.inlineOptions': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inlineFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inlineOptions': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('kotlin': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('inlineFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('kotlin': Name@38) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('p': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('inlineFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('inlineFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
deleted file mode 100644
index 6383213650d..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@7['value']) = ArrayValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('R': FqName@12) = null
-    packageFragments('Z': FqName@13) = null
-    packageFragments('inline': FqName@14) = null
-    packageFragments('inlineOptions': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.R': FqName@20) = null
-    packageFragments('java.lang.inline': FqName@21) = null
-    packageFragments('java.lang.inlineOptions': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.InlineOption': FqName@24) = null
-    packageFragments('kotlin.R': FqName@25) = null
-    packageFragments('kotlin.inline': FqName@26) = null
-    packageFragments('kotlin.inlineOptions': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('inline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('inlineOptions': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('kotlin': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('kotlin': Name@39) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-null {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
deleted file mode 100644
index 62c2d296461..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
+++ /dev/null
@@ -1,192 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('A': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('R': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.R': FqName@19) = null
-    packageFragments('java.lang.inline': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.R': FqName@23) = null
-    packageFragments('kotlin.inline': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('doCall': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('doCallInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('result': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doCall': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doCallInt': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('p': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('doCall': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('doCallInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('result': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('doCall': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('doCallInt': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('p': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-}
-
-null {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@100[7] { ResolutionCandidate@84, ResolutionCandidate@85, ResolutionCandidate@86, ... }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
deleted file mode 100644
index e270d2b0950..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
+++ /dev/null
@@ -1,117 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inlineOptions']
-    valueArguments(ValueParameterDescriptorImpl@10['value']) = ArrayValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('R': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('inlineOptions': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.R': FqName@22) = null
-    packageFragments('java.lang.inline': FqName@23) = null
-    packageFragments('java.lang.inlineOptions': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.InlineOption': FqName@26) = null
-    packageFragments('kotlin.R': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.inlineOptions': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inlineOptions': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('toOnlyLocal': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('toOnlyLocal': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('toOnlyLocal': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('p': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('toOnlyLocal': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
deleted file mode 100644
index 27bd9eddf6a..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
+++ /dev/null
@@ -1,437 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['inline']
-    valueArguments(ValueParameterDescriptorImpl@8['strategy']) = null
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['inline']
-    valueArguments(ValueParameterDescriptorImpl@8['strategy']) = null
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['inline']
-    valueArguments(ValueParameterDescriptorImpl@8['strategy']) = null
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['inline']
-    valueArguments(ValueParameterDescriptorImpl@8['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@18 {
-    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('Int': FqName@21) = null
-    packageFragments('Z': FqName@22) = null
-    packageFragments('Z2': FqName@23) = null
-    packageFragments('inline': FqName@24) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.Int': FqName@29) = null
-    packageFragments('java.lang.inline': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.inline': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('Z': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('Z2': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('inline': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('privateFun': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('privateProperty': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('publicFun': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('publicProperty': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Z': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Z2': Name@39) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('privateFun': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('publicFun': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@28['lang'] {
-    classes('Z': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Z2': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('privateFun': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('privateProperty': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('publicFun': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('publicProperty': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('Z': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('Z2': Name@39) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('privateFun': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('publicFun': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-null {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
deleted file mode 100644
index e30d815eb40..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
+++ /dev/null
@@ -1,609 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Int': FqName@14) = null
-    packageFragments('Z2': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.inline': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.inline': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@13['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Z2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('privateFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('privateProperty': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('publicFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('publicProperty': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Z2': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('privateFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('publicFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('Z2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('privateFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('privateProperty': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('publicFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('publicProperty': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('Z2': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('privateFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('publicFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-null {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
deleted file mode 100644
index 6168bfb3783..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
+++ /dev/null
@@ -1,161 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@14 {
-    resolutionResults = OverloadResolutionResultsImpl@15
-    type = JetTypeImpl@16['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
-    packageFragments('inline': FqName@20) = null
-    packageFragments('internalProperty': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.inline': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('privateProperty': FqName@31) = null
-}
-
-LazyJavaPackageFragment@19['<root>'] {
-    classes('inline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('internalFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('internalProperty': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('privateFun': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('privateProperty': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('internalFun': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('privateFun': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('internalFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('internalProperty': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('privateFun': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('privateProperty': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('internalFun': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('privateFun': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
deleted file mode 100644
index 59c88305a7e..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@8 {
-    resolutionResults = OverloadResolutionResultsImpl@9
-    type = JetTypeImpl@10['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyAnnotationDescriptor@14 {
-    resolutionResults = OverloadResolutionResultsImpl@15
-    type = JetTypeImpl@16['inline']
-    valueArguments(ValueParameterDescriptorImpl@7['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
-    packageFragments('Z': FqName@20) = null
-    packageFragments('Z2': FqName@21) = null
-    packageFragments('inline': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.inline': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@19['<root>'] {
-    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('privateFun': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('privateProperty': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('privateFun': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('privateFun': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('privateProperty': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('privateFun': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
deleted file mode 100644
index 01bc3c2f984..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['inline']
-    valueArguments(ValueParameterDescriptorImpl@6['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Z': FqName@10) = null
-    packageFragments('inline': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.inline': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.inline': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('inline': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('privateProperty': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('privateProperty': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
deleted file mode 100644
index 41741a3f9c9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('inline': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.inline': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.inline': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Z': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('inline': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Z': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Z': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Z': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
deleted file mode 100644
index 64068ef8f73..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('inline': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.inline': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.inline': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('inline': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('localFun': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('localFun': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('localFun': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('localFun': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
deleted file mode 100644
index 28823c7fee9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
+++ /dev/null
@@ -1,291 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@22 {
-    resolutionResults = OverloadResolutionResultsImpl@23
-    type = JetTypeImpl@24['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@25 {
-    resolutionResults = OverloadResolutionResultsImpl@26
-    type = JetTypeImpl@27['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@28 {
-    resolutionResults = OverloadResolutionResultsImpl@29
-    type = JetTypeImpl@30['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@31 {
-    resolutionResults = OverloadResolutionResultsImpl@32
-    type = JetTypeImpl@33['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@34 {
-    resolutionResults = OverloadResolutionResultsImpl@35
-    type = JetTypeImpl@36['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@37 {
-    resolutionResults = OverloadResolutionResultsImpl@38
-    type = JetTypeImpl@39['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@40 {
-    resolutionResults = OverloadResolutionResultsImpl@41
-    type = JetTypeImpl@42['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@43 {
-    resolutionResults = OverloadResolutionResultsImpl@44
-    type = JetTypeImpl@45['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@46 {
-    resolutionResults = OverloadResolutionResultsImpl@47
-    type = JetTypeImpl@48['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@49 {
-    resolutionResults = OverloadResolutionResultsImpl@50
-    type = JetTypeImpl@51['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@52 {
-    resolutionResults = OverloadResolutionResultsImpl@53
-    type = JetTypeImpl@54['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@55 {
-    resolutionResults = OverloadResolutionResultsImpl@56
-    type = JetTypeImpl@57['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@58 {
-    resolutionResults = OverloadResolutionResultsImpl@59
-    type = JetTypeImpl@60['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@61 {
-    resolutionResults = OverloadResolutionResultsImpl@62
-    type = JetTypeImpl@63['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@64 {
-    resolutionResults = OverloadResolutionResultsImpl@65
-    type = JetTypeImpl@66['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@67 {
-    resolutionResults = OverloadResolutionResultsImpl@68
-    type = JetTypeImpl@69['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@70 {
-    resolutionResults = OverloadResolutionResultsImpl@71
-    type = JetTypeImpl@72['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@73 {
-    packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
-    packageFragments('A': FqName@76) = null
-    packageFragments('B': FqName@77) = null
-    packageFragments('inline': FqName@78) = null
-    packageFragments('java': FqName@79) = LazyJavaPackageFragment@80['java']
-    packageFragments('java.lang': FqName@81) = LazyJavaPackageFragment@82['lang']
-    packageFragments('java.lang.inline': FqName@83) = null
-    packageFragments('kotlin': FqName@84) = null
-    packageFragments('kotlin.inline': FqName@85) = null
-    packageFragments('kotlin.io': FqName@86) = null
-    packageFragments('kotlin.jvm': FqName@87) = null
-}
-
-LazyJavaPackageFragment@75['<root>'] {
-    classes('inline': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@80['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-null {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@101 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
deleted file mode 100644
index 5107326b4d7..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@22 {
-    resolutionResults = OverloadResolutionResultsImpl@23
-    type = JetTypeImpl@24['noinline']
-}
-
-LazyAnnotationDescriptor@25 {
-    resolutionResults = OverloadResolutionResultsImpl@26
-    type = JetTypeImpl@27['noinline']
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Function1': FqName@31) = null
-    packageFragments('Int': FqName@32) = null
-    packageFragments('inline': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.Function1': FqName@38) = null
-    packageFragments('java.lang.Int': FqName@39) = null
-    packageFragments('java.lang.inline': FqName@40) = null
-    packageFragments('java.lang.noinline': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Function1': FqName@43) = null
-    packageFragments('kotlin.Int': FqName@44) = null
-    packageFragments('kotlin.inline': FqName@45) = null
-    packageFragments('kotlin.io': FqName@46) = null
-    packageFragments('kotlin.jvm': FqName@47) = null
-    packageFragments('kotlin.noinline': FqName@48) = null
-    packageFragments('noinline': FqName@49) = null
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('Function1': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Int': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('inline': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('noinline': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@72 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log b/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
deleted file mode 100644
index 19ae0c3e3fe..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
+++ /dev/null
@@ -1,147 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('Function1': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('String': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Function1': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.inline': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Function1': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.inline': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('Function1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('submit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('submit': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('submit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('submit': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
deleted file mode 100644
index 2df4d0d29f1..00000000000
--- a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['noinline']
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('Function1': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('T': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Function1': FqName@30) = null
-    packageFragments('java.lang.Int': FqName@31) = null
-    packageFragments('java.lang.T': FqName@32) = null
-    packageFragments('java.lang.inline': FqName@33) = null
-    packageFragments('java.lang.noinline': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = null
-    packageFragments('kotlin.Function1': FqName@36) = null
-    packageFragments('kotlin.Int': FqName@37) = null
-    packageFragments('kotlin.T': FqName@38) = null
-    packageFragments('kotlin.inline': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('kotlin.noinline': FqName@42) = null
-    packageFragments('noinline': FqName@43) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('Function1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('Int': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('inline': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('noinline': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@87 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
deleted file mode 100644
index b350bfa613d..00000000000
--- a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
+++ /dev/null
@@ -1,205 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Function1': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('Unit': FqName@18) = null
-    packageFragments('inline': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.Function1': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.Unit': FqName@26) = null
-    packageFragments('java.lang.inline': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.Function1': FqName@29) = null
-    packageFragments('kotlin.Int': FqName@30) = null
-    packageFragments('kotlin.Unit': FqName@31) = null
-    packageFragments('kotlin.inline': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Function1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Unit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inline': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inlineFunWithInvoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inlineFunWithInvoke': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('inlineFunWithInvoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineFunWithInvoke': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-    <name not found> = EmptyList@42[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log b/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
deleted file mode 100644
index 3ac87393029..00000000000
--- a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
+++ /dev/null
@@ -1,707 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@22 {
-    resolutionResults = OverloadResolutionResultsImpl@23
-    type = JetTypeImpl@24['noinline']
-}
-
-LazyAnnotationDescriptor@25 {
-    resolutionResults = OverloadResolutionResultsImpl@26
-    type = JetTypeImpl@27['noinline']
-}
-
-LazyAnnotationDescriptor@28 {
-    resolutionResults = OverloadResolutionResultsImpl@29
-    type = JetTypeImpl@30['noinline']
-}
-
-LazyAnnotationDescriptor@31 {
-    resolutionResults = OverloadResolutionResultsImpl@32
-    type = JetTypeImpl@33['noinline']
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('Function1': FqName@37) = null
-    packageFragments('Int': FqName@38) = null
-    packageFragments('Unit': FqName@39) = null
-    packageFragments('inline': FqName@40) = null
-    packageFragments('java': FqName@41) = LazyJavaPackageFragment@42['java']
-    packageFragments('java.lang': FqName@43) = LazyJavaPackageFragment@44['lang']
-    packageFragments('java.lang.Function1': FqName@45) = null
-    packageFragments('java.lang.Int': FqName@46) = null
-    packageFragments('java.lang.Unit': FqName@47) = null
-    packageFragments('java.lang.inline': FqName@48) = null
-    packageFragments('java.lang.noinline': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Function1': FqName@51) = null
-    packageFragments('kotlin.Int': FqName@52) = null
-    packageFragments('kotlin.Unit': FqName@53) = null
-    packageFragments('kotlin.inline': FqName@54) = null
-    packageFragments('kotlin.io': FqName@55) = null
-    packageFragments('kotlin.jvm': FqName@56) = null
-    packageFragments('kotlin.noinline': FqName@57) = null
-    packageFragments('noinline': FqName@58) = null
-}
-
-LazyJavaPackageFragment@36['<root>'] {
-    classes('Function1': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Int': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Unit': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('ext': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('inline': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('invoke': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('noinline': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('s': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('subInline': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('subNoInline': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('ext': Name@63) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('invoke': Name@65) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('s': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('subInline': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('subNoInline': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@42['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@44['lang'] {
-    classes('ext': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('invoke': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('s': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('subInline': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('subNoInline': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('ext': Name@63) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('invoke': Name@65) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('s': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('subInline': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('subNoInline': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-null {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log b/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
deleted file mode 100644
index 3df0dde1d86..00000000000
--- a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
+++ /dev/null
@@ -1,196 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('Boolean': FqName@19) = null
-    packageFragments('Function0': FqName@20) = null
-    packageFragments('Function1': FqName@21) = null
-    packageFragments('Int': FqName@22) = null
-    packageFragments('T': FqName@23) = null
-    packageFragments('Unit': FqName@24) = null
-    packageFragments('V': FqName@25) = null
-    packageFragments('inline': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.Boolean': FqName@31) = null
-    packageFragments('java.lang.Function0': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Int': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('java.lang.Unit': FqName@36) = null
-    packageFragments('java.lang.V': FqName@37) = null
-    packageFragments('java.lang.inline': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.Boolean': FqName@40) = null
-    packageFragments('kotlin.Function0': FqName@41) = null
-    packageFragments('kotlin.Function1': FqName@42) = null
-    packageFragments('kotlin.Int': FqName@43) = null
-    packageFragments('kotlin.T': FqName@44) = null
-    packageFragments('kotlin.Unit': FqName@45) = null
-    packageFragments('kotlin.V': FqName@46) = null
-    packageFragments('kotlin.inline': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('Boolean': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Function0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Function1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Unit': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('inc': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('inline': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('inlineExt': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('inlineFun': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('not': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('inc': Name@56) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('inlineExt': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('inlineFun': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('inc': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('inlineExt': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('inlineFun': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('not': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('inc': Name@56) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('inlineExt': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('inlineFun': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[2] { ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-null {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@118[2] { ResolutionCandidate@102, ResolutionCandidate@103 }
-    <name not found> = ArrayList@119[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
deleted file mode 100644
index bc86d8d8b92..00000000000
--- a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('T': FqName@7) = null
-    packageFragments('U': FqName@8) = null
-    packageFragments('g': FqName@9) = null
-    packageFragments('g.T': FqName@10) = null
-    packageFragments('g.U': FqName@11) = null
-    packageFragments('g.inline': FqName@12) = null
-    packageFragments('inline': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('java.lang.U': FqName@19) = null
-    packageFragments('java.lang.inline': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.U': FqName@23) = null
-    packageFragments('kotlin.inline': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/returns.lazy.log b/compiler/testData/diagnostics/tests/inline/returns.lazy.log
deleted file mode 100644
index 1eaa9ea9f6a..00000000000
--- a/compiler/testData/diagnostics/tests/inline/returns.lazy.log
+++ /dev/null
@@ -1,123 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('Function1': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('Unit': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Function1': FqName@30) = null
-    packageFragments('java.lang.Int': FqName@31) = null
-    packageFragments('java.lang.Unit': FqName@32) = null
-    packageFragments('java.lang.inline': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = null
-    packageFragments('kotlin.Function1': FqName@35) = null
-    packageFragments('kotlin.Int': FqName@36) = null
-    packageFragments('kotlin.Unit': FqName@37) = null
-    packageFragments('kotlin.inline': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = null
-    packageFragments('kotlin.jvm': FqName@40) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('Function1': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('inline': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@69 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/sam.lazy.log b/compiler/testData/diagnostics/tests/inline/sam.lazy.log
deleted file mode 100644
index 2a88cfc59b1..00000000000
--- a/compiler/testData/diagnostics/tests/inline/sam.lazy.log
+++ /dev/null
@@ -1,482 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['noinline']
-}
-
-LazyJavaClassDescriptor@13['Run'] {
-    functionTypeForSamInterface = JetTypeImpl@14['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Run']
-}
-
-LazyJavaClassDescriptor@17['Test'] {
-    constructors = ArrayList@18[1] { JavaConstructorDescriptor@19['<init>'] } // through LazyJavaClassMemberScope@20
-    defaultType = JetTypeImpl@21['Test']
-    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@20
-    functionTypeForSamInterface = null
-    functions('test': Name@23) = ArrayList@24[2] { JavaMethodDescriptor@25['test'], SamAdapterFunctionDescriptor@26['test'] } // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@20
-    nestedClasses('test': Name@23) = null // through LazyJavaClassMemberScope@20
-    properties('test': Name@23) = EmptyList@29[empty] // through LazyJavaClassMemberScope@20
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['Test']
-}
-
-LazyJavaClassTypeConstructor@16['Run'] {
-    parameters = ArrayList@32[empty]
-    supertypes = ArrayList@33[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassTypeConstructor@31['Test'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassifierType@37['Object'] {
-    classifier = JavaClassImpl@38['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@42['Run'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Run']
-    nullable = 'false': Boolean@45
-    typeConstructor = LazyJavaClassTypeConstructor@16['Run']
-}
-
-LazyJavaClassifierType@46['Run'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@44['Run']
-    nullable = 'true': Boolean@48
-    typeConstructor = LazyJavaClassTypeConstructor@16['Run']
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Function1': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('Unit': FqName@54) = null
-    packageFragments('inline': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Function1': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('java.lang.inline': FqName@63) = null
-    packageFragments('java.lang.noinline': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Function1': FqName@66) = null
-    packageFragments('kotlin.Int': FqName@67) = null
-    packageFragments('kotlin.Unit': FqName@68) = null
-    packageFragments('kotlin.inline': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    packageFragments('kotlin.noinline': FqName@72) = null
-    packageFragments('noinline': FqName@73) = null
-    topLevelClasses(JavaClassImpl@44['Run']) = LazyJavaClassDescriptor@13['Run']
-    topLevelClasses(JavaClassImpl@74['Test']) = LazyJavaClassDescriptor@17['Test']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Function1': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Test': Name@78) = LazyJavaClassDescriptor@17['Test'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('ext': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('inline': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('noinline': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('s': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('test': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Test': Name@78) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('ext': Name@80) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('invoke': Name@82) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('s': Name@84) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('test': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('ext': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('invoke': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('s': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('test': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('Test': Name@78) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('ext': Name@80) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('invoke': Name@82) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('s': Name@84) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('test': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-null {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@264[2] { ResolutionCandidate@100, ResolutionCandidate@102 }
-    <name not found> = ArrayList@265[2] { ResolutionCandidate@105, ResolutionCandidate@107 }
-    <name not found> = ArrayList@266[2] { ResolutionCandidate@95, ResolutionCandidate@97 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/typed.lazy.log b/compiler/testData/diagnostics/tests/inline/typed.lazy.log
deleted file mode 100644
index e28b4b37435..00000000000
--- a/compiler/testData/diagnostics/tests/inline/typed.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('Function1': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('Unit': FqName@15) = null
-    packageFragments('inline': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Function1': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.Unit': FqName@23) = null
-    packageFragments('java.lang.inline': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Function1': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.Unit': FqName@28) = null
-    packageFragments('kotlin.inline': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('Function1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Unit': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@96 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
deleted file mode 100644
index 9239cfe0d01..00000000000
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
+++ /dev/null
@@ -1,371 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ExtensionFunction1<3>']
-    <name not found> = JetTypeImpl@2['ExtensionFunction1<3>']
-    <name not found> = JetTypeImpl@3['Function1<2>']
-    <name not found> = JetTypeImpl@4['Function1<2>']
-    <name not found> = JetTypeImpl@5['Function1<2>']
-    <name not found> = JetTypeImpl@6['Function1<2>']
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyAnnotationDescriptor@14 {
-    resolutionResults = OverloadResolutionResultsImpl@15
-    type = JetTypeImpl@16['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyAnnotationDescriptor@17 {
-    resolutionResults = OverloadResolutionResultsImpl@18
-    type = JetTypeImpl@19['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyAnnotationDescriptor@20 {
-    resolutionResults = OverloadResolutionResultsImpl@21
-    type = JetTypeImpl@22['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyAnnotationDescriptor@23 {
-    resolutionResults = OverloadResolutionResultsImpl@24
-    type = JetTypeImpl@25['inline']
-    valueArguments(ValueParameterDescriptorImpl@10['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('ExtensionFunction1': FqName@29) = null
-    packageFragments('Function1': FqName@30) = null
-    packageFragments('T': FqName@31) = null
-    packageFragments('V': FqName@32) = null
-    packageFragments('inline': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.ExtensionFunction1': FqName@38) = null
-    packageFragments('java.lang.Function1': FqName@39) = null
-    packageFragments('java.lang.T': FqName@40) = null
-    packageFragments('java.lang.V': FqName@41) = null
-    packageFragments('java.lang.inline': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@44) = null
-    packageFragments('kotlin.Function1': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.V': FqName@47) = null
-    packageFragments('kotlin.inline': FqName@48) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('ExtensionFunction1': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Function1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('dec': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('inc': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('inline': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('minus': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('plus': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('dec': Name@54) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('inc': Name@55) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('minus': Name@57) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('plus': Name@58) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('dec': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('inc': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('minus': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('plus': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('dec': Name@54) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('inc': Name@55) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('minus': Name@57) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('plus': Name@58) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[2] { ResolutionCandidate@136, ResolutionCandidate@137 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[2] { ResolutionCandidate@140, ResolutionCandidate@141 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[2] { ResolutionCandidate@148, ResolutionCandidate@149 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[2] { ResolutionCandidate@152, ResolutionCandidate@153 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[2] { ResolutionCandidate@156, ResolutionCandidate@157 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[3] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[3] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
-
-null {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@215[2] { ResolutionCandidate@164, ResolutionCandidate@165 }
-    <name not found> = ArrayList@216[2] { ResolutionCandidate@180, ResolutionCandidate@181 }
-    <name not found> = ArrayList@217[2] { ResolutionCandidate@172, ResolutionCandidate@173 }
-    <name not found> = ArrayList@218[2] { ResolutionCandidate@176, ResolutionCandidate@177 }
-    <name not found> = ArrayList@219[2] { ResolutionCandidate@144, ResolutionCandidate@145 }
-    <name not found> = ArrayList@220[2] { ResolutionCandidate@168, ResolutionCandidate@169 }
-    <name not found> = ArrayList@221[2] { ResolutionCandidate@156, ResolutionCandidate@157 }
-    <name not found> = ArrayList@222[2] { ResolutionCandidate@160, ResolutionCandidate@161 }
-    <name not found> = ArrayList@223[2] { ResolutionCandidate@148, ResolutionCandidate@149 }
-    <name not found> = ArrayList@224[2] { ResolutionCandidate@152, ResolutionCandidate@153 }
-    <name not found> = ArrayList@225[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
-    <name not found> = ArrayList@226[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = ArrayList@227[2] { ResolutionCandidate@140, ResolutionCandidate@141 }
-    <name not found> = ArrayList@228[2] { ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = ArrayList@229[2] { ResolutionCandidate@136, ResolutionCandidate@137 }
-    <name not found> = ArrayList@230[3] { ResolutionCandidate@189, ResolutionCandidate@190, ResolutionCandidate@191 }
-    <name not found> = ArrayList@231[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
-    <name not found> = ArrayList@232[3] { ResolutionCandidate@184, ResolutionCandidate@185, ResolutionCandidate@186 }
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-    <name not found> = EmptyList@60[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
deleted file mode 100644
index 25919c571c9..00000000000
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('Char': FqName@8) = null
-    packageFragments('inline': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Char': FqName@15) = null
-    packageFragments('java.lang.inline': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Char': FqName@19) = null
-    packageFragments('kotlin.inline': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Boolean': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('predicate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('predicate': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('predicate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('predicate': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
deleted file mode 100644
index 07c9ee8cfe8..00000000000
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('Boolean': FqName@16) = null
-    packageFragments('ExtensionFunction1': FqName@17) = null
-    packageFragments('ExtensionFunction2': FqName@18) = null
-    packageFragments('Function1': FqName@19) = null
-    packageFragments('Function2': FqName@20) = null
-    packageFragments('T': FqName@21) = null
-    packageFragments('U': FqName@22) = null
-    packageFragments('V': FqName@23) = null
-    packageFragments('W': FqName@24) = null
-    packageFragments('inline': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Boolean': FqName@30) = null
-    packageFragments('java.lang.ExtensionFunction1': FqName@31) = null
-    packageFragments('java.lang.ExtensionFunction2': FqName@32) = null
-    packageFragments('java.lang.Function1': FqName@33) = null
-    packageFragments('java.lang.Function2': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('java.lang.U': FqName@36) = null
-    packageFragments('java.lang.V': FqName@37) = null
-    packageFragments('java.lang.W': FqName@38) = null
-    packageFragments('java.lang.inline': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.Boolean': FqName@41) = null
-    packageFragments('kotlin.ExtensionFunction1': FqName@42) = null
-    packageFragments('kotlin.ExtensionFunction2': FqName@43) = null
-    packageFragments('kotlin.Function1': FqName@44) = null
-    packageFragments('kotlin.Function2': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.U': FqName@47) = null
-    packageFragments('kotlin.V': FqName@48) = null
-    packageFragments('kotlin.W': FqName@49) = null
-    packageFragments('kotlin.inline': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Boolean': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('ExtensionFunction1': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('ExtensionFunction2': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function1': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function2': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('inline': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('not': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('not': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[4] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-null {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@142[4] { ResolutionCandidate@106, ResolutionCandidate@107, ResolutionCandidate@108, ... }
-    <name not found> = ArrayList@143[4] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103, ... }
-    <name not found> = ArrayList@144[4] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128, ... }
-    <name not found> = ArrayList@145[4] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@146[4] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113, ... }
-    <name not found> = ArrayList@147[4] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = ArrayList@148[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = ArrayList@149[4] { ResolutionCandidate@131, ResolutionCandidate@132, ResolutionCandidate@133, ... }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
deleted file mode 100644
index 76fcf4f5d4f..00000000000
--- a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@10 {
-    packageFragments('<root>': FqName@11) = LazyJavaPackageFragment@12['<root>']
-    packageFragments('Base': FqName@13) = null
-    packageFragments('Derived': FqName@14) = null
-    packageFragments('Int': FqName@15) = null
-    packageFragments('Unit': FqName@16) = null
-    packageFragments('inline': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Base': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.Unit': FqName@24) = null
-    packageFragments('java.lang.inline': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Base': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.Unit': FqName@29) = null
-    packageFragments('kotlin.inline': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@12['<root>'] {
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('Unit': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log b/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
deleted file mode 100644
index cd6186a720d..00000000000
--- a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
+++ /dev/null
@@ -1,209 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['noinline']
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['noinline']
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('Function1': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('Unit': FqName@21) = null
-    packageFragments('inline': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.Function1': FqName@27) = null
-    packageFragments('java.lang.Int': FqName@28) = null
-    packageFragments('java.lang.Unit': FqName@29) = null
-    packageFragments('java.lang.inline': FqName@30) = null
-    packageFragments('java.lang.noinline': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.Function1': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Unit': FqName@35) = null
-    packageFragments('kotlin.inline': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('kotlin.noinline': FqName@39) = null
-    packageFragments('noinline': FqName@40) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('Function1': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('inline': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('noinline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('subInline': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('subNoInline': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('subInline': Name@47) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('subNoInline': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('subInline': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('subNoInline': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('subInline': Name@47) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('subNoInline': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log b/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
deleted file mode 100644
index 19e5aed999e..00000000000
--- a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
+++ /dev/null
@@ -1,313 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@4 {
-    resolutionResults = OverloadResolutionResultsImpl@5
-    type = JetTypeImpl@6['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@10 {
-    resolutionResults = OverloadResolutionResultsImpl@11
-    type = JetTypeImpl@12['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@13 {
-    resolutionResults = OverloadResolutionResultsImpl@14
-    type = JetTypeImpl@15['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['noinline']
-}
-
-LazyAnnotationDescriptor@22 {
-    resolutionResults = OverloadResolutionResultsImpl@23
-    type = JetTypeImpl@24['noinline']
-}
-
-LazyJavaPackageFragmentProvider@25 {
-    packageFragments('<root>': FqName@26) = LazyJavaPackageFragment@27['<root>']
-    packageFragments('Int': FqName@28) = null
-    packageFragments('Unit': FqName@29) = null
-    packageFragments('inline': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.Int': FqName@35) = null
-    packageFragments('java.lang.Unit': FqName@36) = null
-    packageFragments('java.lang.inline': FqName@37) = null
-    packageFragments('java.lang.noinline': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.Int': FqName@40) = null
-    packageFragments('kotlin.Unit': FqName@41) = null
-    packageFragments('kotlin.inline': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('kotlin.noinline': FqName@45) = null
-    packageFragments('noinline': FqName@46) = null
-}
-
-LazyJavaPackageFragment@27['<root>'] {
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Unit': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('inline': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noinline': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-null {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@174 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
deleted file mode 100644
index f87b7409ff8..00000000000
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['InnerAnnotation']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['InnerAnnotation']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('InnerAnnotation': FqName@9) = null
-    packageFragments('InnerClass': FqName@10) = null
-    packageFragments('StaticClass': FqName@11) = null
-    packageFragments('Test': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.InnerAnnotation': FqName@17) = null
-    packageFragments('java.lang.InnerClass': FqName@18) = null
-    packageFragments('java.lang.StaticClass': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.InnerAnnotation': FqName@21) = null
-    packageFragments('kotlin.InnerClass': FqName@22) = null
-    packageFragments('kotlin.StaticClass': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log b/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
deleted file mode 100644
index 4823c189626..00000000000
--- a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
+++ /dev/null
@@ -1,677 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@2
-    <name not found> = MutableClassDescriptor$1@2
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@4
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Any': FqName@9) = null
-    packageFragments('Outer1': FqName@10) = null
-    packageFragments('Outer2': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Inner': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Outer2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Inner': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Nested': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Outer2': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('Inner': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('Outer2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Inner': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Nested': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Outer2': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/deepInnerClass.lazy.log b/compiler/testData/diagnostics/tests/inner/deepInnerClass.lazy.log
deleted file mode 100644
index 7a38dc54132..00000000000
--- a/compiler/testData/diagnostics/tests/inner/deepInnerClass.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('P': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('W': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.P': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('java.lang.W': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.P': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.W': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log b/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
deleted file mode 100644
index 2a468d999da..00000000000
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
+++ /dev/null
@@ -1,115 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('E': FqName@7) = null
-    packageFragments('E1': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.E1': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.E1': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('outerFun': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('outerFun': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('outerFun': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('outerFun': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@57[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log b/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
deleted file mode 100644
index 6041d46246d..00000000000
--- a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
+++ /dev/null
@@ -1,447 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Inner': FqName@3) = null
-    packageFragments('Nested': FqName@4) = null
-    packageFragments('Outer': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Inner': FqName@10) = null
-    packageFragments('java.lang.Nested': FqName@11) = null
-    packageFragments('java.lang.Outer': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Inner': FqName@14) = null
-    packageFragments('kotlin.Nested': FqName@15) = null
-    packageFragments('kotlin.Outer': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Nested': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Outer': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('Inner': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('Nested': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('Outer': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Nested': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Outer': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Inner': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Nested': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Outer': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
deleted file mode 100644
index a161f4d1aed..00000000000
--- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
+++ /dev/null
@@ -1,97 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('ActionContext': FqName@3) = null
-    packageFragments('Map': FqName@4) = null
-    packageFragments('Request': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('f': FqName@8) = null
-    packageFragments('f.A': FqName@9) = null
-    packageFragments('f.ActionContext': FqName@10) = null
-    packageFragments('f.B': FqName@11) = null
-    packageFragments('f.Map': FqName@12) = null
-    packageFragments('f.Request': FqName@13) = null
-    packageFragments('f.String': FqName@14) = null
-    packageFragments('f.Unit': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.ActionContext': FqName@20) = null
-    packageFragments('java.lang.Map': FqName@21) = null
-    packageFragments('java.lang.Request': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.Unit': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.ActionContext': FqName@26) = null
-    packageFragments('kotlin.Map': FqName@27) = null
-    packageFragments('kotlin.Request': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.Unit': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('session': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/illegalModifier.lazy.log b/compiler/testData/diagnostics/tests/inner/illegalModifier.lazy.log
deleted file mode 100644
index a147b9ad31c..00000000000
--- a/compiler/testData/diagnostics/tests/inner/illegalModifier.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Any']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('B': FqName@10) = null
-    packageFragments('C': FqName@11) = null
-    packageFragments('D': FqName@12) = null
-    packageFragments('H': FqName@13) = null
-    packageFragments('K': FqName@14) = null
-    packageFragments('N': FqName@15) = null
-    packageFragments('P': FqName@16) = null
-    packageFragments('R': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('prop': FqName@25) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.lazy.log b/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.lazy.log
deleted file mode 100644
index 46edc26f715..00000000000
--- a/compiler/testData/diagnostics/tests/inner/innerClassesInStaticParameters.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Test': FqName@5) = null
-    packageFragments('TestInner': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.TestInner': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.TestInner': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
deleted file mode 100644
index f55d25d017c..00000000000
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
+++ /dev/null
@@ -1,395 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['InnerClass']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('InnerClass': FqName@9) = null
-    packageFragments('P': FqName@10) = null
-    packageFragments('SomeClass': FqName@11) = null
-    packageFragments('Test': FqName@12) = null
-    packageFragments('TestSome': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.InnerClass': FqName@18) = null
-    packageFragments('java.lang.P': FqName@19) = null
-    packageFragments('java.lang.SomeClass': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.InnerClass': FqName@22) = null
-    packageFragments('kotlin.P': FqName@23) = null
-    packageFragments('kotlin.SomeClass': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('InnerClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inClass': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('InnerClass': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('InnerClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('inClass': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('InnerClass': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
deleted file mode 100644
index 0ab254b15d0..00000000000
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
+++ /dev/null
@@ -1,595 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['InnerClass']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('InnerClass': FqName@9) = null
-    packageFragments('P': FqName@10) = null
-    packageFragments('SomeClass': FqName@11) = null
-    packageFragments('Test': FqName@12) = null
-    packageFragments('TestSome': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.InnerClass': FqName@18) = null
-    packageFragments('java.lang.P': FqName@19) = null
-    packageFragments('java.lang.SomeClass': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.InnerClass': FqName@22) = null
-    packageFragments('kotlin.P': FqName@23) = null
-    packageFragments('kotlin.SomeClass': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('InnerClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inClass': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('InnerClass': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('InnerClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('inClass': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('InnerClass': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log b/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
deleted file mode 100644
index 0f6c33b73b8..00000000000
--- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
+++ /dev/null
@@ -1,64 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = ErrorTypeImpl@4
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Outer': FqName@9) = null
-    packageFragments('Trait': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Trait': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Trait': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log b/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
deleted file mode 100644
index 5b4d357189d..00000000000
--- a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
+++ /dev/null
@@ -1,96 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Nested': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('Nested': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('Nested': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('Nested': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log b/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
deleted file mode 100644
index 693b358494a..00000000000
--- a/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Any']
-    <name not found> = null
-}
-
-DescriptorResolver@4 {
-    <name not found> = MutableClassDescriptor$1@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('oo': FqName@16) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Nested': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Nested': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Nested': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Nested': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/localClass.lazy.log b/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
deleted file mode 100644
index 7d3ba178c02..00000000000
--- a/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-DescriptorResolver@5 {
-    <name not found> = IntValue@6
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Int': FqName@10) = null
-    packageFragments('Outer': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Local': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('localState': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('outerState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Local': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('Local': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('localState': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('outerState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Local': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@92[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log b/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
deleted file mode 100644
index 637067b57ef..00000000000
--- a/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-DescriptorResolver@3 {
-    <name not found> = IntValue@4
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Outer': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('outerState': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('outerState': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log b/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
deleted file mode 100644
index c2924897386..00000000000
--- a/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['Local']
-    <name not found> = JetTypeImpl@3['Outer']
-    <name not found> = JetTypeImpl@3['Outer']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Outer': FqName@8) = null
-    packageFragments('Trait': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Trait': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Trait': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/modality.lazy.log b/compiler/testData/diagnostics/tests/inner/modality.lazy.log
deleted file mode 100644
index 3b5b3aa959d..00000000000
--- a/compiler/testData/diagnostics/tests/inner/modality.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('FinalInner': FqName@3) = null
-    packageFragments('FinalNested': FqName@4) = null
-    packageFragments('OpenInner': FqName@5) = null
-    packageFragments('OpenNested': FqName@6) = null
-    packageFragments('Outer': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.FinalInner': FqName@12) = null
-    packageFragments('java.lang.FinalNested': FqName@13) = null
-    packageFragments('java.lang.OpenInner': FqName@14) = null
-    packageFragments('java.lang.OpenNested': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.FinalInner': FqName@17) = null
-    packageFragments('kotlin.FinalNested': FqName@18) = null
-    packageFragments('kotlin.OpenInner': FqName@19) = null
-    packageFragments('kotlin.OpenNested': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
deleted file mode 100644
index 13fcd641168..00000000000
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
+++ /dev/null
@@ -1,903 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('N': FqName@5) = null
-    packageFragments('Obj': FqName@6) = null
-    packageFragments('WithClassObject': FqName@7) = null
-    packageFragments('WithoutClassObject': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.N': FqName@13) = null
-    packageFragments('java.lang.Obj': FqName@14) = null
-    packageFragments('java.lang.WithClassObject': FqName@15) = null
-    packageFragments('java.lang.WithoutClassObject': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.N': FqName@18) = null
-    packageFragments('kotlin.Obj': FqName@19) = null
-    packageFragments('kotlin.WithClassObject': FqName@20) = null
-    packageFragments('kotlin.WithoutClassObject': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('NestedObj': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('NestedWithClassObject': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Nested': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('NestedObj': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('NestedWithClassObject': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('NestedObj': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('NestedWithClassObject': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Nested': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('NestedObj': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('NestedWithClassObject': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
deleted file mode 100644
index f3d022ddc5a..00000000000
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
+++ /dev/null
@@ -1,60 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Outer': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Outer': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Outer': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
deleted file mode 100644
index 273ad0b644f..00000000000
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
+++ /dev/null
@@ -1,88 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Outer': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('U': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Outer': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.U': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Outer': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.U': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.lazy.log
deleted file mode 100644
index 430ee4886bb..00000000000
--- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
deleted file mode 100644
index 8c935e95814..00000000000
--- a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
+++ /dev/null
@@ -1,363 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = StringValue@5
-    <name not found> = StringValue@6
-    <name not found> = StringValue@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Outer': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('function': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('innerFun': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('innerProp': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('property': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('function': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('innerFun': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('function': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('innerFun': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('innerProp': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('property': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('function': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('innerFun': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log b/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
deleted file mode 100644
index f29b46aba13..00000000000
--- a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-    <name not found> = JetTypeImpl@2['T']
-    <name not found> = JetTypeImpl@3['T']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Outer': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
deleted file mode 100644
index 1a803e30802..00000000000
--- a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-    <name not found> = StringValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('I': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.I': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.I': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
deleted file mode 100644
index a302dc568dc..00000000000
--- a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Derived': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Base': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Base': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
deleted file mode 100644
index 03701734c17..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Outer': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Outer': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Outer': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
deleted file mode 100644
index 535cbe5c871..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
+++ /dev/null
@@ -1,247 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@4
-    <name not found> = MutableClassDescriptor$1@5
-    <name not found> = MutableClassDescriptor$1@6
-    <name not found> = MutableClassDescriptor$1@7
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Outer': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Outer': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Outer': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Outer': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Outer': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('Outer': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Outer': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
deleted file mode 100644
index ae1c88dde40..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.List': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Boolean': FqName@16) = null
-    packageFragments('kotlin.List': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Boolean': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('List': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('bar': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
deleted file mode 100644
index 9cbc267e36a..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['E']
-    <name not found> = JetTypeImpl@1['E']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('E': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.E': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.E': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
deleted file mode 100644
index 37d33634f4d..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
+++ /dev/null
@@ -1,145 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Nested<1>']
-    <name not found> = JetTypeImpl@3['Nested<1>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Outer': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Outer': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Outer': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
deleted file mode 100644
index 40bcad9789f..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
+++ /dev/null
@@ -1,167 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@2
-    <name not found> = MutableClassDescriptor$1@2
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@3
-    <name not found> = MutableClassDescriptor$1@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('ab': FqName@10) = null
-    packageFragments('abc': FqName@11) = null
-    packageFragments('b': FqName@12) = null
-    packageFragments('bc': FqName@13) = null
-    packageFragments('c': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.A': FqName@19) = null
-    packageFragments('java.lang.B': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('A': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('B': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('C': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('A': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('B': Name@32) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('A': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('B': Name@32) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('C': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
deleted file mode 100644
index 10a4e237466..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('A.A': FqName@6) = null
-    packageFragments('A.B': FqName@7) = null
-    packageFragments('A.a': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
deleted file mode 100644
index 0d472b48f34..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['E']
-    <name not found> = JetTypeImpl@1['E']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
deleted file mode 100644
index 251f16b5d63..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['C']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
deleted file mode 100644
index 17bc9975aec..00000000000
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Nested': FqName@3) = null
-    packageFragments('Outer': FqName@4) = null
-    packageFragments('bar': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Nested': FqName@10) = null
-    packageFragments('java.lang.Outer': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Nested': FqName@13) = null
-    packageFragments('kotlin.Outer': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log b/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
deleted file mode 100644
index dd20dfd6502..00000000000
--- a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('MyClass': FqName@5) = null
-    packageFragments('MyObject': FqName@6) = null
-    packageFragments('closure': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.MyClass': FqName@12) = null
-    packageFragments('java.lang.MyObject': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.MyClass': FqName@15) = null
-    packageFragments('kotlin.MyObject': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MyClass': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('MyClass': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('MyClass': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('MyClass': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
deleted file mode 100644
index 8d5170759e3..00000000000
--- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('MoreTest': FqName@3) = null
-    packageFragments('PackageTest': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.PackageTest': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.PackageTest': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@22 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
deleted file mode 100644
index 31b020f71a0..00000000000
--- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['ClassObjectAnnotation']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['NestedAnnotation']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('ClassObjectAnnotation': FqName@9) = null
-    packageFragments('NestedAnnotation': FqName@10) = null
-    packageFragments('Test': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.ClassObjectAnnotation': FqName@16) = null
-    packageFragments('java.lang.NestedAnnotation': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.ClassObjectAnnotation': FqName@19) = null
-    packageFragments('kotlin.NestedAnnotation': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('ClassObjectAnnotation': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('ClassObjectAnnotation': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/inner/traits.lazy.log b/compiler/testData/diagnostics/tests/inner/traits.lazy.log
deleted file mode 100644
index f720045bd13..00000000000
--- a/compiler/testData/diagnostics/tests/inner/traits.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('Foo2': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Bar': FqName@10) = null
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Bar': FqName@13) = null
-    packageFragments('kotlin.Foo': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log b/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
deleted file mode 100644
index 21971fd5818..00000000000
--- a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
+++ /dev/null
@@ -1,434 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Derived': FqName@3) = null
-    packageFragments('Outer': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Outer': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Outer': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Outer': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('PrivateInner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('ProtectedInner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('Outer': Name@14) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('PrivateInner': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('ProtectedInner': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('Outer': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('PrivateInner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('ProtectedInner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Outer': Name@14) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PrivateInner': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('ProtectedInner': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
deleted file mode 100644
index 993642e0932..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
+++ /dev/null
@@ -1,2154 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('add': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['add'] } // through LazyJavaClassMemberScope@4
-    functions('addAll': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['addAll'] } // through LazyJavaClassMemberScope@4
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clear': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['clear'] } // through LazyJavaClassMemberScope@4
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('contains': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['contains'] } // through LazyJavaClassMemberScope@4
-    functions('containsAll': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['containsAll'] } // through LazyJavaClassMemberScope@4
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['equals'] } // through LazyJavaClassMemberScope@4
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('get': Name@32) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@35) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('indexOf': Name@38) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('isEmpty': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['isEmpty'] } // through LazyJavaClassMemberScope@4
-    functions('iterator': Name@42) = ArrayList@43[1] { JavaMethodDescriptor@44['iterator'] } // through LazyJavaClassMemberScope@4
-    functions('lastIndexOf': Name@45) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('listIterator': Name@46) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('outOfBoundsMsg': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('rangeCheckForAdd': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('remove': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['remove'] } // through LazyJavaClassMemberScope@4
-    functions('removeAll': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['removeAll'] } // through LazyJavaClassMemberScope@4
-    functions('removeRange': Name@59) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('retainAll': Name@60) = ArrayList@61[1] { JavaMethodDescriptor@62['retainAll'] } // through LazyJavaClassMemberScope@4
-    functions('set': Name@63) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('size': Name@64) = ArrayList@65[1] { JavaMethodDescriptor@66['size'] } // through LazyJavaClassMemberScope@4
-    functions('subList': Name@67) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toArray': Name@68) = ArrayList@69[2] { JavaMethodDescriptor@70['toArray'], JavaMethodDescriptor@71['toArray'] } // through LazyJavaClassMemberScope@4
-    functions('toString': Name@72) = ArrayList@73[1] { JavaMethodDescriptor@74['toString'] } // through LazyJavaClassMemberScope@4
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@78 // through LazyJavaClassMemberScope@4
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@82['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@83['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@84['AbstractList'] {
-    defaultType = JetTypeImpl@85['AbstractList<1>']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('add': Name@87) = ArrayList@88[2] { JavaMethodDescriptor@89['add'], JavaMethodDescriptor@90['add'] } // through LazyJavaClassMemberScope@86
-    functions('addAll': Name@91) = ArrayList@92[2] { JavaMethodDescriptor@93['addAll'], DeserializedSimpleFunctionDescriptor@94['addAll'] } // through LazyJavaClassMemberScope@86
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('clear': Name@95) = ArrayList@96[1] { JavaMethodDescriptor@97['clear'] } // through LazyJavaClassMemberScope@86
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('contains': Name@18) = ArrayList@98[1] { DeserializedSimpleFunctionDescriptor@99['contains'] } // through LazyJavaClassMemberScope@86
-    functions('containsAll': Name@21) = ArrayList@100[1] { DeserializedSimpleFunctionDescriptor@101['containsAll'] } // through LazyJavaClassMemberScope@86
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('equals': Name@102) = ArrayList@103[1] { JavaMethodDescriptor@104['equals'] } // through LazyJavaClassMemberScope@86
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('get': Name@105) = ArrayList@106[1] { JavaMethodDescriptor@107['get'] } // through LazyJavaClassMemberScope@86
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('hashCode': Name@108) = ArrayList@109[1] { JavaMethodDescriptor@110['hashCode'] } // through LazyJavaClassMemberScope@86
-    functions('indexOf': Name@111) = ArrayList@112[1] { JavaMethodDescriptor@113['indexOf'] } // through LazyJavaClassMemberScope@86
-    functions('isEmpty': Name@39) = ArrayList@114[1] { DeserializedSimpleFunctionDescriptor@115['isEmpty'] } // through LazyJavaClassMemberScope@86
-    functions('iterator': Name@116) = ArrayList@117[1] { JavaMethodDescriptor@118['iterator'] } // through LazyJavaClassMemberScope@86
-    functions('lastIndexOf': Name@119) = ArrayList@120[1] { JavaMethodDescriptor@121['lastIndexOf'] } // through LazyJavaClassMemberScope@86
-    functions('listIterator': Name@122) = ArrayList@123[2] { JavaMethodDescriptor@124['listIterator'], JavaMethodDescriptor@125['listIterator'] } // through LazyJavaClassMemberScope@86
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('outOfBoundsMsg': Name@126) = ArrayList@127[1] { JavaMethodDescriptor@128['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@86
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('rangeCheckForAdd': Name@129) = ArrayList@130[1] { JavaMethodDescriptor@131['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@86
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('remove': Name@132) = ArrayList@133[2] { JavaMethodDescriptor@134['remove'], DeserializedSimpleFunctionDescriptor@135['remove'] } // through LazyJavaClassMemberScope@86
-    functions('removeAll': Name@56) = ArrayList@136[1] { DeserializedSimpleFunctionDescriptor@137['removeAll'] } // through LazyJavaClassMemberScope@86
-    functions('removeRange': Name@138) = ArrayList@139[1] { JavaMethodDescriptor@140['removeRange'] } // through LazyJavaClassMemberScope@86
-    functions('retainAll': Name@60) = ArrayList@141[1] { DeserializedSimpleFunctionDescriptor@142['retainAll'] } // through LazyJavaClassMemberScope@86
-    functions('set': Name@143) = ArrayList@144[1] { JavaMethodDescriptor@145['set'] } // through LazyJavaClassMemberScope@86
-    functions('size': Name@64) = ArrayList@146[1] { DeserializedSimpleFunctionDescriptor@147['size'] } // through LazyJavaClassMemberScope@86
-    functions('subList': Name@148) = ArrayList@149[1] { JavaMethodDescriptor@150['subList'] } // through LazyJavaClassMemberScope@86
-    functions('toArray': Name@68) = ArrayList@151[2] { JavaMethodDescriptor@152['toArray'], JavaMethodDescriptor@153['toArray'] } // through LazyJavaClassMemberScope@86
-    functions('toString': Name@72) = ArrayList@154[1] { DeserializedSimpleFunctionDescriptor@155['toString'] } // through LazyJavaClassMemberScope@86
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    memberIndex = computeMemberIndex$1@156 // through LazyJavaClassMemberScope@86
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    properties('modCount': Name@80) = ArrayList@157[1] { JavaPropertyDescriptor@158['modCount'] } // through LazyJavaClassMemberScope@86
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@159['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@160['AbstractList']
-}
-
-LazyJavaClassDescriptor@161['ArrayList'] {
-    allDescriptors = ArrayList@162[46] { LazyJavaClassDescriptor@163['SubList'], LazyJavaClassDescriptor@164['ListItr'], LazyJavaClassDescriptor@165['Itr'], ... } // through LazyJavaClassMemberScope@166
-    constructors = ArrayList@167[3] { JavaConstructorDescriptor@168['<init>'], JavaConstructorDescriptor@169['<init>'], JavaConstructorDescriptor@170['<init>'] } // through LazyJavaClassMemberScope@166
-    defaultType = JetTypeImpl@171['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@172 // through LazyJavaClassMemberScope@166
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('add': Name@173) = ArrayList@174[2] { JavaMethodDescriptor@175['add'], JavaMethodDescriptor@176['add'] } // through LazyJavaClassMemberScope@166
-    functions('addAll': Name@177) = ArrayList@178[2] { JavaMethodDescriptor@179['addAll'], JavaMethodDescriptor@180['addAll'] } // through LazyJavaClassMemberScope@166
-    functions('batchRemove': Name@181) = ArrayList@182[1] { JavaMethodDescriptor@183['batchRemove'] } // through LazyJavaClassMemberScope@166
-    functions('clear': Name@184) = ArrayList@185[1] { JavaMethodDescriptor@186['clear'] } // through LazyJavaClassMemberScope@166
-    functions('clone': Name@187) = ArrayList@188[1] { JavaMethodDescriptor@189['clone'] } // through LazyJavaClassMemberScope@166
-    functions('contains': Name@190) = ArrayList@191[1] { JavaMethodDescriptor@192['contains'] } // through LazyJavaClassMemberScope@166
-    functions('containsAll': Name@21) = ArrayList@193[1] { DeserializedSimpleFunctionDescriptor@194['containsAll'] } // through LazyJavaClassMemberScope@166
-    functions('elementData': Name@195) = ArrayList@196[1] { JavaMethodDescriptor@197['elementData'] } // through LazyJavaClassMemberScope@166
-    functions('ensureCapacity': Name@198) = ArrayList@199[1] { JavaMethodDescriptor@200['ensureCapacity'] } // through LazyJavaClassMemberScope@166
-    functions('ensureCapacityInternal': Name@201) = ArrayList@202[1] { JavaMethodDescriptor@203['ensureCapacityInternal'] } // through LazyJavaClassMemberScope@166
-    functions('equals': Name@102) = ArrayList@204[1] { DeserializedSimpleFunctionDescriptor@205['equals'] } // through LazyJavaClassMemberScope@166
-    functions('fastRemove': Name@206) = ArrayList@207[1] { JavaMethodDescriptor@208['fastRemove'] } // through LazyJavaClassMemberScope@166
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('get': Name@209) = ArrayList@210[1] { JavaMethodDescriptor@211['get'] } // through LazyJavaClassMemberScope@166
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('grow': Name@212) = ArrayList@213[1] { JavaMethodDescriptor@214['grow'] } // through LazyJavaClassMemberScope@166
-    functions('hashCode': Name@108) = ArrayList@215[1] { DeserializedSimpleFunctionDescriptor@216['hashCode'] } // through LazyJavaClassMemberScope@166
-    functions('indexOf': Name@217) = ArrayList@218[1] { JavaMethodDescriptor@219['indexOf'] } // through LazyJavaClassMemberScope@166
-    functions('isEmpty': Name@220) = ArrayList@221[1] { JavaMethodDescriptor@222['isEmpty'] } // through LazyJavaClassMemberScope@166
-    functions('iterator': Name@223) = ArrayList@224[1] { JavaMethodDescriptor@225['iterator'] } // through LazyJavaClassMemberScope@166
-    functions('lastIndexOf': Name@226) = ArrayList@227[1] { JavaMethodDescriptor@228['lastIndexOf'] } // through LazyJavaClassMemberScope@166
-    functions('listIterator': Name@229) = ArrayList@230[2] { JavaMethodDescriptor@231['listIterator'], JavaMethodDescriptor@232['listIterator'] } // through LazyJavaClassMemberScope@166
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('outOfBoundsMsg': Name@233) = ArrayList@234[1] { JavaMethodDescriptor@235['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@166
-    functions('rangeCheck': Name@236) = ArrayList@237[1] { JavaMethodDescriptor@238['rangeCheck'] } // through LazyJavaClassMemberScope@166
-    functions('rangeCheckForAdd': Name@239) = ArrayList@240[1] { JavaMethodDescriptor@241['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@166
-    functions('readObject': Name@242) = ArrayList@243[1] { JavaMethodDescriptor@244['readObject'] } // through LazyJavaClassMemberScope@166
-    functions('remove': Name@245) = ArrayList@246[2] { JavaMethodDescriptor@247['remove'], JavaMethodDescriptor@248['remove'] } // through LazyJavaClassMemberScope@166
-    functions('removeAll': Name@249) = ArrayList@250[1] { JavaMethodDescriptor@251['removeAll'] } // through LazyJavaClassMemberScope@166
-    functions('removeRange': Name@252) = ArrayList@253[1] { JavaMethodDescriptor@254['removeRange'] } // through LazyJavaClassMemberScope@166
-    functions('retainAll': Name@255) = ArrayList@256[1] { JavaMethodDescriptor@257['retainAll'] } // through LazyJavaClassMemberScope@166
-    functions('set': Name@258) = ArrayList@259[1] { JavaMethodDescriptor@260['set'] } // through LazyJavaClassMemberScope@166
-    functions('size': Name@261) = ArrayList@262[1] { JavaMethodDescriptor@263['size'] } // through LazyJavaClassMemberScope@166
-    functions('subList': Name@264) = ArrayList@265[1] { JavaMethodDescriptor@266['subList'] } // through LazyJavaClassMemberScope@166
-    functions('toArray': Name@267) = ArrayList@268[2] { JavaMethodDescriptor@269['toArray'], JavaMethodDescriptor@270['toArray'] } // through LazyJavaClassMemberScope@166
-    functions('toString': Name@72) = ArrayList@271[1] { DeserializedSimpleFunctionDescriptor@272['toString'] } // through LazyJavaClassMemberScope@166
-    functions('trimToSize': Name@273) = ArrayList@274[1] { JavaMethodDescriptor@275['trimToSize'] } // through LazyJavaClassMemberScope@166
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('writeObject': Name@276) = ArrayList@277[1] { JavaMethodDescriptor@278['writeObject'] } // through LazyJavaClassMemberScope@166
-    memberIndex = computeMemberIndex$1@279 // through LazyJavaClassMemberScope@166
-    nestedClassIndex = LinkedHashMap@280 // through LazyJavaClassMemberScope@166
-    nestedClasses('Itr': Name@2) = LazyJavaClassDescriptor@165['Itr'] // through LazyJavaClassMemberScope@166
-    nestedClasses('ListItr': Name@5) = LazyJavaClassDescriptor@164['ListItr'] // through LazyJavaClassMemberScope@166
-    nestedClasses('SubList': Name@6) = LazyJavaClassDescriptor@163['SubList'] // through LazyJavaClassMemberScope@166
-    properties('elementData': Name@79) = ArrayList@281[1] { JavaPropertyDescriptor@282['elementData'] } // through LazyJavaClassMemberScope@166
-    properties('modCount': Name@80) = ArrayList@283[1] { PropertyDescriptorImpl@284['modCount'] } // through LazyJavaClassMemberScope@166
-    properties('size': Name@81) = ArrayList@285[1] { JavaPropertyDescriptor@286['size'] } // through LazyJavaClassMemberScope@166
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@287['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@288['ArrayList']
-}
-
-LazyJavaClassDescriptor@289['B'] {
-    defaultType = JetTypeImpl@290['B<1>']
-    functions('clone': Name@291) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    functions('equals': Name@293) = ArrayList@294[1] { DeserializedSimpleFunctionDescriptor@295['equals'] } // through LazyJavaClassMemberScope@292
-    functions('finalize': Name@296) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    functions('foo': Name@297) = ArrayList@298[1] { JavaMethodDescriptor@299['foo'] } // through LazyJavaClassMemberScope@292
-    functions('getClass': Name@300) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    functions('hashCode': Name@301) = ArrayList@302[1] { DeserializedSimpleFunctionDescriptor@303['hashCode'] } // through LazyJavaClassMemberScope@292
-    functions('notify': Name@304) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    functions('notifyAll': Name@305) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    functions('toString': Name@306) = ArrayList@307[1] { DeserializedSimpleFunctionDescriptor@308['toString'] } // through LazyJavaClassMemberScope@292
-    functions('wait': Name@309) = EmptyList@3[empty] // through LazyJavaClassMemberScope@292
-    memberIndex = computeMemberIndex$1@310 // through LazyJavaClassMemberScope@292
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@311['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@312['B']
-}
-
-LazyJavaClassDescriptor@313['C'] {
-    allDescriptors = ArrayList@314[4] { DeserializedSimpleFunctionDescriptor@315['hashCode'], JavaMethodDescriptor@316['foo'], DeserializedSimpleFunctionDescriptor@317['toString'], ... } // through LazyJavaClassMemberScope@318
-    constructors = ArrayList@319[1] { JavaConstructorDescriptor@320['<init>'] } // through LazyJavaClassMemberScope@318
-    defaultType = JetTypeImpl@321['C<1>']
-    enumEntryIndex = LinkedHashMap@322 // through LazyJavaClassMemberScope@318
-    functions('clone': Name@291) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    functions('equals': Name@293) = ArrayList@323[1] { DeserializedSimpleFunctionDescriptor@324['equals'] } // through LazyJavaClassMemberScope@318
-    functions('finalize': Name@296) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    functions('foo': Name@297) = ArrayList@325[1] { JavaMethodDescriptor@316['foo'] } // through LazyJavaClassMemberScope@318
-    functions('getClass': Name@300) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    functions('hashCode': Name@301) = ArrayList@326[1] { DeserializedSimpleFunctionDescriptor@315['hashCode'] } // through LazyJavaClassMemberScope@318
-    functions('notify': Name@304) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    functions('notifyAll': Name@305) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    functions('toString': Name@306) = ArrayList@327[1] { DeserializedSimpleFunctionDescriptor@317['toString'] } // through LazyJavaClassMemberScope@318
-    functions('wait': Name@309) = EmptyList@3[empty] // through LazyJavaClassMemberScope@318
-    memberIndex = computeMemberIndex$1@328 // through LazyJavaClassMemberScope@318
-    nestedClassIndex = LinkedHashMap@329 // through LazyJavaClassMemberScope@318
-    typeConstructor = LazyJavaClassTypeConstructor@330['C']
-}
-
-LazyJavaClassDescriptor@331['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@332['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@333['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@334['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@335['P'] {
-    typeConstructor = LazyJavaClassTypeConstructor@336['P']
-}
-
-LazyJavaClassDescriptor@337['RandomAccess'] {
-    defaultType = JetTypeImpl@338['RandomAccess']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('add': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('addAll': Name@91) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('clear': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('contains': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('containsAll': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('equals': Name@102) = ArrayList@340[1] { DeserializedSimpleFunctionDescriptor@341['equals'] } // through LazyJavaClassMemberScope@339
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('get': Name@105) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('hashCode': Name@108) = ArrayList@342[1] { DeserializedSimpleFunctionDescriptor@343['hashCode'] } // through LazyJavaClassMemberScope@339
-    functions('indexOf': Name@111) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('isEmpty': Name@39) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('iterator': Name@116) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('lastIndexOf': Name@119) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('listIterator': Name@122) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('outOfBoundsMsg': Name@126) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('rangeCheckForAdd': Name@129) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('remove': Name@132) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('removeAll': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('removeRange': Name@138) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('retainAll': Name@60) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('set': Name@143) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('size': Name@64) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('subList': Name@148) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('toArray': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('toString': Name@72) = ArrayList@344[1] { DeserializedSimpleFunctionDescriptor@345['toString'] } // through LazyJavaClassMemberScope@339
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    memberIndex = computeMemberIndex$1@346 // through LazyJavaClassMemberScope@339
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@339
-    typeConstructor = LazyJavaClassTypeConstructor@347['RandomAccess']
-}
-
-LazyJavaClassDescriptor@348['Serializable'] {
-    defaultType = JetTypeImpl@349['Serializable']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('add': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('addAll': Name@91) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('clear': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('contains': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('containsAll': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('equals': Name@102) = ArrayList@351[1] { DeserializedSimpleFunctionDescriptor@352['equals'] } // through LazyJavaClassMemberScope@350
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('get': Name@105) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('hashCode': Name@108) = ArrayList@353[1] { DeserializedSimpleFunctionDescriptor@354['hashCode'] } // through LazyJavaClassMemberScope@350
-    functions('indexOf': Name@111) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('isEmpty': Name@39) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('iterator': Name@116) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('lastIndexOf': Name@119) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('listIterator': Name@122) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('outOfBoundsMsg': Name@126) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('rangeCheckForAdd': Name@129) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('remove': Name@132) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('removeAll': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('removeRange': Name@138) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('retainAll': Name@60) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('set': Name@143) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('size': Name@64) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('subList': Name@148) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('toArray': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('toString': Name@72) = ArrayList@355[1] { DeserializedSimpleFunctionDescriptor@356['toString'] } // through LazyJavaClassMemberScope@350
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    memberIndex = computeMemberIndex$1@357 // through LazyJavaClassMemberScope@350
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@350
-    typeConstructor = LazyJavaClassTypeConstructor@358['Serializable']
-}
-
-LazyJavaClassTypeConstructor@83['AbstractCollection'] {
-    parameters = ArrayList@359[1] { LazyJavaTypeParameterDescriptor@360['E'] }
-    supertypes = ArrayList@361[1] { LazyJavaClassifierType@362['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@160['AbstractList'] {
-    parameters = ArrayList@363[1] { LazyJavaTypeParameterDescriptor@364['E'] }
-    supertypes = ArrayList@365[2] { LazyJavaClassifierType@366['AbstractCollection<E>'], LazyJavaClassifierType@367['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@288['ArrayList'] {
-    parameters = ArrayList@368[1] { LazyJavaTypeParameterDescriptor@369['E'] }
-    supertypes = ArrayList@370[5] { LazyJavaClassifierType@371['AbstractList<E>'], LazyJavaClassifierType@372['List<E>'], LazyJavaClassifierType@373['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@312['B'] {
-    parameters = ArrayList@374[1] { LazyJavaTypeParameterDescriptor@375['TB'] }
-    supertypes = ArrayList@376[1] { LazyJavaClassifierType@377['A<TB>'] }
-}
-
-LazyJavaClassTypeConstructor@330['C'] {
-    parameters = ArrayList@378[1] { LazyJavaTypeParameterDescriptor@379['TC'] }
-    supertypes = ArrayList@380[2] { LazyJavaClassifierType@381['B<TC>'], LazyJavaClassifierType@382['A<TC>'] }
-}
-
-LazyJavaClassTypeConstructor@332['ObjectInputStream'] {
-    parameters = ArrayList@383[empty]
-}
-
-LazyJavaClassTypeConstructor@334['ObjectOutputStream'] {
-    parameters = ArrayList@384[empty]
-}
-
-LazyJavaClassTypeConstructor@336['P'] {
-    parameters = ArrayList@385[empty]
-    supertypes = ArrayList@386[1] { JetTypeImpl@387['Any'] }
-}
-
-LazyJavaClassTypeConstructor@347['RandomAccess'] {
-    parameters = ArrayList@388[empty]
-    supertypes = ArrayList@389[1] { JetTypeImpl@387['Any'] }
-}
-
-LazyJavaClassTypeConstructor@358['Serializable'] {
-    parameters = ArrayList@390[empty]
-    supertypes = ArrayList@391[1] { JetTypeImpl@387['Any'] }
-}
-
-LazyJavaClassifierType@377['A<TB>'] {
-    arguments = ArrayList@392[1] { TypeProjectionImpl@393 }
-    classifier = JavaClassImpl@394['A']
-    memberScope = SubstitutingScope@395
-    nullable = 'false': Boolean@396
-    typeConstructor = TypeConstructorImpl$1@397
-}
-
-LazyJavaClassifierType@398['A<TB>'] {
-    arguments = ArrayList@399[1] { TypeProjectionImpl@400 }
-    classifier = JavaClassImpl@401['A']
-    memberScope = SubstitutingScope@402
-    nullable = 'false': Boolean@396
-    typeConstructor = TypeConstructorImpl$1@397
-}
-
-LazyJavaClassifierType@403['A<TB>'] {
-    arguments = ArrayList@404[1] { TypeProjectionImpl@405 }
-    classifier = JavaClassImpl@401['A']
-    memberScope = SubstitutingScope@406
-    nullable = 'true': Boolean@407
-    typeConstructor = TypeConstructorImpl$1@397
-}
-
-LazyJavaClassifierType@382['A<TC>'] {
-    arguments = ArrayList@408[1] { TypeProjectionImpl@409 }
-    classifier = JavaClassImpl@410['A']
-    memberScope = SubstitutingScope@411
-    nullable = 'false': Boolean@396
-    typeConstructor = TypeConstructorImpl$1@397
-}
-
-LazyJavaClassifierType@366['AbstractCollection<E>'] {
-    arguments = ArrayList@412[1] { TypeProjectionImpl@413 }
-    classifier = JavaClassImpl@414['AbstractCollection']
-    memberScope = SubstitutingScope@415
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@83['AbstractCollection']
-}
-
-LazyJavaClassifierType@371['AbstractList<E>'] {
-    arguments = ArrayList@416[1] { TypeProjectionImpl@417 }
-    classifier = JavaClassImpl@418['AbstractList']
-    memberScope = SubstitutingScope@419
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@160['AbstractList']
-}
-
-LazyJavaClassifierType@381['B<TC>'] {
-    arguments = ArrayList@420[1] { TypeProjectionImpl@421 }
-    classifier = JavaClassImpl@422['B']
-    memberScope = SubstitutingScope@423
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@312['B']
-}
-
-LazyJavaClassifierType@424['Cloneable'] {
-    arguments = ArrayList@425[empty]
-    classifier = JavaClassImpl@426['Cloneable']
-    memberScope = DeserializedClassMemberScope@427
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@428
-}
-
-LazyJavaClassifierType@429['Collection<? extends E>'] {
-    arguments = ArrayList@430[1] { TypeProjectionImpl@431 }
-    classifier = JavaClassImpl@432['Collection']
-    memberScope = SubstitutingScope@433
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@435['Collection<? extends E>'] {
-    arguments = ArrayList@436[1] { TypeProjectionImpl@437 }
-    classifier = JavaClassImpl@438['Collection']
-    memberScope = SubstitutingScope@439
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@440['Collection<? extends E>'] {
-    arguments = ArrayList@441[1] { TypeProjectionImpl@442 }
-    classifier = JavaClassImpl@443['Collection']
-    memberScope = SubstitutingScope@444
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@445['Collection<? extends E>'] {
-    arguments = ArrayList@446[1] { TypeProjectionImpl@447 }
-    classifier = JavaClassImpl@448['Collection']
-    memberScope = SubstitutingScope@449
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@450['Collection<? extends E>'] {
-    arguments = ArrayList@451[1] { TypeProjectionImpl@452 }
-    classifier = JavaClassImpl@453['Collection']
-    memberScope = SubstitutingScope@454
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@455['Collection<? extends E>'] {
-    arguments = ArrayList@456[1] { TypeProjectionImpl@457 }
-    classifier = JavaClassImpl@448['Collection']
-    memberScope = SubstitutingScope@458
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@460['Collection<? extends E>'] {
-    arguments = ArrayList@461[1] { TypeProjectionImpl@462 }
-    classifier = JavaClassImpl@432['Collection']
-    memberScope = SubstitutingScope@463
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@464['Collection<? extends E>'] {
-    arguments = ArrayList@465[1] { TypeProjectionImpl@466 }
-    classifier = JavaClassImpl@438['Collection']
-    memberScope = SubstitutingScope@467
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@468['Collection<? extends E>'] {
-    arguments = ArrayList@469[1] { TypeProjectionImpl@470 }
-    classifier = JavaClassImpl@453['Collection']
-    memberScope = SubstitutingScope@471
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@472['Collection<? extends E>'] {
-    arguments = ArrayList@473[1] { TypeProjectionImpl@474 }
-    classifier = JavaClassImpl@443['Collection']
-    memberScope = SubstitutingScope@475
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@476['Collection<?>'] {
-    arguments = ArrayList@477[1] { LazyStarProjection@478 }
-    classifier = JavaClassImpl@479['Collection']
-    memberScope = SubstitutingScope@480
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@481['Collection<?>'] {
-    arguments = ArrayList@482[1] { LazyStarProjection@483 }
-    classifier = JavaClassImpl@484['Collection']
-    memberScope = SubstitutingScope@485
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@486['Collection<?>'] {
-    arguments = ArrayList@487[1] { LazyStarProjection@488 }
-    classifier = JavaClassImpl@489['Collection']
-    memberScope = SubstitutingScope@490
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@491['Collection<?>'] {
-    arguments = ArrayList@492[1] { LazyStarProjection@493 }
-    classifier = JavaClassImpl@494['Collection']
-    memberScope = SubstitutingScope@495
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@496['Collection<?>'] {
-    arguments = ArrayList@497[1] { LazyStarProjection@498 }
-    classifier = JavaClassImpl@499['Collection']
-    memberScope = SubstitutingScope@500
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@501['Collection<?>'] {
-    arguments = ArrayList@502[1] { LazyStarProjection@503 }
-    classifier = JavaClassImpl@504['Collection']
-    memberScope = SubstitutingScope@505
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@506['Collection<?>'] {
-    arguments = ArrayList@507[1] { LazyStarProjection@508 }
-    classifier = JavaClassImpl@479['Collection']
-    memberScope = SubstitutingScope@509
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@510['Collection<?>'] {
-    arguments = ArrayList@511[1] { LazyStarProjection@512 }
-    classifier = JavaClassImpl@489['Collection']
-    memberScope = SubstitutingScope@513
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@514['Collection<?>'] {
-    arguments = ArrayList@515[1] { LazyStarProjection@516 }
-    classifier = JavaClassImpl@484['Collection']
-    memberScope = SubstitutingScope@517
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@518['Collection<?>'] {
-    arguments = ArrayList@519[1] { LazyStarProjection@520 }
-    classifier = JavaClassImpl@499['Collection']
-    memberScope = SubstitutingScope@521
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@522['Collection<?>'] {
-    arguments = ArrayList@523[1] { LazyStarProjection@524 }
-    classifier = JavaClassImpl@494['Collection']
-    memberScope = SubstitutingScope@525
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@526['Collection<?>'] {
-    arguments = ArrayList@527[1] { LazyStarProjection@528 }
-    classifier = JavaClassImpl@504['Collection']
-    memberScope = SubstitutingScope@529
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@459
-}
-
-LazyJavaClassifierType@362['Collection<E>'] {
-    arguments = ArrayList@530[1] { TypeProjectionImpl@531 }
-    classifier = JavaClassImpl@532['Collection']
-    memberScope = SubstitutingScope@533
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@434
-}
-
-LazyJavaClassifierType@534['E'] {
-    arguments = ArrayList@535[empty]
-    classifier = JavaTypeParameterImpl@536['E']
-    memberScope = LazyScopeAdapter@537
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@539['E'] {
-    arguments = ArrayList@540[empty]
-    classifier = JavaTypeParameterImpl@541['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@543['E'] {
-    arguments = ArrayList@544[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@546['E'] {
-    arguments = ArrayList@547[empty]
-    classifier = JavaTypeParameterImpl@548['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@549['E'] {
-    arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@551['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@552['E'] {
-    arguments = ArrayList@553[empty]
-    classifier = JavaTypeParameterImpl@554['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@555['E'] {
-    arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@557['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@558['E'] {
-    arguments = ArrayList@559[empty]
-    classifier = JavaTypeParameterImpl@560['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@562['E'] {
-    arguments = ArrayList@563[empty]
-    classifier = JavaTypeParameterImpl@564['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@565['E'] {
-    arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@567['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@568['E'] {
-    arguments = ArrayList@569[empty]
-    classifier = JavaTypeParameterImpl@570['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@571['E'] {
-    arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@573['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@574['E'] {
-    arguments = ArrayList@575[empty]
-    classifier = JavaTypeParameterImpl@576['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@577['E'] {
-    arguments = ArrayList@578[empty]
-    classifier = JavaTypeParameterImpl@579['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@580['E'] {
-    arguments = ArrayList@581[empty]
-    classifier = JavaTypeParameterImpl@582['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@583['E'] {
-    arguments = ArrayList@584[empty]
-    classifier = JavaTypeParameterImpl@585['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@586['E'] {
-    arguments = ArrayList@587[empty]
-    classifier = JavaTypeParameterImpl@588['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@589['E'] {
-    arguments = ArrayList@590[empty]
-    classifier = JavaTypeParameterImpl@591['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@592['E'] {
-    arguments = ArrayList@593[empty]
-    classifier = JavaTypeParameterImpl@594['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@595['E'] {
-    arguments = ArrayList@596[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@598['E'] {
-    arguments = ArrayList@599[empty]
-    classifier = JavaTypeParameterImpl@600['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@601['E'] {
-    arguments = ArrayList@602[empty]
-    classifier = JavaTypeParameterImpl@603['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@604['E'] {
-    arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@606['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@607['E'] {
-    arguments = ArrayList@608[empty]
-    classifier = JavaTypeParameterImpl@609['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@610['E'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@612['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@613['E'] {
-    arguments = ArrayList@614[empty]
-    classifier = JavaTypeParameterImpl@615['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@616['E'] {
-    arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@618['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@619['E'] {
-    arguments = ArrayList@620[empty]
-    classifier = JavaTypeParameterImpl@621['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@622['E'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@624['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@625['E'] {
-    arguments = ArrayList@626[empty]
-    classifier = JavaTypeParameterImpl@627['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@628['E'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@630['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@631['E'] {
-    arguments = ArrayList@632[empty]
-    classifier = JavaTypeParameterImpl@633['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@634['E'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@636['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@637['E'] {
-    arguments = ArrayList@638[empty]
-    classifier = JavaTypeParameterImpl@639['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@640['E'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@642['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@643['E'] {
-    arguments = ArrayList@644[empty]
-    classifier = JavaTypeParameterImpl@645['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@646['E'] {
-    arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@648['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@649['E'] {
-    arguments = ArrayList@650[empty]
-    classifier = JavaTypeParameterImpl@651['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@652['E'] {
-    arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@654['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@655['E'] {
-    arguments = ArrayList@656[empty]
-    classifier = JavaTypeParameterImpl@657['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@658['E'] {
-    arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@660['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@661['E'] {
-    arguments = ArrayList@662[empty]
-    classifier = JavaTypeParameterImpl@663['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@664['E'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@666['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@667['E'] {
-    arguments = ArrayList@668[empty]
-    classifier = JavaTypeParameterImpl@669['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@670['E'] {
-    arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@672['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@673['E'] {
-    arguments = ArrayList@674[empty]
-    classifier = JavaTypeParameterImpl@675['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@676['E'] {
-    arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@678['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@679['E'] {
-    arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@554['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@681['E'] {
-    arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@633['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@683['E'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@639['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@685['E'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@672['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@687['E'] {
-    arguments = ArrayList@688[empty]
-    classifier = JavaTypeParameterImpl@594['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@689['E'] {
-    arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@576['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@691['E'] {
-    arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@621['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@693['E'] {
-    arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@567['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@695['E'] {
-    arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@630['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@697['E'] {
-    arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@603['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@699['E'] {
-    arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@551['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@701['E'] {
-    arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@615['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@703['E'] {
-    arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@654['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@705['E'] {
-    arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@678['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@707['E'] {
-    arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@582['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@709['E'] {
-    arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@711['E'] {
-    arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@648['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@713['E'] {
-    arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@557['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@715['E'] {
-    arguments = ArrayList@716[empty]
-    classifier = JavaTypeParameterImpl@548['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@717['E'] {
-    arguments = ArrayList@718[empty]
-    classifier = JavaTypeParameterImpl@591['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@719['E'] {
-    arguments = ArrayList@720[empty]
-    classifier = JavaTypeParameterImpl@624['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@721['E'] {
-    arguments = ArrayList@722[empty]
-    classifier = JavaTypeParameterImpl@606['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@723['E'] {
-    arguments = ArrayList@724[empty]
-    classifier = JavaTypeParameterImpl@675['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@725['E'] {
-    arguments = ArrayList@726[empty]
-    classifier = JavaTypeParameterImpl@579['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@727['E'] {
-    arguments = ArrayList@728[empty]
-    classifier = JavaTypeParameterImpl@536['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@729['E'] {
-    arguments = ArrayList@730[empty]
-    classifier = JavaTypeParameterImpl@645['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@731['E'] {
-    arguments = ArrayList@732[empty]
-    classifier = JavaTypeParameterImpl@660['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@733['E'] {
-    arguments = ArrayList@734[empty]
-    classifier = JavaTypeParameterImpl@541['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@735['E'] {
-    arguments = ArrayList@736[empty]
-    classifier = JavaTypeParameterImpl@585['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@737['E'] {
-    arguments = ArrayList@738[empty]
-    classifier = JavaTypeParameterImpl@618['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@739['E'] {
-    arguments = ArrayList@740[empty]
-    classifier = JavaTypeParameterImpl@663['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@741['E'] {
-    arguments = ArrayList@742[empty]
-    classifier = JavaTypeParameterImpl@636['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@743['E'] {
-    arguments = ArrayList@744[empty]
-    classifier = JavaTypeParameterImpl@627['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@745['E'] {
-    arguments = ArrayList@746[empty]
-    classifier = JavaTypeParameterImpl@588['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@747['E'] {
-    arguments = ArrayList@748[empty]
-    classifier = JavaTypeParameterImpl@609['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@749['E'] {
-    arguments = ArrayList@750[empty]
-    classifier = JavaTypeParameterImpl@573['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@751['E'] {
-    arguments = ArrayList@752[empty]
-    classifier = JavaTypeParameterImpl@600['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@753['E'] {
-    arguments = ArrayList@754[empty]
-    classifier = JavaTypeParameterImpl@666['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@755['E'] {
-    arguments = ArrayList@756[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@757['E'] {
-    arguments = ArrayList@758[empty]
-    classifier = JavaTypeParameterImpl@657['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@759['E'] {
-    arguments = ArrayList@760[empty]
-    classifier = JavaTypeParameterImpl@560['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@761['E'] {
-    arguments = ArrayList@762[empty]
-    classifier = JavaTypeParameterImpl@651['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@763['E'] {
-    arguments = ArrayList@764[empty]
-    classifier = JavaTypeParameterImpl@564['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@765['E'] {
-    arguments = ArrayList@766[empty]
-    classifier = JavaTypeParameterImpl@642['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@767['E'] {
-    arguments = ArrayList@768[empty]
-    classifier = JavaTypeParameterImpl@570['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@769['E'] {
-    arguments = ArrayList@770[empty]
-    classifier = JavaTypeParameterImpl@612['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-}
-
-LazyJavaClassifierType@771['E'] {
-    arguments = ArrayList@772[empty]
-    classifier = JavaTypeParameterImpl@669['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@773['Iterator<E>'] {
-    arguments = ArrayList@774[1] { TypeProjectionImpl@775 }
-    classifier = JavaClassImpl@776['Iterator']
-    memberScope = SubstitutingScope@777
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@779['Iterator<E>'] {
-    arguments = ArrayList@780[1] { TypeProjectionImpl@781 }
-    classifier = JavaClassImpl@782['Iterator']
-    memberScope = SubstitutingScope@783
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@784['Iterator<E>'] {
-    arguments = ArrayList@785[1] { TypeProjectionImpl@786 }
-    classifier = JavaClassImpl@787['Iterator']
-    memberScope = SubstitutingScope@788
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@789['Iterator<E>'] {
-    arguments = ArrayList@790[1] { TypeProjectionImpl@791 }
-    classifier = JavaClassImpl@787['Iterator']
-    memberScope = SubstitutingScope@792
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@793
-}
-
-LazyJavaClassifierType@794['Iterator<E>'] {
-    arguments = ArrayList@795[1] { TypeProjectionImpl@796 }
-    classifier = JavaClassImpl@776['Iterator']
-    memberScope = SubstitutingScope@797
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@793
-}
-
-LazyJavaClassifierType@798['Iterator<E>'] {
-    arguments = ArrayList@799[1] { TypeProjectionImpl@800 }
-    classifier = JavaClassImpl@782['Iterator']
-    memberScope = SubstitutingScope@801
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@793
-}
-
-LazyJavaClassifierType@802['List<E>'] {
-    arguments = ArrayList@803[1] { TypeProjectionImpl@804 }
-    classifier = JavaClassImpl@805['List']
-    memberScope = SubstitutingScope@806
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@807
-}
-
-LazyJavaClassifierType@367['List<E>'] {
-    arguments = ArrayList@808[1] { TypeProjectionImpl@809 }
-    classifier = JavaClassImpl@810['List']
-    memberScope = SubstitutingScope@811
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@807
-}
-
-LazyJavaClassifierType@812['List<E>'] {
-    arguments = ArrayList@813[1] { TypeProjectionImpl@814 }
-    classifier = JavaClassImpl@815['List']
-    memberScope = SubstitutingScope@816
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@807
-}
-
-LazyJavaClassifierType@372['List<E>'] {
-    arguments = ArrayList@817[1] { TypeProjectionImpl@818 }
-    classifier = JavaClassImpl@819['List']
-    memberScope = SubstitutingScope@820
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@807
-}
-
-LazyJavaClassifierType@821['List<E>'] {
-    arguments = ArrayList@822[1] { TypeProjectionImpl@823 }
-    classifier = JavaClassImpl@815['List']
-    memberScope = SubstitutingScope@824
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@825
-}
-
-LazyJavaClassifierType@826['List<E>'] {
-    arguments = ArrayList@827[1] { TypeProjectionImpl@828 }
-    classifier = JavaClassImpl@805['List']
-    memberScope = SubstitutingScope@829
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@825
-}
-
-LazyJavaClassifierType@830['ListIterator<E>'] {
-    arguments = ArrayList@831[1] { TypeProjectionImpl@832 }
-    classifier = JavaClassImpl@833['ListIterator']
-    memberScope = SubstitutingScope@834
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@836['ListIterator<E>'] {
-    arguments = ArrayList@837[1] { TypeProjectionImpl@838 }
-    classifier = JavaClassImpl@839['ListIterator']
-    memberScope = SubstitutingScope@840
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@841['ListIterator<E>'] {
-    arguments = ArrayList@842[1] { TypeProjectionImpl@843 }
-    classifier = JavaClassImpl@844['ListIterator']
-    memberScope = SubstitutingScope@845
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@846['ListIterator<E>'] {
-    arguments = ArrayList@847[1] { TypeProjectionImpl@848 }
-    classifier = JavaClassImpl@849['ListIterator']
-    memberScope = SubstitutingScope@850
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@851['ListIterator<E>'] {
-    arguments = ArrayList@852[1] { TypeProjectionImpl@853 }
-    classifier = JavaClassImpl@844['ListIterator']
-    memberScope = SubstitutingScope@854
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@855
-}
-
-LazyJavaClassifierType@856['ListIterator<E>'] {
-    arguments = ArrayList@857[1] { TypeProjectionImpl@858 }
-    classifier = JavaClassImpl@833['ListIterator']
-    memberScope = SubstitutingScope@859
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@855
-}
-
-LazyJavaClassifierType@860['ListIterator<E>'] {
-    arguments = ArrayList@861[1] { TypeProjectionImpl@862 }
-    classifier = JavaClassImpl@839['ListIterator']
-    memberScope = SubstitutingScope@863
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@855
-}
-
-LazyJavaClassifierType@864['ListIterator<E>'] {
-    arguments = ArrayList@865[1] { TypeProjectionImpl@866 }
-    classifier = JavaClassImpl@849['ListIterator']
-    memberScope = SubstitutingScope@867
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@855
-}
-
-LazyJavaClassifierType@868['Object'] {
-    arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@870['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@873['Object'] {
-    arguments = ArrayList@874[empty]
-    classifier = JavaClassImpl@875['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@876['Object'] {
-    arguments = ArrayList@877[empty]
-    classifier = JavaClassImpl@878['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@879['Object'] {
-    arguments = ArrayList@880[empty]
-    classifier = JavaClassImpl@881['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@882['Object'] {
-    arguments = ArrayList@883[empty]
-    classifier = JavaClassImpl@884['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@885['Object'] {
-    arguments = ArrayList@886[empty]
-    classifier = JavaClassImpl@887['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@888['Object'] {
-    arguments = ArrayList@889[empty]
-    classifier = JavaClassImpl@890['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@891['Object'] {
-    arguments = ArrayList@892[empty]
-    classifier = JavaClassImpl@893['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@894['Object'] {
-    arguments = ArrayList@895[empty]
-    classifier = JavaClassImpl@896['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@897['Object'] {
-    arguments = ArrayList@898[empty]
-    classifier = JavaClassImpl@899['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@900['Object'] {
-    arguments = ArrayList@901[empty]
-    classifier = JavaClassImpl@902['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@903['Object'] {
-    arguments = ArrayList@904[empty]
-    classifier = JavaClassImpl@905['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@906['Object'] {
-    arguments = ArrayList@907[empty]
-    classifier = JavaClassImpl@908['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@909['Object'] {
-    arguments = ArrayList@910[empty]
-    classifier = JavaClassImpl@881['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@911['Object'] {
-    arguments = ArrayList@912[empty]
-    classifier = JavaClassImpl@875['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@913['Object'] {
-    arguments = ArrayList@914[empty]
-    classifier = JavaClassImpl@870['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@915['Object'] {
-    arguments = ArrayList@916[empty]
-    classifier = JavaClassImpl@905['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@917['Object'] {
-    arguments = ArrayList@918[empty]
-    classifier = JavaClassImpl@899['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@919['Object'] {
-    arguments = ArrayList@920[empty]
-    classifier = JavaClassImpl@908['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@921['Object'] {
-    arguments = ArrayList@922[empty]
-    classifier = JavaClassImpl@878['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@923['Object'] {
-    arguments = ArrayList@924[empty]
-    classifier = JavaClassImpl@896['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@925['Object'] {
-    arguments = ArrayList@926[empty]
-    classifier = JavaClassImpl@890['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@927['Object'] {
-    arguments = ArrayList@928[empty]
-    classifier = JavaClassImpl@902['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@929['Object'] {
-    arguments = ArrayList@930[empty]
-    classifier = JavaClassImpl@884['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@931['Object'] {
-    arguments = ArrayList@932[empty]
-    classifier = JavaClassImpl@893['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@933['Object'] {
-    arguments = ArrayList@934[empty]
-    classifier = JavaClassImpl@887['Object']
-    memberScope = DeserializedClassMemberScope@871
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@935['Object'] {
-    classifier = JavaClassImpl@936['Object']
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@937['Object'] {
-    classifier = JavaClassImpl@938['Object']
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@939['Object'] {
-    classifier = JavaClassImpl@940['Object']
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@941['Object'] {
-    classifier = JavaClassImpl@942['Object']
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@943['Object'] {
-    classifier = JavaClassImpl@944['Object']
-    typeConstructor = DeserializedClassTypeConstructor@872
-}
-
-LazyJavaClassifierType@945['ObjectInputStream'] {
-    arguments = ArrayList@946[empty]
-    classifier = JavaClassImpl@947['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@948
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@332['ObjectInputStream']
-}
-
-LazyJavaClassifierType@949['ObjectInputStream'] {
-    arguments = ArrayList@950[empty]
-    classifier = JavaClassImpl@947['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@948
-    nullable = 'true': Boolean@407
-    typeConstructor = LazyJavaClassTypeConstructor@332['ObjectInputStream']
-}
-
-LazyJavaClassifierType@951['ObjectOutputStream'] {
-    arguments = ArrayList@952[empty]
-    classifier = JavaClassImpl@953['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@954
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@334['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@955['ObjectOutputStream'] {
-    arguments = ArrayList@956[empty]
-    classifier = JavaClassImpl@953['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@954
-    nullable = 'true': Boolean@407
-    typeConstructor = LazyJavaClassTypeConstructor@334['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@373['RandomAccess'] {
-    arguments = ArrayList@957[empty]
-    classifier = JavaClassImpl@958['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@339
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@347['RandomAccess']
-}
-
-LazyJavaClassifierType@959['Serializable'] {
-    arguments = ArrayList@960[empty]
-    classifier = JavaClassImpl@961['Serializable']
-    memberScope = LazyJavaClassMemberScope@350
-    nullable = 'false': Boolean@396
-    typeConstructor = LazyJavaClassTypeConstructor@358['Serializable']
-}
-
-LazyJavaClassifierType@962['String'] {
-    arguments = ArrayList@963[empty]
-    classifier = JavaClassImpl@964['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@967['String'] {
-    arguments = ArrayList@968[empty]
-    classifier = JavaClassImpl@969['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@970['String'] {
-    arguments = ArrayList@971[empty]
-    classifier = JavaClassImpl@972['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@973['String'] {
-    arguments = ArrayList@974[empty]
-    classifier = JavaClassImpl@969['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@975['String'] {
-    arguments = ArrayList@976[empty]
-    classifier = JavaClassImpl@964['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@977['String'] {
-    arguments = ArrayList@978[empty]
-    classifier = JavaClassImpl@972['String']
-    memberScope = DeserializedClassMemberScope@965
-    nullable = 'true': Boolean@407
-    typeConstructor = DeserializedClassTypeConstructor@966
-}
-
-LazyJavaClassifierType@979['T'] {
-    arguments = ArrayList@980[empty]
-    classifier = JavaTypeParameterImpl@981['T']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
-}
-
-LazyJavaClassifierType@983['T'] {
-    arguments = ArrayList@984[empty]
-    classifier = JavaTypeParameterImpl@985['T']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
-}
-
-LazyJavaClassifierType@987['T'] {
-    arguments = ArrayList@988[empty]
-    classifier = JavaTypeParameterImpl@989['T']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
-}
-
-LazyJavaClassifierType@990['T'] {
-    arguments = ArrayList@991[empty]
-    classifier = JavaTypeParameterImpl@992['T']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
-}
-
-LazyJavaClassifierType@993['T'] {
-    arguments = ArrayList@994[empty]
-    classifier = JavaTypeParameterImpl@989['T']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
-}
-
-LazyJavaClassifierType@995['T'] {
-    arguments = ArrayList@996[empty]
-    classifier = JavaTypeParameterImpl@985['T']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
-}
-
-LazyJavaClassifierType@997['T'] {
-    arguments = ArrayList@998[empty]
-    classifier = JavaTypeParameterImpl@992['T']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
-}
-
-LazyJavaClassifierType@999['T'] {
-    arguments = ArrayList@1000[empty]
-    classifier = JavaTypeParameterImpl@981['T']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
-}
-
-LazyJavaClassifierType@1001['TB'] {
-    arguments = ArrayList@1002[empty]
-    classifier = JavaTypeParameterImpl@1003['TB']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1005['TB'] {
-    arguments = ArrayList@1006[empty]
-    classifier = JavaTypeParameterImpl@1007['TB']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1008['TB'] {
-    arguments = ArrayList@1009[empty]
-    classifier = JavaTypeParameterImpl@1010['TB']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1011['TB'] {
-    arguments = ArrayList@1012[empty]
-    classifier = JavaTypeParameterImpl@1007['TB']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1013['TB'] {
-    arguments = ArrayList@1014[empty]
-    classifier = JavaTypeParameterImpl@1010['TB']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1015['TB'] {
-    arguments = ArrayList@1016[empty]
-    classifier = JavaTypeParameterImpl@1003['TB']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-}
-
-LazyJavaClassifierType@1017['TC'] {
-    arguments = ArrayList@1018[empty]
-    classifier = JavaTypeParameterImpl@1019['TC']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
-}
-
-LazyJavaClassifierType@1021['TC'] {
-    arguments = ArrayList@1022[empty]
-    classifier = JavaTypeParameterImpl@1023['TC']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
-}
-
-LazyJavaClassifierType@1024['TC'] {
-    arguments = ArrayList@1025[empty]
-    classifier = JavaTypeParameterImpl@1019['TC']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
-}
-
-LazyJavaClassifierType@1026['TC'] {
-    arguments = ArrayList@1027[empty]
-    classifier = JavaTypeParameterImpl@1023['TC']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
-}
-
-LazyJavaPackageFragmentProvider@1028 {
-    packageFragments('<root>': FqName@1029) = LazyJavaPackageFragment@1030['<root>']
-    packageFragments('A': FqName@1031) = null
-    packageFragments('AL': FqName@1032) = null
-    packageFragments('C': FqName@1033) = null
-    packageFragments('K': FqName@1034) = null
-    packageFragments('P': FqName@1035) = null
-    packageFragments('TA': FqName@1036) = null
-    packageFragments('java': FqName@1037) = LazyJavaPackageFragment@1038['java']
-    packageFragments('java.io': FqName@1039) = LazyJavaPackageFragment@1040['io']
-    packageFragments('java.lang': FqName@1041) = LazyJavaPackageFragment@1042['lang']
-    packageFragments('java.lang.A': FqName@1043) = null
-    packageFragments('java.lang.C': FqName@1044) = null
-    packageFragments('java.lang.P': FqName@1045) = null
-    packageFragments('java.lang.TA': FqName@1046) = null
-    packageFragments('java.util': FqName@1047) = LazyJavaPackageFragment@1048['util']
-    packageFragments('java.util.ArrayList': FqName@1049) = null
-    packageFragments('kotlin': FqName@1050) = null
-    packageFragments('kotlin.A': FqName@1051) = null
-    packageFragments('kotlin.C': FqName@1052) = null
-    packageFragments('kotlin.P': FqName@1053) = null
-    packageFragments('kotlin.TA': FqName@1054) = null
-    packageFragments('kotlin.io': FqName@1055) = null
-    packageFragments('kotlin.jvm': FqName@1056) = null
-    packageFragments('p': FqName@1057) = LazyJavaPackageFragment@1058['p']
-    packageFragments('p.A': FqName@1059) = null
-    packageFragments('p.C': FqName@1060) = null
-    packageFragments('p.P': FqName@1061) = null
-    packageFragments('p.TA': FqName@1062) = null
-    topLevelClasses(JavaClassImpl@414['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@418['AbstractList']) = LazyJavaClassDescriptor@84['AbstractList']
-    topLevelClasses(JavaClassImpl@1063['ArrayList']) = LazyJavaClassDescriptor@161['ArrayList']
-    topLevelClasses(JavaClassImpl@422['B']) = LazyJavaClassDescriptor@289['B']
-    topLevelClasses(JavaClassImpl@1064['C']) = LazyJavaClassDescriptor@313['C']
-    topLevelClasses(JavaClassImpl@947['ObjectInputStream']) = LazyJavaClassDescriptor@331['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@953['ObjectOutputStream']) = LazyJavaClassDescriptor@333['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@1065['P']) = LazyJavaClassDescriptor@335['P']
-    topLevelClasses(JavaClassImpl@958['RandomAccess']) = LazyJavaClassDescriptor@337['RandomAccess']
-    topLevelClasses(JavaClassImpl@961['Serializable']) = LazyJavaClassDescriptor@348['Serializable']
-}
-
-LazyJavaPackageFragment@1030['<root>'] {
-    classes('C': Name@1066) = null // through LazyPackageFragmentScopeForJavaPackage@1067
-    classes('P': Name@1068) = null // through LazyPackageFragmentScopeForJavaPackage@1067
-    classes('java': Name@1069) = null // through LazyPackageFragmentScopeForJavaPackage@1067
-    classes('p': Name@1070) = null // through LazyPackageFragmentScopeForJavaPackage@1067
-    deserializedPackageScope = Empty@1071 // through LazyPackageFragmentScopeForJavaPackage@1067
-    functions('p': Name@1072) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@1067
-    memberIndex = computeMemberIndex$1@1073 // through LazyPackageFragmentScopeForJavaPackage@1067
-}
-
-LazyJavaPackageFragment@1038['java'] {
-    classes('lang': Name@1074) = null // through LazyPackageFragmentScopeForJavaPackage@1075
-    classes('util': Name@1076) = null // through LazyPackageFragmentScopeForJavaPackage@1075
-    deserializedPackageScope = Empty@1071 // through LazyPackageFragmentScopeForJavaPackage@1075
-    functions('lang': Name@1077) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@1075
-    memberIndex = computeMemberIndex$1@1078 // through LazyPackageFragmentScopeForJavaPackage@1075
-}
-
-LazyJavaPackageFragment@1042['lang'] {
-    classes('java': Name@1069) = null // through LazyPackageFragmentScopeForJavaPackage@1079
-}
-
-LazyJavaPackageFragment@1058['p'] {
-    classes('C': Name@1066) = LazyJavaClassDescriptor@313['C'] // through LazyPackageFragmentScopeForJavaPackage@1080
-    classes('P': Name@1068) = LazyJavaClassDescriptor@335['P'] // through LazyPackageFragmentScopeForJavaPackage@1080
-    classes('java': Name@1069) = null // through LazyPackageFragmentScopeForJavaPackage@1080
-}
-
-LazyJavaPackageFragment@1048['util'] {
-    classes('ArrayList': Name@1081) = LazyJavaClassDescriptor@161['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1082
-}
-
-LazyJavaTypeParameterDescriptor@364['E'] {
-    defaultType = JetTypeImpl@1083['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-    upperBounds = LinkedHashSet@1084[1] { NullableType@1085 }
-    upperBoundsAsType = NullableType@1085
-}
-
-LazyJavaTypeParameterDescriptor@369['E'] {
-    defaultType = JetTypeImpl@1086['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@561
-    upperBounds = LinkedHashSet@1087[1] { NullableType@1088 }
-    upperBoundsAsType = NullableType@1088
-}
-
-LazyJavaTypeParameterDescriptor@360['E'] {
-    defaultType = JetTypeImpl@1089['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-    upperBounds = LinkedHashSet@1090[1] { NullableType@1091 }
-    upperBoundsAsType = NullableType@1091
-}
-
-LazyJavaTypeParameterDescriptor@1092['T'] {
-    defaultType = JetTypeImpl@1093['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
-    upperBounds = LinkedHashSet@1094[1] { NullableType@1095 }
-    upperBoundsAsType = NullableType@1095
-}
-
-LazyJavaTypeParameterDescriptor@1096['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
-    upperBounds = LinkedHashSet@1097[1] { NullableType@1098 }
-    upperBoundsAsType = NullableType@1098
-}
-
-LazyJavaTypeParameterDescriptor@375['TB'] {
-    defaultType = JetTypeImpl@1099['TB']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
-    upperBounds = LinkedHashSet@1100[1] { NullableType@1101 }
-}
-
-LazyJavaTypeParameterDescriptor@379['TC'] {
-    defaultType = JetTypeImpl@1102['TC']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1020
-    upperBounds = LinkedHashSet@1103[1] { NullableType@1104 }
-}
-
-LazyJavaTypeParameterResolver@1105 {
-    resolve(JavaTypeParameterImpl@1106['E']) = LazyJavaTypeParameterDescriptor@360['E']
-}
-
-LazyJavaTypeParameterResolver@1107 {
-    resolve(JavaTypeParameterImpl@1108['E']) = LazyJavaTypeParameterDescriptor@364['E']
-}
-
-LazyJavaTypeParameterResolver@1109 {
-    resolve(JavaTypeParameterImpl@1110['E']) = LazyJavaTypeParameterDescriptor@369['E']
-}
-
-LazyJavaTypeParameterResolver@1111 {
-    resolve(JavaTypeParameterImpl@606['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1112 {
-    resolve(JavaTypeParameterImpl@597['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1113 {
-    resolve(JavaTypeParameterImpl@675['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1114 {
-    resolve(JavaTypeParameterImpl@567['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1115 {
-    resolve(JavaTypeParameterImpl@660['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1116 {
-    resolve(JavaTypeParameterImpl@603['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1117 {
-    resolve(JavaTypeParameterImpl@557['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1118 {
-    resolve(JavaTypeParameterImpl@594['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1119 {
-    resolve(JavaTypeParameterImpl@591['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1120 {
-    resolve(JavaTypeParameterImpl@645['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1121 {
-    resolve(JavaTypeParameterImpl@570['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1122 {
-    resolve(JavaTypeParameterImpl@573['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1123 {
-    resolve(JavaTypeParameterImpl@612['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1124 {
-    resolve(JavaTypeParameterImpl@651['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1125 {
-    resolve(JavaTypeParameterImpl@621['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1126 {
-    resolve(JavaTypeParameterImpl@576['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1127 {
-    resolve(JavaTypeParameterImpl@633['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1128 {
-    resolve(JavaTypeParameterImpl@545['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1129 {
-    resolve(JavaTypeParameterImpl@636['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1130 {
-    resolve(JavaTypeParameterImpl@588['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1131 {
-    resolve(JavaTypeParameterImpl@639['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1132 {
-    resolve(JavaTypeParameterImpl@609['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1133 {
-    resolve(JavaTypeParameterImpl@648['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1134 {
-    resolve(JavaTypeParameterImpl@672['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1135 {
-    resolve(JavaTypeParameterImpl@657['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1136 {
-    resolve(JavaTypeParameterImpl@1137['T']) = LazyJavaTypeParameterDescriptor@1096['T']
-}
-
-LazyJavaTypeParameterResolver@1138 {
-    resolve(JavaTypeParameterImpl@1139['T']) = LazyJavaTypeParameterDescriptor@1092['T']
-}
-
-LazyJavaTypeParameterResolver@1140 {
-    resolve(JavaTypeParameterImpl@1141['TB']) = LazyJavaTypeParameterDescriptor@375['TB']
-}
-
-LazyJavaTypeParameterResolver@1142 {
-    resolve(JavaTypeParameterImpl@1003['TB']) = null
-}
-
-LazyJavaTypeParameterResolver@1143 {
-    resolve(JavaTypeParameterImpl@1144['TC']) = LazyJavaTypeParameterDescriptor@379['TC']
-}
-
-ResolutionTaskHolder@1145 {
-    <name not found> = ArrayList@1146[1] { ResolutionCandidate@1147 }
-}
-
-ResolutionTaskHolder@1148 {
-    <name not found> = ArrayList@1149[3] { ResolutionCandidate@1150, ResolutionCandidate@1151, ResolutionCandidate@1152 }
-}
-
-null {
-    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1147 }
-    <name not found> = ArrayList@1154[3] { ResolutionCandidate@1150, ResolutionCandidate@1151, ResolutionCandidate@1152 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log b/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
deleted file mode 100644
index 6c7f124d41d..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
+++ /dev/null
@@ -1,196 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    defaultType = JetTypeImpl@1['A']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@5) = ArrayList@6[1] { DeserializedSimpleFunctionDescriptor@7['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('foo': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['foo'] } // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toString': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['toString'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['A']
-}
-
-LazyJavaClassDescriptor@25['B'] {
-    defaultType = JetTypeImpl@26['B']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('equals': Name@5) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['equals'] } // through LazyJavaClassMemberScope@27
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('foo': Name@30) = ArrayList@31[1] { JavaMethodDescriptor@32['foo'] } // through LazyJavaClassMemberScope@27
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('hashCode': Name@13) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@34['hashCode'] } // through LazyJavaClassMemberScope@27
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('toString': Name@18) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@27
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['B']
-}
-
-LazyJavaClassDescriptor@40['C'] {
-    allDescriptors = ArrayList@41[4] { DeserializedSimpleFunctionDescriptor@42['hashCode'], JavaMethodDescriptor@43['foo'], DeserializedSimpleFunctionDescriptor@44['toString'], ... } // through LazyJavaClassMemberScope@45
-    constructors = ArrayList@46[1] { JavaConstructorDescriptor@47['<init>'] } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@48['C']
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@45
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    functions('equals': Name@5) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@51['equals'] } // through LazyJavaClassMemberScope@45
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    functions('foo': Name@30) = ArrayList@52[1] { JavaMethodDescriptor@43['foo'] } // through LazyJavaClassMemberScope@45
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    functions('hashCode': Name@13) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@42['hashCode'] } // through LazyJavaClassMemberScope@45
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    functions('toString': Name@18) = ArrayList@54[1] { DeserializedSimpleFunctionDescriptor@44['toString'] } // through LazyJavaClassMemberScope@45
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@45
-    nestedClassIndex = LinkedHashMap@56 // through LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@57['C']
-}
-
-LazyJavaClassTypeConstructor@24['A'] {
-    parameters = ArrayList@58[empty]
-    supertypes = ArrayList@59[1] { JetTypeImpl@60['Any'] }
-}
-
-LazyJavaClassTypeConstructor@39['B'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['A'] }
-}
-
-LazyJavaClassTypeConstructor@57['C'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[2] { LazyJavaClassifierType@66['B'], LazyJavaClassifierType@67['A'] }
-}
-
-LazyJavaClassifierType@67['A'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['A']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@70
-    typeConstructor = LazyJavaClassTypeConstructor@24['A']
-}
-
-LazyJavaClassifierType@63['A'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['A']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@70
-    typeConstructor = LazyJavaClassTypeConstructor@24['A']
-}
-
-LazyJavaClassifierType@66['B'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['B']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@70
-    typeConstructor = LazyJavaClassTypeConstructor@39['B']
-}
-
-LazyJavaClassifierType@75['Object'] {
-    classifier = JavaClassImpl@76['Object']
-    typeConstructor = DeserializedClassTypeConstructor@77
-}
-
-LazyJavaClassifierType@78['Object'] {
-    classifier = JavaClassImpl@79['Object']
-    typeConstructor = DeserializedClassTypeConstructor@77
-}
-
-LazyJavaClassifierType@80['TA'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['TA']
-    nullable = 'false': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@84['TA'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@82['TA']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@87['TB'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['TB']
-    nullable = 'false': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@91['TB'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@89['TB']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaPackageFragmentProvider@93 {
-    packageFragments('<root>': FqName@94) = LazyJavaPackageFragment@95['<root>']
-    packageFragments('C': FqName@96) = null
-    packageFragments('K': FqName@97) = null
-    packageFragments('java': FqName@98) = LazyJavaPackageFragment@99['java']
-    packageFragments('java.lang': FqName@100) = LazyJavaPackageFragment@101['lang']
-    packageFragments('java.lang.C': FqName@102) = null
-    packageFragments('kotlin': FqName@103) = null
-    packageFragments('kotlin.C': FqName@104) = null
-    packageFragments('kotlin.io': FqName@105) = null
-    packageFragments('kotlin.jvm': FqName@106) = null
-    packageFragments('p': FqName@107) = LazyJavaPackageFragment@108['p']
-    packageFragments('p.C': FqName@109) = null
-    topLevelClasses(JavaClassImpl@69['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@74['B']) = LazyJavaClassDescriptor@25['B']
-    topLevelClasses(JavaClassImpl@110['C']) = LazyJavaClassDescriptor@40['C']
-}
-
-LazyJavaPackageFragment@95['<root>'] {
-    classes('C': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('p': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@114 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('p': Name@115) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@99['java'] {
-    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@114 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('lang': Name@119) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-LazyJavaPackageFragment@108['p'] {
-    classes('C': Name@111) = LazyJavaClassDescriptor@40['C'] // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaTypeParameterDescriptor@122['TA'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@123[1] { NullableType@124 }
-    upperBoundsAsType = NullableType@124
-}
-
-LazyJavaTypeParameterDescriptor@125['TB'] {
-    defaultType = JetTypeImpl@126['TB']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-    upperBounds = LinkedHashSet@127[1] { NullableType@128 }
-    upperBoundsAsType = NullableType@128
-}
-
-LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['TA']) = LazyJavaTypeParameterDescriptor@122['TA']
-}
-
-LazyJavaTypeParameterResolver@131 {
-    resolve(JavaTypeParameterImpl@132['TB']) = LazyJavaTypeParameterDescriptor@125['TB']
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@135 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log b/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
deleted file mode 100644
index ac4926527be..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-LazyJavaClassDescriptor@0['J1'] {
-    allDescriptors = ArrayList@1[5] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['baz'], SimpleFunctionDescriptorImpl@4['foo'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['J1']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('baz': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@3['baz'] } // through LazyJavaClassMemberScope@5
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@18) = ArrayList@19[1] { SimpleFunctionDescriptorImpl@4['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@20) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['J1']
-}
-
-LazyJavaClassTypeConstructor@32['J1'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['KFirst'] }
-}
-
-LazyJavaClassifierType@35['KFirst'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['KFirst']
-    memberScope = WritableScopeImpl@38
-    nullable = 'false': Boolean@39
-    typeConstructor = TypeConstructorImpl$1@40
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('J1': FqName@44) = null
-    packageFragments('K2': FqName@45) = null
-    packageFragments('KFirst': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.J1': FqName@51) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.J1': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    topLevelClasses(JavaClassImpl@56['J1']) = LazyJavaClassDescriptor@0['J1']
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('J1': Name@57) = LazyJavaClassDescriptor@0['J1'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('baz': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('baz': Name@59) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foo': Name@60) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@65) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    classes('baz': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('baz': Name@59) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('foo': Name@60) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
deleted file mode 100644
index 682d1a344cc..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-LazyJavaClassDescriptor@0['J1'] {
-    allDescriptors = ArrayList@1[5] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['baz'], SimpleFunctionDescriptorImpl@4['foo'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['J1']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('baz': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@3['baz'] } // through LazyJavaClassMemberScope@5
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@18) = ArrayList@19[1] { SimpleFunctionDescriptorImpl@4['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@20) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['J1']
-}
-
-LazyJavaClassDescriptor@33['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
-}
-
-LazyJavaClassTypeConstructor@32['J1'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { LazyJavaClassifierType@37['KFirst<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@34['Serializable'] {
-    parameters = ArrayList@38[empty]
-}
-
-LazyJavaClassifierType@39['Integer'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Integer']
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@44['Integer'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Integer']
-    nullable = 'true': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@37['KFirst<Integer>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@49['KFirst']
-    memberScope = SubstitutingScope@50
-    nullable = 'false': Boolean@42
-    typeConstructor = TypeConstructorImpl$1@51
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('J1': FqName@55) = null
-    packageFragments('K2': FqName@56) = null
-    packageFragments('KFirst': FqName@57) = null
-    packageFragments('T': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.io': FqName@61) = LazyJavaPackageFragment@62['io']
-    packageFragments('java.io.Serializable': FqName@63) = null
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.J1': FqName@66) = null
-    packageFragments('java.lang.T': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.J1': FqName@69) = null
-    packageFragments('kotlin.T': FqName@70) = null
-    packageFragments('kotlin.io': FqName@71) = null
-    packageFragments('kotlin.jvm': FqName@72) = null
-    topLevelClasses(JavaClassImpl@73['J1']) = LazyJavaClassDescriptor@0['J1']
-    topLevelClasses(JavaClassImpl@74['Serializable']) = LazyJavaClassDescriptor@33['Serializable']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('J1': Name@75) = LazyJavaClassDescriptor@0['J1'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('baz': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('java': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('baz': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('foo': Name@78) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@62['io'] {
-    classes('Serializable': Name@82) = LazyJavaClassDescriptor@33['Serializable'] // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('io': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@87) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('baz': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('java': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('baz': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@78) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
deleted file mode 100644
index 4870d605db4..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaClassDescriptor@2['Aaa'] {
-    allDescriptors = ArrayList@3[4] { DeserializedSimpleFunctionDescriptor@4['hashCode'], JavaMethodDescriptor@5['foo'], DeserializedSimpleFunctionDescriptor@6['toString'], ... } // through LazyJavaClassMemberScope@7
-    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@10['Aaa']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('foo': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@5['foo'] } // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@20) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@4['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('notify': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@6['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@27) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['Aaa']
-}
-
-LazyJavaClassTypeConstructor@31['Aaa'] {
-    parameters = ArrayList@32[empty]
-    supertypes = ArrayList@33[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassifierType@35['Object'] {
-    classifier = JavaClassImpl@36['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['String']
-    nullable = 'false': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['String']
-    nullable = 'true': Boolean@45
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@47) = LazyJavaPackageFragment@48['<root>']
-    packageFragments('Aaa': FqName@49) = null
-    packageFragments('Bbb': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.Aaa': FqName@56) = null
-    packageFragments('java.lang.String': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.Aaa': FqName@59) = null
-    packageFragments('kotlin.String': FqName@60) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    topLevelClasses(JavaClassImpl@63['Aaa']) = LazyJavaClassDescriptor@2['Aaa']
-}
-
-LazyJavaPackageFragment@48['<root>'] {
-    classes('Aaa': Name@64) = LazyJavaClassDescriptor@2['Aaa'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('String': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Unit': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('lang': Name@71) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@55['lang'] {
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log b/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
deleted file mode 100644
index 12fd5fde257..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaClassDescriptor@2['A'] {
-    defaultType = JetTypeImpl@3['A']
-    enumEntryIndex = LinkedHashMap@4 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = null
-    functions('f': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['f'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@5
-    nestedClasses('f': Name@6) = null // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassTypeConstructor@12['A'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('A': FqName@22) = null
-    packageFragments('aa': FqName@23) = LazyJavaPackageFragment@24['aa']
-    packageFragments('aa.A': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.A': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.A': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    topLevelClasses(JavaClassImpl@35['A']) = LazyJavaClassDescriptor@2['A']
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('A': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('aa': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('aa': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@24['aa'] {
-    classes('A': Name@43) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@56 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log b/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
deleted file mode 100644
index 510ae4218bd..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NotNullType@1
-}
-
-LazyJavaClassDescriptor@2['Aaa'] {
-    memberIndex = computeMemberIndex$1@3 // through LazyJavaClassMemberScope@4
-    properties('i': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@4
-    typeConstructor = LazyJavaClassTypeConstructor@7['Aaa']
-}
-
-LazyJavaClassDescriptor@8['Bbb'] {
-    <name not found> = StringValue@9 // through LazyJavaStaticClassScope@10
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@12
-    nestedClasses('i': Name@5) = null // through LazyJavaClassMemberScope@12
-    properties('i': Name@5) = ArrayList@16[1] { JavaPropertyDescriptor@17['i'] } // through LazyJavaStaticClassScope@10
-    properties('i': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@18['Bbb']
-}
-
-LazyJavaClassTypeConstructor@7['Aaa'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassTypeConstructor@18['Bbb'] {
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Aaa'] }
-}
-
-LazyJavaClassifierType@23['Aaa'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['Aaa']
-    memberScope = LazyJavaClassMemberScope@4
-    typeConstructor = LazyJavaClassTypeConstructor@7['Aaa']
-}
-
-LazyJavaClassifierType@26['Object'] {
-    classifier = JavaClassImpl@27['Object']
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['String']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('Bbb': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.Bbb': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Bbb': FqName@43) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    topLevelClasses(JavaClassImpl@25['Aaa']) = LazyJavaClassDescriptor@2['Aaa']
-    topLevelClasses(JavaClassImpl@46['Bbb']) = LazyJavaClassDescriptor@8['Bbb']
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('Bbb': Name@47) = LazyJavaClassDescriptor@8['Bbb'] // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@40['lang'] {
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaTypeAttributes@55 {
-    howThisTypeIsUsedAccordingToAnnotations$delegate = TypeUsage@56
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
deleted file mode 100644
index e7c72bb57fc..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-SpecialTypes.lazy.log
+++ /dev/null
@@ -1,171 +0,0 @@
-LazyJavaClassDescriptor@0['X'] {
-    defaultType = JetTypeImpl@1['X<1>']
-    functions('barN': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['barN'] } // through LazyJavaClassMemberScope@5
-    functions('fooN': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['fooN'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['X']
-}
-
-LazyJavaClassDescriptor@12['Y'] {
-    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['Y']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('barN': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['barN'] } // through LazyJavaClassMemberScope@15
-    functions('fooN': Name@6) = ArrayList@20[1] { JavaMethodDescriptor@21['fooN'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@15
-    nestedClasses('barN': Name@2) = null // through LazyJavaClassMemberScope@15
-    nestedClasses('fooN': Name@6) = null // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@24['Y']
-}
-
-LazyJavaClassTypeConstructor@11['X'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['T'] }
-    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['Y'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['X<String>'] }
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'false': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@43['T'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaTypeParameterImpl@45['T']
-    nullable = 'false': Boolean@38
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@47['T'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@49['T']
-    nullable = 'false': Boolean@38
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@50['T'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@49['T']
-    nullable = 'true': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@52['T'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@45['T']
-    nullable = 'true': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@31['X<String>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@56['X']
-    memberScope = SubstitutingScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@11['X']
-}
-
-LazyJavaPackageFragmentProvider@58 {
-    packageFragments('<root>': FqName@59) = LazyJavaPackageFragment@60['<root>']
-    packageFragments('Any': FqName@61) = null
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.Any': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Any': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@56['X']) = LazyJavaClassDescriptor@0['X']
-    topLevelClasses(JavaClassImpl@71['Y']) = LazyJavaClassDescriptor@12['Y']
-}
-
-LazyJavaPackageFragment@60['<root>'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Y': Name@74) = LazyJavaClassDescriptor@12['Y'] // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Y': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('Y': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Y': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaTypeParameterDescriptor@26['T'] {
-    defaultType = JetTypeImpl@84['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-    upperBounds = LinkedHashSet@85[1] { NullableType@86 }
-}
-
-LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@88['T']) = LazyJavaTypeParameterDescriptor@26['T']
-}
-
-LazyJavaTypeParameterResolver@89 {
-    resolve(JavaTypeParameterImpl@45['T']) = null
-}
-
-LazyJavaTypeParameterResolver@90 {
-    resolve(JavaTypeParameterImpl@49['T']) = null
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-    <name not found> = EmptyList@76[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
deleted file mode 100644
index 2a14de7deec..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-NotNull-UserTypes.lazy.log
+++ /dev/null
@@ -1,186 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassDescriptor@2['X'] {
-    defaultType = JetTypeImpl@3['X<1>']
-    functions('barN': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['barN'] } // through LazyJavaClassMemberScope@7
-    functions('fooN': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['fooN'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['X']
-}
-
-LazyJavaClassDescriptor@14['Y'] {
-    constructors = ArrayList@15[1] { JavaConstructorDescriptor@16['<init>'] } // through LazyJavaClassMemberScope@17
-    defaultType = JetTypeImpl@18['Y']
-    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@17
-    functionTypeForSamInterface = null
-    functions('barN': Name@4) = ArrayList@20[1] { JavaMethodDescriptor@21['barN'] } // through LazyJavaClassMemberScope@17
-    functions('fooN': Name@8) = ArrayList@22[1] { JavaMethodDescriptor@23['fooN'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@17
-    nestedClassIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@17
-    nestedClasses('barN': Name@4) = null // through LazyJavaClassMemberScope@17
-    nestedClasses('fooN': Name@8) = null // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@26['Y']
-}
-
-LazyJavaClassTypeConstructor@1['A'] {
-    parameters = ArrayList@27[empty]
-    supertypes = ArrayList@28[1] { JetTypeImpl@29['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['X'] {
-    parameters = ArrayList@30[1] { LazyJavaTypeParameterDescriptor@31['T'] }
-    supertypes = ArrayList@32[1] { JetTypeImpl@29['Any'] }
-}
-
-LazyJavaClassTypeConstructor@26['Y'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['X<A>'] }
-}
-
-LazyJavaClassifierType@36['A'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['A']
-    nullable = 'false': Boolean@39
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@40['A'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@38['A']
-    nullable = 'true': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@43['Object'] {
-    classifier = JavaClassImpl@44['Object']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Object'] {
-    classifier = JavaClassImpl@47['Object']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@48['T'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
-}
-
-LazyJavaClassifierType@52['T'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@54['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
-}
-
-LazyJavaClassifierType@55['T'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'true': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
-}
-
-LazyJavaClassifierType@57['T'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@54['T']
-    nullable = 'true': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
-}
-
-LazyJavaClassifierType@35['X<A>'] {
-    arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
-    classifier = JavaClassImpl@61['X']
-    memberScope = SubstitutingScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@13['X']
-}
-
-LazyJavaPackageFragmentProvider@63 {
-    packageFragments('<root>': FqName@64) = LazyJavaPackageFragment@65['<root>']
-    packageFragments('Any': FqName@66) = null
-    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    packageFragments('java.lang.Any': FqName@71) = null
-    packageFragments('kotlin': FqName@72) = null
-    packageFragments('kotlin.Any': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    topLevelClasses(JavaClassImpl@38['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@61['X']) = LazyJavaClassDescriptor@2['X']
-    topLevelClasses(JavaClassImpl@76['Y']) = LazyJavaClassDescriptor@14['Y']
-}
-
-LazyJavaPackageFragment@65['<root>'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Y': Name@79) = LazyJavaClassDescriptor@14['Y'] // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Y': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@68['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@70['lang'] {
-    classes('Y': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Y': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaTypeParameterDescriptor@31['T'] {
-    defaultType = JetTypeImpl@89['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
-    upperBounds = LinkedHashSet@90[1] { NullableType@91 }
-}
-
-LazyJavaTypeParameterResolver@92 {
-    resolve(JavaTypeParameterImpl@93['T']) = LazyJavaTypeParameterDescriptor@31['T']
-}
-
-LazyJavaTypeParameterResolver@94 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
-}
-
-LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@54['T']) = null
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-null {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
deleted file mode 100644
index b50e3e91080..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
+++ /dev/null
@@ -1,173 +0,0 @@
-LazyJavaClassDescriptor@0['X'] {
-    defaultType = JetTypeImpl@1['X<1>']
-    functions('bar': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['bar'] } // through LazyJavaClassMemberScope@5
-    functions('foo': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['foo'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['X']
-}
-
-LazyJavaClassDescriptor@12['Y'] {
-    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['Y']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('bar': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['bar'] } // through LazyJavaClassMemberScope@15
-    functions('foo': Name@6) = ArrayList@20[1] { JavaMethodDescriptor@21['foo'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@15
-    nestedClasses('bar': Name@2) = null // through LazyJavaClassMemberScope@15
-    nestedClasses('foo': Name@6) = null // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@24['Y']
-}
-
-LazyJavaClassTypeConstructor@11['X'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['T'] }
-    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['Y'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['X<String>'] }
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    memberScope = DeserializedClassMemberScope@38
-    nullable = 'false': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@41['String'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@43
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@44['T'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
-}
-
-LazyJavaClassifierType@48['T'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
-}
-
-LazyJavaClassifierType@51['T'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaTypeParameterImpl@46['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
-}
-
-LazyJavaClassifierType@53['T'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
-}
-
-LazyJavaClassifierType@31['X<String>'] {
-    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
-    classifier = JavaClassImpl@57['X']
-    memberScope = SubstitutingScope@58
-    typeConstructor = LazyJavaClassTypeConstructor@11['X']
-}
-
-LazyJavaPackageFragmentProvider@59 {
-    packageFragments('<root>': FqName@60) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    topLevelClasses(JavaClassImpl@57['X']) = LazyJavaClassDescriptor@0['X']
-    topLevelClasses(JavaClassImpl@69['Y']) = LazyJavaClassDescriptor@12['Y']
-}
-
-LazyJavaPackageFragment@61['<root>'] {
-    classes('Y': Name@70) = LazyJavaClassDescriptor@12['Y'] // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Y': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('Y': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Y': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaTypeParameterDescriptor@26['T'] {
-    defaultType = JetTypeImpl@81['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
-    upperBounds = LinkedHashSet@82[1] { NullableType@83 }
-}
-
-LazyJavaTypeParameterResolver@84 {
-    resolve(JavaTypeParameterImpl@85['T']) = LazyJavaTypeParameterDescriptor@26['T']
-}
-
-LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@46['T']) = null
-}
-
-LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
deleted file mode 100644
index 91b2d777691..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
+++ /dev/null
@@ -1,193 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('hashCode': Name@3) = ArrayList@4[1] { DeserializedSimpleFunctionDescriptor@5['hashCode'] } // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@2
-    nestedClassIndex = LinkedHashMap@7 // through LazyJavaClassMemberScope@2
-    nestedClasses('hashCode': Name@3) = null // through LazyJavaClassMemberScope@2
-    typeConstructor = LazyJavaClassTypeConstructor@8['A']
-}
-
-LazyJavaClassDescriptor@9['X'] {
-    defaultType = JetTypeImpl@10['X<1>']
-    functions('bar': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['bar'] } // through LazyJavaClassMemberScope@14
-    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['foo'] } // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@14
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['X']
-}
-
-LazyJavaClassDescriptor@21['Y'] {
-    constructors = ArrayList@22[1] { JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
-    defaultType = JetTypeImpl@25['Y']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
-    functionTypeForSamInterface = null
-    functions('bar': Name@11) = ArrayList@27[1] { JavaMethodDescriptor@28['bar'] } // through LazyJavaClassMemberScope@24
-    functions('foo': Name@15) = ArrayList@29[1] { JavaMethodDescriptor@30['foo'] } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
-    nestedClasses('bar': Name@11) = null // through LazyJavaClassMemberScope@24
-    nestedClasses('foo': Name@15) = null // through LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@33['Y']
-}
-
-LazyJavaClassTypeConstructor@8['A'] {
-    parameters = ArrayList@34[empty]
-    supertypes = ArrayList@35[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['X'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['T'] }
-    supertypes = ArrayList@39[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@33['Y'] {
-    parameters = ArrayList@40[empty]
-    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['X<A>'] }
-}
-
-LazyJavaClassifierType@43['A'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['A']
-    memberScope = LazyJavaClassMemberScope@2
-    nullable = 'false': Boolean@46
-    typeConstructor = LazyJavaClassTypeConstructor@8['A']
-}
-
-LazyJavaClassifierType@47['A'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@45['A']
-    nullable = 'true': Boolean@49
-    typeConstructor = LazyJavaClassTypeConstructor@8['A']
-}
-
-LazyJavaClassifierType@50['Object'] {
-    classifier = JavaClassImpl@51['Object']
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@53['Object'] {
-    classifier = JavaClassImpl@54['Object']
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@55['T'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['T']
-    nullable = 'false': Boolean@46
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@59['T'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['T']
-    nullable = 'false': Boolean@46
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@62['T'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@61['T']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@64['T'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@57['T']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@42['X<A>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@68['X']
-    memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@20['X']
-}
-
-LazyJavaPackageFragmentProvider@70 {
-    packageFragments('<root>': FqName@71) = LazyJavaPackageFragment@72['<root>']
-    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
-    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
-    packageFragments('kotlin': FqName@77) = null
-    packageFragments('kotlin.io': FqName@78) = null
-    packageFragments('kotlin.jvm': FqName@79) = null
-    topLevelClasses(JavaClassImpl@45['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@68['X']) = LazyJavaClassDescriptor@9['X']
-    topLevelClasses(JavaClassImpl@80['Y']) = LazyJavaClassDescriptor@21['Y']
-}
-
-LazyJavaPackageFragment@72['<root>'] {
-    classes('Y': Name@81) = LazyJavaClassDescriptor@21['Y'] // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Y': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@76['lang'] {
-    classes('Y': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Y': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaTypeParameterDescriptor@38['T'] {
-    defaultType = JetTypeImpl@92['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-    upperBounds = LinkedHashSet@93[1] { NullableType@94 }
-}
-
-LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@38['T']
-}
-
-LazyJavaTypeParameterResolver@97 {
-    resolve(JavaTypeParameterImpl@57['T']) = null
-}
-
-LazyJavaTypeParameterResolver@98 {
-    resolve(JavaTypeParameterImpl@61['T']) = null
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
deleted file mode 100644
index 12d0395e57e..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
+++ /dev/null
@@ -1,122 +0,0 @@
-LazyJavaClassDescriptor@0['Test'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['Test<1>']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('t': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['t'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('t': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['Test']
-}
-
-LazyJavaClassTypeConstructor@12['Test'] {
-    parameters = ArrayList@13[1] { LazyJavaTypeParameterDescriptor@14['T'] }
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
-}
-
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['T'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaTypeParameterImpl@22['T']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-}
-
-LazyJavaClassifierType@25['T'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaTypeParameterImpl@22['T']
-    nullable = 'true': Boolean@27
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Int': FqName@31) = null
-    packageFragments('a': FqName@32) = LazyJavaPackageFragment@33['a']
-    packageFragments('a.Int': FqName@34) = null
-    packageFragments('a.a': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.Int': FqName@40) = null
-    packageFragments('kotlin': FqName@41) = null
-    packageFragments('kotlin.Int': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    topLevelClasses(JavaClassImpl@45['Test']) = LazyJavaClassDescriptor@0['Test']
-}
-
-LazyJavaPackageFragment@33['a'] {
-    classes('Int': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Test': Name@48) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('Test': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaTypeParameterDescriptor@14['T'] {
-    defaultType = JetTypeImpl@58['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@59[1] { NullableType@60 }
-}
-
-LazyJavaTypeParameterResolver@61 {
-    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@14['T']
-}
-
-LazyJavaTypeParameterResolver@63 {
-    resolve(JavaTypeParameterImpl@22['T']) = null
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@78[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.lazy.log b/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.lazy.log
deleted file mode 100644
index 53b8ad7db0d..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/accessClassObjectFromJava.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
deleted file mode 100644
index 17f3afc8c8a..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
+++ /dev/null
@@ -1,224 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('foo': Name@3) = ArrayList@4[4] { JavaMethodDescriptor@5['foo'], SamAdapterFunctionDescriptor@6['foo'], JavaMethodDescriptor@7['foo'], ... } // through LazyJavaStaticClassScope@8
-    functions('foo': Name@3) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@2
-    nestedClasses('foo': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('foo': Name@3) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2
-    properties('foo': Name@3) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@13['A']
-}
-
-LazyJavaClassDescriptor@14['AutoCloseable'] {
-    defaultType = JetTypeImpl@15['AutoCloseable']
-    functions('close': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['close'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@23['Closeable'] {
-    defaultType = JetTypeImpl@24['Closeable']
-    functionTypeForSamInterface = JetTypeImpl@25['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@26['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassDescriptor@28['Runnable'] {
-    allDescriptors = ArrayList@29[4] { DeserializedSimpleFunctionDescriptor@30['hashCode'], DeserializedSimpleFunctionDescriptor@31['toString'], JavaMethodDescriptor@32['run'], ... } // through LazyJavaClassMemberScope@33
-    annotations = LazyJavaAnnotations@34
-    constructors = stdlib_emptyListClass@35[empty] // through LazyJavaClassMemberScope@33
-    defaultType = JetTypeImpl@36['Runnable']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@33
-    functionTypeForSamInterface = JetTypeImpl@38['Function0<1>']
-    functions('clone': Name@39) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    functions('equals': Name@40) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['equals'] } // through LazyJavaClassMemberScope@33
-    functions('finalize': Name@43) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    functions('getClass': Name@44) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    functions('hashCode': Name@45) = ArrayList@46[1] { DeserializedSimpleFunctionDescriptor@30['hashCode'] } // through LazyJavaClassMemberScope@33
-    functions('notify': Name@47) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    functions('notifyAll': Name@48) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    functions('run': Name@49) = ArrayList@50[1] { JavaMethodDescriptor@32['run'] } // through LazyJavaClassMemberScope@33
-    functions('toString': Name@51) = ArrayList@52[1] { DeserializedSimpleFunctionDescriptor@31['toString'] } // through LazyJavaClassMemberScope@33
-    functions('wait': Name@53) = EmptyList@9[empty] // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@33
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@33
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@56['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@57['Runnable']
-}
-
-LazyJavaClassTypeConstructor@13['A'] {
-    supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
-}
-
-LazyJavaClassTypeConstructor@22['AutoCloseable'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { JetTypeImpl@59['Any'] }
-}
-
-LazyJavaClassTypeConstructor@27['Closeable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { LazyJavaClassifierType@64['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@57['Runnable'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { JetTypeImpl@59['Any'] }
-}
-
-LazyJavaClassifierType@64['AutoCloseable'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@22['AutoCloseable']
-}
-
-LazyJavaClassifierType@69['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    nullable = 'false': Boolean@72
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@73['Closeable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    nullable = 'true': Boolean@75
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@76['Object'] {
-    classifier = JavaClassImpl@77['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@79['Object'] {
-    classifier = JavaClassImpl@80['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@83['Runnable'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['Runnable']
-    nullable = 'false': Boolean@72
-    typeConstructor = LazyJavaClassTypeConstructor@57['Runnable']
-}
-
-LazyJavaClassifierType@86['Runnable'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@85['Runnable']
-    nullable = 'true': Boolean@75
-    typeConstructor = LazyJavaClassTypeConstructor@57['Runnable']
-}
-
-LazyJavaPackageFragmentProvider@88 {
-    packageFragments('<root>': FqName@89) = LazyJavaPackageFragment@90['<root>']
-    packageFragments('A': FqName@91) = null
-    packageFragments('java': FqName@92) = LazyJavaPackageFragment@93['java']
-    packageFragments('java.io': FqName@94) = LazyJavaPackageFragment@95['io']
-    packageFragments('java.lang': FqName@96) = LazyJavaPackageFragment@97['lang']
-    packageFragments('java.lang.A': FqName@98) = null
-    packageFragments('kotlin': FqName@99) = null
-    packageFragments('kotlin.A': FqName@100) = null
-    packageFragments('kotlin.io': FqName@101) = null
-    packageFragments('kotlin.jvm': FqName@102) = null
-    topLevelClasses(JavaClassImpl@103['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@68['AutoCloseable']) = LazyJavaClassDescriptor@14['AutoCloseable']
-    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@23['Closeable']
-    topLevelClasses(JavaClassImpl@85['Runnable']) = LazyJavaClassDescriptor@28['Runnable']
-}
-
-LazyJavaPackageFragment@90['<root>'] {
-    classes('A': Name@104) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Runnable': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('Runnable': Name@106) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@93['java'] {
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('lang': Name@111) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-LazyJavaPackageFragment@97['lang'] {
-    classes('Runnable': Name@106) = LazyJavaClassDescriptor@28['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@107 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Runnable': Name@106) = ArrayList@114[1] { SamConstructorDescriptor@115['Runnable'] } // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[2] { ResolutionCandidate@122, ResolutionCandidate@123 }
-    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[2] { ResolutionCandidate@129, ResolutionCandidate@130 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@134[4] { ResolutionCandidate@122, ResolutionCandidate@125, ResolutionCandidate@123, ... }
-    <name not found> = ArrayList@135[4] { ResolutionCandidate@129, ResolutionCandidate@136, ResolutionCandidate@130, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log b/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
deleted file mode 100644
index 11a5710d896..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-LazyJavaClassDescriptor@0['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@1['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@2['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Runnable']
-}
-
-LazyJavaClassDescriptor@4['Super'] {
-    allDescriptors = ArrayList@5[5] { DeserializedSimpleFunctionDescriptor@6['hashCode'], JavaMethodDescriptor@7['foo'], SamAdapterFunctionDescriptor@8['foo'], ... } // through LazyJavaClassMemberScope@9
-    constructors = ArrayList@10[1] { JavaConstructorDescriptor@11['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@12['Super']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@9
-    functions('clone': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('equals': Name@16) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['equals'] } // through LazyJavaClassMemberScope@9
-    functions('finalize': Name@19) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('foo': Name@20) = ArrayList@21[2] { JavaMethodDescriptor@7['foo'], SamAdapterFunctionDescriptor@8['foo'] } // through LazyJavaClassMemberScope@9
-    functions('getClass': Name@22) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('hashCode': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@9
-    functions('notify': Name@25) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('notifyAll': Name@26) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@9
-    functions('wait': Name@30) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['Super']
-}
-
-LazyJavaClassTypeConstructor@3['Runnable'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Super'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Object'] {
-    classifier = JavaClassImpl@44['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@45['Runnable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Runnable']
-    nullable = 'false': Boolean@48
-    typeConstructor = LazyJavaClassTypeConstructor@3['Runnable']
-}
-
-LazyJavaClassifierType@49['Runnable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@47['Runnable']
-    nullable = 'true': Boolean@51
-    typeConstructor = LazyJavaClassTypeConstructor@3['Runnable']
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('Sub1': FqName@55) = null
-    packageFragments('Sub2': FqName@56) = null
-    packageFragments('Super': FqName@57) = null
-    packageFragments('Unit': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Super': FqName@63) = null
-    packageFragments('java.lang.Unit': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Super': FqName@66) = null
-    packageFragments('kotlin.Unit': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@47['Runnable']) = LazyJavaClassDescriptor@0['Runnable']
-    topLevelClasses(JavaClassImpl@70['Super']) = LazyJavaClassDescriptor@4['Super']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('Super': Name@71) = LazyJavaClassDescriptor@4['Super'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Unit': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('lang': Name@77) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@84 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log b/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
deleted file mode 100644
index ceca594e8f5..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    defaultType = JetTypeImpl@1['A']
-    functions('bar': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@6) = ArrayList@7[1] { DeserializedSimpleFunctionDescriptor@8['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@9) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('foo': Name@10) = ArrayList@11[2] { JavaMethodDescriptor@12['foo'], SamAdapterFunctionDescriptor@13['foo'] } // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@14) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('notify': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@19) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toString': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['toString'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@23) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['A']
-}
-
-LazyJavaClassDescriptor@27['B'] {
-    allDescriptors = ArrayList@28[7] { DeserializedSimpleFunctionDescriptor@29['hashCode'], JavaMethodDescriptor@30['foo'], JavaMethodDescriptor@31['foo'], ... } // through LazyJavaClassMemberScope@32
-    constructors = stdlib_emptyListClass@33[empty] // through LazyJavaClassMemberScope@32
-    defaultType = JetTypeImpl@34['B']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@32
-    functions('bar': Name@36) = ArrayList@37[2] { JavaMethodDescriptor@38['bar'], SamAdapterFunctionDescriptor@39['bar'] } // through LazyJavaClassMemberScope@32
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('equals': Name@6) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@41['equals'] } // through LazyJavaClassMemberScope@32
-    functions('finalize': Name@9) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('foo': Name@10) = ArrayList@42[2] { JavaMethodDescriptor@30['foo'], JavaMethodDescriptor@31['foo'] } // through LazyJavaClassMemberScope@32
-    functions('getClass': Name@14) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('hashCode': Name@15) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@29['hashCode'] } // through LazyJavaClassMemberScope@32
-    functions('notify': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('notifyAll': Name@19) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('toString': Name@20) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@45['toString'] } // through LazyJavaClassMemberScope@32
-    functions('wait': Name@23) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@49['B']
-}
-
-LazyJavaClassDescriptor@50['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@51['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@52['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
-}
-
-LazyJavaClassTypeConstructor@26['A'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { JetTypeImpl@56['Any'] }
-}
-
-LazyJavaClassTypeConstructor@49['B'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['A'] }
-}
-
-LazyJavaClassTypeConstructor@53['Runnable'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { JetTypeImpl@56['Any'] }
-}
-
-LazyJavaClassifierType@59['A'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@63['A']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@26['A']
-}
-
-LazyJavaClassifierType@65['Object'] {
-    classifier = JavaClassImpl@66['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@68['Object'] {
-    classifier = JavaClassImpl@69['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@70['Runnable'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Runnable']
-    nullable = 'false': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
-}
-
-LazyJavaClassifierType@73['Runnable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['Runnable']
-    nullable = 'false': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
-}
-
-LazyJavaClassifierType@76['Runnable'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@72['Runnable']
-    nullable = 'true': Boolean@78
-    typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
-}
-
-LazyJavaClassifierType@79['Runnable'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@75['Runnable']
-    nullable = 'true': Boolean@78
-    typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
-}
-
-LazyJavaPackageFragmentProvider@81 {
-    packageFragments('<root>': FqName@82) = LazyJavaPackageFragment@83['<root>']
-    packageFragments('B': FqName@84) = null
-    packageFragments('C': FqName@85) = null
-    packageFragments('Runnable': FqName@86) = null
-    packageFragments('java': FqName@87) = LazyJavaPackageFragment@88['java']
-    packageFragments('java.lang': FqName@89) = LazyJavaPackageFragment@90['lang']
-    packageFragments('java.lang.B': FqName@91) = null
-    packageFragments('java.lang.Runnable': FqName@92) = null
-    packageFragments('kotlin': FqName@93) = null
-    packageFragments('kotlin.B': FqName@94) = null
-    packageFragments('kotlin.Runnable': FqName@95) = null
-    packageFragments('kotlin.io': FqName@96) = null
-    packageFragments('kotlin.jvm': FqName@97) = null
-    topLevelClasses(JavaClassImpl@63['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@98['B']) = LazyJavaClassDescriptor@27['B']
-    topLevelClasses(JavaClassImpl@99['Runnable']) = LazyJavaClassDescriptor@50['Runnable']
-}
-
-LazyJavaPackageFragment@83['<root>'] {
-    classes('B': Name@100) = LazyJavaClassDescriptor@27['B'] // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Runnable': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@88['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@106) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@90['lang'] {
-    classes('Runnable': Name@102) = LazyJavaClassDescriptor@50['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@108
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.lazy.log b/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.lazy.log
deleted file mode 100644
index 700e1821749..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/innerNestedClassFromJava.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaClassDescriptor@0['Inner'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Inner']
-}
-
-LazyJavaClassDescriptor@2['M'] {
-    nestedClassIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    nestedClasses('Inner': Name@5) = LazyJavaClassDescriptor@0['Inner'] // through LazyJavaClassMemberScope@4
-    nestedClasses('Nested': Name@6) = LazyJavaClassDescriptor@7['Nested'] // through LazyJavaClassMemberScope@4
-    nestedClasses('PrInner': Name@8) = LazyJavaClassDescriptor@9['PrInner'] // through LazyJavaClassMemberScope@4
-    nestedClasses('PrNested': Name@10) = LazyJavaClassDescriptor@11['PrNested'] // through LazyJavaClassMemberScope@4
-}
-
-LazyJavaClassDescriptor@7['Nested'] {
-    typeConstructor = LazyJavaClassTypeConstructor@12['Nested']
-}
-
-LazyJavaClassDescriptor@9['PrInner'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['PrInner']
-}
-
-LazyJavaClassDescriptor@11['PrNested'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['PrNested']
-}
-
-LazyJavaClassTypeConstructor@1['Inner'] {
-    parameters = ArrayList@15[empty]
-}
-
-LazyJavaClassTypeConstructor@12['Nested'] {
-    parameters = ArrayList@16[empty]
-}
-
-LazyJavaClassTypeConstructor@13['PrInner'] {
-    parameters = ArrayList@17[empty]
-}
-
-LazyJavaClassTypeConstructor@14['PrNested'] {
-    parameters = ArrayList@18[empty]
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('a': FqName@22) = LazyJavaPackageFragment@23['a']
-    packageFragments('a.M': FqName@24) = null
-    packageFragments('b': FqName@25) = null
-    packageFragments('b.a': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    topLevelClasses(JavaClassImpl@34['M']) = LazyJavaClassDescriptor@2['M']
-}
-
-LazyJavaPackageFragment@23['a'] {
-    classes('M': Name@35) = LazyJavaClassDescriptor@2['M'] // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('a': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
deleted file mode 100644
index b7ec9e73270..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-LazyJavaClassDescriptor@0['F'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['F']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@7 // through LazyJavaClassMemberScope@3
-    nestedClasses('m': Name@8) = null // through LazyJavaClassMemberScope@3
-    properties('m': Name@8) = ArrayList@9[1] { PropertyDescriptorImpl@10['m'] } // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@11['F']
-}
-
-LazyJavaClassDescriptor@12['M'] {
-    defaultType = JetTypeImpl@13['M']
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@15
-    properties('m': Name@8) = ArrayList@16[1] { JavaPropertyDescriptor@17['m'] } // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['M']
-}
-
-LazyJavaClassTypeConstructor@11['F'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['M'] }
-}
-
-LazyJavaClassTypeConstructor@19['M'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@22['M'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['M']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@19['M']
-}
-
-LazyJavaClassifierType@28['Object'] {
-    classifier = JavaClassImpl@29['Object']
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('a': FqName@34) = LazyJavaPackageFragment@35['a']
-    packageFragments('b': FqName@36) = LazyJavaPackageFragment@37['b']
-    packageFragments('b.F': FqName@38) = null
-    packageFragments('c': FqName@39) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    topLevelClasses(JavaClassImpl@47['F']) = LazyJavaClassDescriptor@0['F']
-    topLevelClasses(JavaClassImpl@27['M']) = LazyJavaClassDescriptor@12['M']
-}
-
-LazyJavaPackageFragment@37['b'] {
-    classes('F': Name@48) = LazyJavaClassDescriptor@0['F'] // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('F': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('F': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('F': Name@58) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
deleted file mode 100644
index 820b4ebd757..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
+++ /dev/null
@@ -1,104 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Inner']
-}
-
-LazyJavaClassDescriptor@2['Inner'] {
-    constructors = ArrayList@3[1] { JavaConstructorDescriptor@4['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Inner']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Inner']
-}
-
-LazyJavaClassDescriptor@8['M'] {
-    defaultType = JetTypeImpl@9['M']
-    functionTypeForSamInterface = null
-    functions('Inner': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@12
-    functions('Inner': Name@13) = EmptyList@11[empty] // through LazyJavaStaticClassScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaStaticClassScope@14
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@12
-    nestedClasses('Inner': Name@18) = LazyJavaClassDescriptor@2['Inner'] // through LazyJavaClassMemberScope@12
-    properties('Inner': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@12
-    properties('Inner': Name@13) = EmptyList@11[empty] // through LazyJavaStaticClassScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@19['M']
-}
-
-LazyJavaClassTypeConstructor@7['Inner'] {
-    parameters = ArrayList@20[empty]
-}
-
-LazyJavaClassTypeConstructor@19['M'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { JetTypeImpl@23['Any'] }
-}
-
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('Inner': FqName@30) = null
-    packageFragments('a': FqName@31) = LazyJavaPackageFragment@32['a']
-    packageFragments('a.M': FqName@33) = null
-    packageFragments('b': FqName@34) = null
-    packageFragments('b.Inner': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.Inner': FqName@40) = null
-    packageFragments('kotlin': FqName@41) = null
-    packageFragments('kotlin.Inner': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    topLevelClasses(JavaClassImpl@45['M']) = LazyJavaClassDescriptor@8['M']
-}
-
-LazyJavaPackageFragment@32['a'] {
-    classes('M': Name@46) = LazyJavaClassDescriptor@8['M'] // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('M': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('lang': Name@53) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('Inner': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('doSmth': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('Inner': Name@55) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('doSmth': Name@57) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
deleted file mode 100644
index e13f029d0ca..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
+++ /dev/null
@@ -1,178 +0,0 @@
-LazyJavaClassDescriptor@0['C'] {
-    defaultType = JetTypeImpl@1['C<1>']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('create': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['create'] } // through LazyJavaStaticClassScope@7
-    functions('create': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    functions('foo': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['foo'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@3
-    nestedClasses('create': Name@4) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('foo': Name@9) = null // through LazyJavaClassMemberScope@3
-    properties('create': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    properties('create': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassTypeConstructor@16['C'] {
-    parameters = ArrayList@17[1] { LazyJavaTypeParameterDescriptor@18['B'] }
-    supertypes = ArrayList@19[1] { JetTypeImpl@20['Any'] }
-}
-
-LazyJavaClassifierType@21['B'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaTypeParameterImpl@23['B']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-}
-
-LazyJavaClassifierType@26['B'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaTypeParameterImpl@28['B']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-}
-
-LazyJavaClassifierType@29['B'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaTypeParameterImpl@23['B']
-    nullable = 'true': Boolean@31
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-}
-
-LazyJavaClassifierType@32['B'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@28['B']
-    nullable = 'true': Boolean@31
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-}
-
-LazyJavaClassifierType@34['C'] {
-    arguments = ArrayList@35[1] { LazyStarProjection@36 }
-    classifier = JavaClassImpl@37['C']
-    memberScope = SubstitutingScope@38
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@39['C'] {
-    arguments = ArrayList@40[1] { LazyStarProjection@41 }
-    classifier = JavaClassImpl@37['C']
-    memberScope = SubstitutingScope@42
-    nullable = 'true': Boolean@31
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@43['C<?>'] {
-    arguments = ArrayList@44[1] { LazyStarProjection@45 }
-    classifier = JavaClassImpl@46['C']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@48['C<?>'] {
-    arguments = ArrayList@49[1] { LazyStarProjection@50 }
-    classifier = JavaClassImpl@46['C']
-    nullable = 'true': Boolean@31
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@51['C<B>'] {
-    arguments = ArrayList@52[1] { TypeProjectionImpl@53 }
-    classifier = JavaClassImpl@54['C']
-    memberScope = SubstitutingScope@55
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@56['C<B>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@54['C']
-    memberScope = SubstitutingScope@59
-    nullable = 'true': Boolean@31
-    typeConstructor = LazyJavaClassTypeConstructor@16['C']
-}
-
-LazyJavaClassifierType@60['Object'] {
-    classifier = JavaClassImpl@61['Object']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaPackageFragmentProvider@63 {
-    packageFragments('<root>': FqName@64) = LazyJavaPackageFragment@65['<root>']
-    packageFragments('C': FqName@66) = null
-    packageFragments('a': FqName@67) = LazyJavaPackageFragment@68['a']
-    packageFragments('a.C': FqName@69) = null
-    packageFragments('d': FqName@70) = null
-    packageFragments('d.C': FqName@71) = null
-    packageFragments('java': FqName@72) = LazyJavaPackageFragment@73['java']
-    packageFragments('java.lang': FqName@74) = LazyJavaPackageFragment@75['lang']
-    packageFragments('java.lang.C': FqName@76) = null
-    packageFragments('kotlin': FqName@77) = null
-    packageFragments('kotlin.C': FqName@78) = null
-    packageFragments('kotlin.io': FqName@79) = null
-    packageFragments('kotlin.jvm': FqName@80) = null
-    topLevelClasses(JavaClassImpl@81['C']) = LazyJavaClassDescriptor@0['C']
-}
-
-LazyJavaPackageFragment@68['a'] {
-    classes('C': Name@82) = LazyJavaClassDescriptor@0['C'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('C': Name@85) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@73['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@75['lang'] {
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaTypeParameterDescriptor@18['B'] {
-    defaultType = JetTypeImpl@92['B']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-    upperBounds = LinkedHashSet@93[1] { DelegatingFlexibleType@94 }
-    upperBoundsAsType = DelegatingFlexibleType@94
-}
-
-LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@96['B']) = LazyJavaTypeParameterDescriptor@18['B']
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2152.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2152.lazy.log
deleted file mode 100644
index 2823b27763f..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2152.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaClassDescriptor@0['Ccc'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Bbb': FqName@4) = null
-    packageFragments('Ccc': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    topLevelClasses(JavaClassImpl@13['Ccc']) = LazyJavaClassDescriptor@0['Ccc']
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Ccc': Name@14) = LazyJavaClassDescriptor@0['Ccc'] // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('Ccc': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
deleted file mode 100644
index 620258f47e9..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Collection': FqName@4) = null
-    packageFragments('Comparable': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Iterable': FqName@7) = null
-    packageFragments('Iterator': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('d': FqName@10) = null
-    packageFragments('d.Any': FqName@11) = null
-    packageFragments('d.Collection': FqName@12) = null
-    packageFragments('d.Comparable': FqName@13) = null
-    packageFragments('d.Int': FqName@14) = null
-    packageFragments('d.Iterable': FqName@15) = null
-    packageFragments('d.Iterator': FqName@16) = null
-    packageFragments('d.String': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.Any': FqName@22) = null
-    packageFragments('java.lang.Collection': FqName@23) = null
-    packageFragments('java.lang.Comparable': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.Iterable': FqName@26) = null
-    packageFragments('java.lang.Iterator': FqName@27) = null
-    packageFragments('java.lang.String': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Any': FqName@30) = null
-    packageFragments('kotlin.Collection': FqName@31) = null
-    packageFragments('kotlin.Comparable': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.Iterable': FqName@34) = null
-    packageFragments('kotlin.Iterator': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@56 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2606.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2606.lazy.log
deleted file mode 100644
index 0dc22cd88a7..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2606.lazy.log
+++ /dev/null
@@ -1,97 +0,0 @@
-LazyJavaClassDescriptor@0['Integer'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Integer']
-}
-
-LazyJavaClassTypeConstructor@1['Integer'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[2] { LazyJavaClassifierType@4['Number'], LazyJavaClassifierType@5['Comparable<Integer>'] }
-}
-
-LazyJavaClassifierType@5['Comparable<Integer>'] {
-    classifier = JavaClassImpl@6['Comparable']
-    typeConstructor = DeserializedClassTypeConstructor@7
-}
-
-LazyJavaClassifierType@4['Number'] {
-    arguments = ArrayList@8[empty]
-    classifier = JavaClassImpl@9['Number']
-    typeConstructor = DeserializedClassTypeConstructor@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('Annotation': FqName@14) = null
-    packageFragments('Int': FqName@15) = null
-    packageFragments('Integer': FqName@16) = null
-    packageFragments('Iterable': FqName@17) = null
-    packageFragments('Iterator': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Annotation': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.Integer': FqName@25) = null
-    packageFragments('java.lang.Iterable': FqName@26) = null
-    packageFragments('java.lang.Iterator': FqName@27) = null
-    packageFragments('java.lang.annotation': FqName@28) = LazyJavaPackageFragment@29['annotation']
-    packageFragments('java.lang.annotation.Annotation': FqName@30) = null
-    packageFragments('java.lang.annotation.Int': FqName@31) = null
-    packageFragments('java.lang.annotation.Integer': FqName@32) = null
-    packageFragments('java.lang.annotation.Iterable': FqName@33) = null
-    packageFragments('java.lang.annotation.Iterator': FqName@34) = null
-    packageFragments('java.util': FqName@35) = LazyJavaPackageFragment@36['util']
-    packageFragments('java.util.Annotation': FqName@37) = null
-    packageFragments('java.util.Int': FqName@38) = null
-    packageFragments('java.util.Integer': FqName@39) = null
-    packageFragments('java.util.Iterable': FqName@40) = null
-    packageFragments('java.util.Iterator': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Annotation': FqName@43) = null
-    packageFragments('kotlin.Int': FqName@44) = null
-    packageFragments('kotlin.Integer': FqName@45) = null
-    packageFragments('kotlin.Iterable': FqName@46) = null
-    packageFragments('kotlin.Iterator': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    packageFragments('n': FqName@50) = null
-    packageFragments('n.Annotation': FqName@51) = null
-    packageFragments('n.Int': FqName@52) = null
-    packageFragments('n.Integer': FqName@53) = null
-    packageFragments('n.Iterable': FqName@54) = null
-    packageFragments('n.Iterator': FqName@55) = null
-    topLevelClasses(JavaClassImpl@56['Annotation']) = LazyJavaClassDescriptor@57['Annotation']
-    topLevelClasses(JavaClassImpl@58['Integer']) = LazyJavaClassDescriptor@0['Integer']
-    topLevelClasses(JavaClassImpl@59['Iterator']) = LazyJavaClassDescriptor@60['Iterator']
-}
-
-LazyJavaPackageFragment@29['annotation'] {
-    classes('Annotation': Name@61) = LazyJavaClassDescriptor@57['Annotation'] // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Int': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Integer': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Iterable': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Iterator': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('util': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@71) = EmptyList@72[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('util': Name@73) = EmptyList@72[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('Integer': Name@64) = LazyJavaClassDescriptor@0['Integer'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('annotation': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('annotation': Name@77) = EmptyList@72[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@36['util'] {
-    classes('Annotation': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Int': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Integer': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Iterable': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Iterator': Name@66) = LazyJavaClassDescriptor@60['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@79
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
deleted file mode 100644
index 99938150cef..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaClassDescriptor@0['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Type']
-}
-
-LazyJavaClassTypeConstructor@1['Type'] {
-    parameters = ArrayList@2[empty]
-    supertypes = ArrayList@3[1] { LazyJavaClassifierType@4['Enum<Type>'] }
-}
-
-LazyJavaClassifierType@4['Enum<Type>'] {
-    classifier = JavaClassImpl@5['Enum']
-    typeConstructor = DeserializedClassTypeConstructor@6
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Array': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('Type': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Array': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.Type': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.Type': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    topLevelClasses(JavaClassImpl@26['Type']) = LazyJavaClassDescriptor@0['Type']
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Type': Name@30) = LazyJavaClassDescriptor@0['Type'] // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
deleted file mode 100644
index 0b7f7ef0343..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
+++ /dev/null
@@ -1,227 +0,0 @@
-LazyJavaClassDescriptor@0['Comparable'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'], ... } // through LazyJavaClassMemberScope@5
-    annotations = LazyJavaAnnotations@6
-    defaultType = JetTypeImpl@7['Comparable<1>']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = JetTypeImpl@9['Function1<2>']
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('compareTo': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['compareTo'] } // through LazyJavaClassMemberScope@5
-    functions('equals': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@4['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@21) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparable']
-}
-
-LazyJavaClassDescriptor@30['Integer'] {
-    typeConstructor = LazyJavaClassTypeConstructor@31['Integer']
-}
-
-LazyJavaClassDescriptor@32['Iterable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@33['Iterable']
-}
-
-LazyJavaClassDescriptor@34['Iterator'] {
-    defaultType = JetTypeImpl@35['Iterator<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@36['Iterator']
-}
-
-LazyJavaClassTypeConstructor@29['Comparable'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['T'] }
-    supertypes = ArrayList@39[1] { JetTypeImpl@40['Any'] }
-}
-
-LazyJavaClassTypeConstructor@31['Integer'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[2] { LazyJavaClassifierType@43['Number'], LazyJavaClassifierType@44['Comparable<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@33['Iterable'] {
-    parameters = ArrayList@45[1] { LazyJavaTypeParameterDescriptor@46['T'] }
-}
-
-LazyJavaClassTypeConstructor@36['Iterator'] {
-    parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
-    supertypes = ArrayList@49[1] { JetTypeImpl@40['Any'] }
-}
-
-LazyJavaClassifierType@44['Comparable<Integer>'] {
-    classifier = JavaClassImpl@50['Comparable']
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@43['Number'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@53['Number']
-    typeConstructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaClassifierType@55['Object'] {
-    classifier = JavaClassImpl@56['Object']
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@58['Object'] {
-    classifier = JavaClassImpl@59['Object']
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@60['T'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['T']
-    nullable = 'false': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-LazyJavaClassifierType@65['T'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@67['T']
-    nullable = 'false': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-LazyJavaClassifierType@68['T'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@62['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-LazyJavaClassifierType@71['T'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@67['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-LazyJavaPackageFragmentProvider@73 {
-    packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
-    packageFragments('Any': FqName@76) = null
-    packageFragments('Int': FqName@77) = null
-    packageFragments('Integer': FqName@78) = null
-    packageFragments('Iterable': FqName@79) = null
-    packageFragments('Iterator': FqName@80) = null
-    packageFragments('String': FqName@81) = null
-    packageFragments('a': FqName@82) = null
-    packageFragments('a.Any': FqName@83) = null
-    packageFragments('a.Int': FqName@84) = null
-    packageFragments('a.Integer': FqName@85) = null
-    packageFragments('a.Iterable': FqName@86) = null
-    packageFragments('a.Iterator': FqName@87) = null
-    packageFragments('a.String': FqName@88) = null
-    packageFragments('a.java': FqName@89) = null
-    packageFragments('java': FqName@90) = LazyJavaPackageFragment@91['java']
-    packageFragments('java.lang': FqName@92) = LazyJavaPackageFragment@93['lang']
-    packageFragments('java.lang.Any': FqName@94) = null
-    packageFragments('java.lang.Comparable': FqName@95) = null
-    packageFragments('java.lang.Int': FqName@96) = null
-    packageFragments('java.lang.Integer': FqName@97) = null
-    packageFragments('java.lang.Iterable': FqName@98) = null
-    packageFragments('java.lang.Iterator': FqName@99) = null
-    packageFragments('java.lang.String': FqName@100) = null
-    packageFragments('java.util': FqName@101) = LazyJavaPackageFragment@102['util']
-    packageFragments('java.util.Iterator': FqName@103) = null
-    packageFragments('kotlin': FqName@104) = null
-    packageFragments('kotlin.Any': FqName@105) = null
-    packageFragments('kotlin.Int': FqName@106) = null
-    packageFragments('kotlin.Integer': FqName@107) = null
-    packageFragments('kotlin.Iterable': FqName@108) = null
-    packageFragments('kotlin.Iterator': FqName@109) = null
-    packageFragments('kotlin.String': FqName@110) = null
-    packageFragments('kotlin.io': FqName@111) = null
-    packageFragments('kotlin.jvm': FqName@112) = null
-    topLevelClasses(JavaClassImpl@113['Comparable']) = LazyJavaClassDescriptor@0['Comparable']
-    topLevelClasses(JavaClassImpl@114['Integer']) = LazyJavaClassDescriptor@30['Integer']
-    topLevelClasses(JavaClassImpl@115['Iterable']) = LazyJavaClassDescriptor@32['Iterable']
-    topLevelClasses(JavaClassImpl@116['Iterator']) = LazyJavaClassDescriptor@34['Iterator']
-}
-
-LazyJavaPackageFragment@91['java'] {
-    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('util': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('lang': Name@121) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('util': Name@122) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-LazyJavaPackageFragment@93['lang'] {
-    classes('Comparable': Name@124) = LazyJavaClassDescriptor@0['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Integer': Name@126) = LazyJavaClassDescriptor@30['Integer'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Iterable': Name@127) = LazyJavaClassDescriptor@32['Iterable'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('java': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('Comparable': Name@129) = ArrayList@130[1] { SamConstructorDescriptor@131['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-LazyJavaPackageFragment@102['util'] {
-    classes('Iterator': Name@133) = LazyJavaClassDescriptor@34['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('Iterator': Name@135) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaTypeParameterDescriptor@48['E'] {
-    defaultType = JetTypeImpl@137['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@138
-    upperBounds = LinkedHashSet@139[1] { NullableType@140 }
-    upperBoundsAsType = NullableType@140
-}
-
-LazyJavaTypeParameterDescriptor@38['T'] {
-    defaultType = JetTypeImpl@141['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-    upperBounds = LinkedHashSet@142[1] { NullableType@143 }
-}
-
-LazyJavaTypeParameterDescriptor@46['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@144
-    upperBounds = LinkedHashSet@145[1] { NullableType@146 }
-}
-
-LazyJavaTypeParameterResolver@147 {
-    resolve(JavaTypeParameterImpl@148['E']) = LazyJavaTypeParameterDescriptor@48['E']
-}
-
-LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@46['T']
-}
-
-LazyJavaTypeParameterResolver@151 {
-    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@38['T']
-}
-
-LazyJavaTypeParameterResolver@152 {
-    resolve(JavaTypeParameterImpl@67['T']) = null
-}
-
-LazyJavaTypeParameterResolver@153 {
-    resolve(JavaTypeParameterImpl@62['T']) = null
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@162 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
deleted file mode 100644
index bfe2061a23a..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
+++ /dev/null
@@ -1,359 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['CollectionTest'] {
-    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['CollectionTest']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('add': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['add'] } // through LazyJavaStaticClassScope@21
-    functions('add': Name@18) = EmptyList@22[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaStaticClassScope@21
-    nestedClassIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@15
-    nestedClasses('add': Name@18) = null // through LazyJavaClassMemberScope@15
-    properties('add': Name@18) = EmptyList@22[empty] // through LazyJavaClassMemberScope@15
-    properties('add': Name@18) = EmptyList@22[empty] // through LazyJavaStaticClassScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@26['CollectionTest']
-}
-
-LazyJavaClassDescriptor@27['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@28['RandomAccess']
-}
-
-LazyJavaClassDescriptor@29['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@30['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    supertypes = ArrayList@35[2] { LazyJavaClassifierType@36['AbstractCollection<E>'], LazyJavaClassifierType@37['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@38[1] { LazyJavaTypeParameterDescriptor@39['E'] }
-    supertypes = ArrayList@40[5] { LazyJavaClassifierType@41['AbstractList<E>'], LazyJavaClassifierType@42['List<E>'], LazyJavaClassifierType@43['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@26['CollectionTest'] {
-    parameters = ArrayList@44[empty]
-    supertypes = ArrayList@45[1] { JetTypeImpl@46['Any'] }
-}
-
-LazyJavaClassTypeConstructor@28['RandomAccess'] {
-    supertypes = ArrayList@47[1] { JetTypeImpl@46['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['Serializable'] {
-    supertypes = ArrayList@48[1] { JetTypeImpl@46['Any'] }
-}
-
-LazyJavaClassifierType@36['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@49['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@41['AbstractList<E>'] {
-    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
-    classifier = JavaClassImpl@52['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@53['Cloneable'] {
-    classifier = JavaClassImpl@54['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@55
-}
-
-LazyJavaClassifierType@56['Collection<? extends E>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@59['Collection']
-    memberScope = SubstitutingScope@60
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Collection<? extends E>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@59['Collection']
-    memberScope = SubstitutingScope@66
-    nullable = 'true': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@32['Collection<E>'] {
-    classifier = JavaClassImpl@69['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@92['Integer'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['Integer']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@96['Integer'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['Integer']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@99['Integer'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@94['Integer']
-    nullable = 'true': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@101['Integer'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@98['Integer']
-    nullable = 'true': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@37['List<E>'] {
-    arguments = ArrayList@103[1] { TypeProjectionImpl@104 }
-    classifier = JavaClassImpl@105['List']
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@42['List<E>'] {
-    classifier = JavaClassImpl@107['List']
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@108['List<Integer>'] {
-    arguments = ArrayList@109[1] { TypeProjectionImpl@110 }
-    classifier = JavaClassImpl@111['List']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@112['List<Integer>'] {
-    arguments = ArrayList@113[1] { TypeProjectionImpl@114 }
-    classifier = JavaClassImpl@111['List']
-    nullable = 'true': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@116['Object'] {
-    classifier = JavaClassImpl@117['Object']
-    typeConstructor = DeserializedClassTypeConstructor@118
-}
-
-LazyJavaClassifierType@119['Object'] {
-    classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@118
-}
-
-LazyJavaClassifierType@121['Object'] {
-    classifier = JavaClassImpl@122['Object']
-    typeConstructor = DeserializedClassTypeConstructor@118
-}
-
-LazyJavaClassifierType@123['Object'] {
-    classifier = JavaClassImpl@124['Object']
-    typeConstructor = DeserializedClassTypeConstructor@118
-}
-
-LazyJavaClassifierType@43['RandomAccess'] {
-    classifier = JavaClassImpl@125['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@28['RandomAccess']
-}
-
-LazyJavaClassifierType@126['Serializable'] {
-    classifier = JavaClassImpl@127['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@128 {
-    packageFragments('<root>': FqName@129) = LazyJavaPackageFragment@130['<root>']
-    packageFragments('CollectionTest': FqName@131) = null
-    packageFragments('_03_collections': FqName@132) = LazyJavaPackageFragment@133['_03_collections']
-    packageFragments('_03_collections.CollectionTest': FqName@134) = null
-    packageFragments('java': FqName@135) = LazyJavaPackageFragment@136['java']
-    packageFragments('java.io': FqName@137) = LazyJavaPackageFragment@138['io']
-    packageFragments('java.lang': FqName@139) = LazyJavaPackageFragment@140['lang']
-    packageFragments('java.lang.CollectionTest': FqName@141) = null
-    packageFragments('java.util': FqName@142) = LazyJavaPackageFragment@143['util']
-    packageFragments('java.util.ArrayList': FqName@144) = null
-    packageFragments('kotlin': FqName@145) = null
-    packageFragments('kotlin.CollectionTest': FqName@146) = null
-    packageFragments('kotlin.io': FqName@147) = null
-    packageFragments('kotlin.jvm': FqName@148) = null
-    topLevelClasses(JavaClassImpl@49['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@52['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@149['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@150['CollectionTest']) = LazyJavaClassDescriptor@12['CollectionTest']
-    topLevelClasses(JavaClassImpl@125['RandomAccess']) = LazyJavaClassDescriptor@27['RandomAccess']
-    topLevelClasses(JavaClassImpl@127['Serializable']) = LazyJavaClassDescriptor@29['Serializable']
-}
-
-LazyJavaPackageFragment@133['_03_collections'] {
-    classes('ArrayList': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('CollectionTest': Name@153) = LazyJavaClassDescriptor@12['CollectionTest'] // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('ArrayList': Name@155) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('CollectionTest': Name@153) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@152
-}
-
-LazyJavaPackageFragment@136['java'] {
-    classes('lang': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('util': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('lang': Name@160) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('util': Name@161) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-LazyJavaPackageFragment@140['lang'] {
-    classes('ArrayList': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('CollectionTest': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('ArrayList': Name@155) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('CollectionTest': Name@153) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@163
-}
-
-LazyJavaPackageFragment@143['util'] {
-    classes('ArrayList': Name@165) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('ArrayList': Name@167) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
-}
-
-LazyJavaTypeParameterDescriptor@39['E'] {
-    defaultType = JetTypeImpl@169['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    upperBounds = LinkedHashSet@170[1] { NullableType@171 }
-}
-
-LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@76['E']) = LazyJavaTypeParameterDescriptor@34['E']
-}
-
-LazyJavaTypeParameterResolver@173 {
-    resolve(JavaTypeParameterImpl@174['E']) = LazyJavaTypeParameterDescriptor@39['E']
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@189[3] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
deleted file mode 100644
index f3ce56c74c9..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
+++ /dev/null
@@ -1,175 +0,0 @@
-LazyJavaClassDescriptor@0['Bug'] {
-    defaultType = JetTypeImpl@1['Bug']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('save': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['save'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('save': Name@9) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
-}
-
-LazyJavaClassDescriptor@12['SubBug'] {
-    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['SubBug']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('save': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['save'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@15
-    nestedClasses('save': Name@18) = null // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
-}
-
-LazyJavaClassTypeConstructor@11['Bug'] {
-    parameters = ArrayList@25[empty]
-    supertypes = ArrayList@26[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['SubBug'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Bug'] }
-}
-
-LazyJavaClassifierType@31['Bug'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Bug']
-    memberScope = LazyJavaClassMemberScope@3
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
-}
-
-LazyJavaClassifierType@35['Bug'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@33['Bug']
-    memberScope = LazyJavaClassMemberScope@3
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
-}
-
-LazyJavaClassifierType@30['Bug'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['Bug']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Object'] {
-    classifier = JavaClassImpl@44['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@45['RET'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@47['RET']
-    nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaClassifierType@49['RET'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@47['RET']
-    nullable = 'true': Boolean@37
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-LazyJavaClassifierType@51['SubBug'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@53['SubBug']
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
-}
-
-LazyJavaClassifierType@54['SubBug'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaClassImpl@53['SubBug']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Bug': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.Bug': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Bug': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    topLevelClasses(JavaClassImpl@39['Bug']) = LazyJavaClassDescriptor@0['Bug']
-    topLevelClasses(JavaClassImpl@69['SubBug']) = LazyJavaClassDescriptor@12['SubBug']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Bug': Name@70) = LazyJavaClassDescriptor@0['Bug'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('SubBug': Name@72) = LazyJavaClassDescriptor@12['SubBug'] // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('SubBug': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@63['lang'] {
-    classes('SubBug': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('SubBug': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaTypeParameterDescriptor@82['RET'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@83[1] { DelegatingFlexibleType@84 }
-}
-
-LazyJavaTypeParameterResolver@85 {
-    resolve(JavaTypeParameterImpl@86['RET']) = LazyJavaTypeParameterDescriptor@82['RET']
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
deleted file mode 100644
index 6aa38c95cca..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
+++ /dev/null
@@ -1,113 +0,0 @@
-LazyJavaClassDescriptor@0['Super'] {
-    allDescriptors = ArrayList@1[6] { JavaMethodDescriptor@2['setFoo'], DeserializedSimpleFunctionDescriptor@3['hashCode'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['Super']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@15) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@3['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@19) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@20) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('setFoo': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@2['setFoo'] } // through LazyJavaClassMemberScope@5
-    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@5
-    properties('bar': Name@28) = ArrayList@29[1] { JavaPropertyDescriptor@30['bar'] } // through LazyJavaClassMemberScope@5
-    properties('foo': Name@31) = ArrayList@32[1] { JavaPropertyDescriptor@33['foo'] } // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['Super']
-}
-
-LazyJavaClassTypeConstructor@35['Super'] {
-    parameters = ArrayList@36[empty]
-    supertypes = ArrayList@37[1] { JetTypeImpl@38['Any'] }
-}
-
-LazyJavaClassifierType@39['Object'] {
-    classifier = JavaClassImpl@40['Object']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
-    packageFragments('Array': FqName@45) = null
-    packageFragments('String': FqName@46) = null
-    packageFragments('Sub': FqName@47) = null
-    packageFragments('Super': FqName@48) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.Array': FqName@53) = null
-    packageFragments('java.lang.String': FqName@54) = null
-    packageFragments('java.lang.Super': FqName@55) = null
-    packageFragments('kotlin': FqName@56) = null
-    packageFragments('kotlin.Array': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.Super': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    topLevelClasses(JavaClassImpl@62['Super']) = LazyJavaClassDescriptor@0['Super']
-}
-
-LazyJavaPackageFragment@44['<root>'] {
-    classes('Array': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('String': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Sub': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Super': Name@67) = LazyJavaClassDescriptor@0['Super'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Sub': Name@66) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    classes('Sub': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Sub': Name@66) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log b/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
deleted file mode 100644
index 335cf222e9e..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
+++ /dev/null
@@ -1,363 +0,0 @@
-LazyJavaClassDescriptor@0['JC'] {
-    defaultType = JetTypeImpl@1['JC<1>']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('getIterable': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['getIterable'] } // through LazyJavaClassMemberScope@3
-    functions('getIterator': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['getIterator'] } // through LazyJavaClassMemberScope@3
-    functions('setIterable': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['setIterable'] } // through LazyJavaClassMemberScope@3
-    functions('setIterator': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['setIterator'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@3
-    nestedClasses('getIterable': Name@4) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('getIterator': Name@7) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('setIterable': Name@10) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('setIterator': Name@13) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['JC']
-}
-
-LazyJavaClassTypeConstructor@19['JC'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['T'] }
-    supertypes = ArrayList@22[1] { JetTypeImpl@23['Any'] }
-}
-
-LazyJavaClassifierType@24['Iterable<T>'] {
-    arguments = ArrayList@25[1] { TypeProjectionImpl@26 }
-    classifier = JavaClassImpl@27['Iterable']
-    memberScope = SubstitutingScope@28
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@31['Iterable<T>'] {
-    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
-    classifier = JavaClassImpl@34['Iterable']
-    memberScope = SubstitutingScope@35
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@36['Iterable<T>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@34['Iterable']
-    memberScope = SubstitutingScope@39
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Iterable<T>'] {
-    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    classifier = JavaClassImpl@27['Iterable']
-    memberScope = SubstitutingScope@45
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@46['Iterator<T>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@49['Iterator']
-    memberScope = SubstitutingScope@50
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@52['Iterator<T>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@55['Iterator']
-    memberScope = SubstitutingScope@56
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@57['Iterator<T>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@49['Iterator']
-    memberScope = SubstitutingScope@60
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@62['Iterator<T>'] {
-    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@55['Iterator']
-    memberScope = SubstitutingScope@65
-    nullable = 'true': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@66['Object'] {
-    classifier = JavaClassImpl@67['Object']
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@69['T'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@71['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@73['T'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@76['T'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@79['T'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaTypeParameterImpl@81['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@82['T'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@84['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@85['T'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@88['T'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@91['T'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'false': Boolean@29
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@94['T'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@75['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@96['T'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@78['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@98['T'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@81['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@84['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@102['T'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@90['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@104['T'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@93['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@106['T'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@71['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaClassifierType@108['T'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@87['T']
-    nullable = 'true': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-}
-
-LazyJavaPackageFragmentProvider@110 {
-    packageFragments('<root>': FqName@111) = LazyJavaPackageFragment@112['<root>']
-    packageFragments('Int': FqName@113) = null
-    packageFragments('Iterable': FqName@114) = null
-    packageFragments('Iterator': FqName@115) = null
-    packageFragments('JC': FqName@116) = null
-    packageFragments('MutableIterable': FqName@117) = null
-    packageFragments('MutableIterator': FqName@118) = null
-    packageFragments('a': FqName@119) = LazyJavaPackageFragment@120['a']
-    packageFragments('a.JC': FqName@121) = null
-    packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
-    packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
-    packageFragments('java.lang.Int': FqName@126) = null
-    packageFragments('java.lang.Iterable': FqName@127) = null
-    packageFragments('java.lang.Iterator': FqName@128) = null
-    packageFragments('java.lang.JC': FqName@129) = null
-    packageFragments('java.lang.MutableIterable': FqName@130) = null
-    packageFragments('java.lang.MutableIterator': FqName@131) = null
-    packageFragments('kotlin': FqName@132) = null
-    packageFragments('kotlin.Int': FqName@133) = null
-    packageFragments('kotlin.Iterable': FqName@134) = null
-    packageFragments('kotlin.Iterator': FqName@135) = null
-    packageFragments('kotlin.JC': FqName@136) = null
-    packageFragments('kotlin.MutableIterable': FqName@137) = null
-    packageFragments('kotlin.MutableIterator': FqName@138) = null
-    packageFragments('kotlin.io': FqName@139) = null
-    packageFragments('kotlin.jvm': FqName@140) = null
-    packageFragments('n': FqName@141) = null
-    packageFragments('n.Int': FqName@142) = null
-    packageFragments('n.Iterable': FqName@143) = null
-    packageFragments('n.Iterator': FqName@144) = null
-    packageFragments('n.JC': FqName@145) = null
-    packageFragments('n.MutableIterable': FqName@146) = null
-    packageFragments('n.MutableIterator': FqName@147) = null
-    topLevelClasses(JavaClassImpl@148['JC']) = LazyJavaClassDescriptor@0['JC']
-}
-
-LazyJavaPackageFragment@120['a'] {
-    classes('JC': Name@149) = LazyJavaClassDescriptor@0['JC'] // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('JC': Name@152) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@150
-}
-
-LazyJavaPackageFragment@123['java'] {
-    classes('lang': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('lang': Name@157) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
-}
-
-LazyJavaTypeParameterDescriptor@21['T'] {
-    defaultType = JetTypeImpl@159['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-    upperBounds = LinkedHashSet@160[1] { NullableType@161 }
-}
-
-LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@163['T']) = LazyJavaTypeParameterDescriptor@21['T']
-}
-
-LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@81['T']) = null
-}
-
-LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@93['T']) = null
-}
-
-LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@71['T']) = null
-}
-
-LazyJavaTypeParameterResolver@167 {
-    resolve(JavaTypeParameterImpl@78['T']) = null
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-null {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@197 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log b/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
deleted file mode 100644
index 2837d96bec8..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
+++ /dev/null
@@ -1,255 +0,0 @@
-LazyJavaClassDescriptor@0['Bar'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['f'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['Bar']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('f': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@3['f'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@16) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['Bar']
-}
-
-LazyJavaClassDescriptor@29['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@30['Exception']
-}
-
-LazyJavaClassDescriptor@31['Foo'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@32['Foo']
-}
-
-LazyJavaClassDescriptor@33['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
-}
-
-LazyJavaClassDescriptor@35['UnsupportedOperationException'] {
-    constructors = ArrayList@36[4] { JavaConstructorDescriptor@37['<init>'], JavaConstructorDescriptor@38['<init>'], JavaConstructorDescriptor@39['<init>'], ... } // through LazyJavaClassMemberScope@40
-    defaultType = JetTypeImpl@41['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@42['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@28['Bar'] {
-    parameters = ArrayList@43[empty]
-    supertypes = ArrayList@44[1] { JetTypeImpl@45['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['Exception'] {
-    parameters = ArrayList@46[empty]
-    supertypes = ArrayList@47[1] { LazyJavaClassifierType@48['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@32['Foo'] {
-    parameters = ArrayList@49[1] { LazyJavaTypeParameterDescriptor@50['T'] }
-}
-
-LazyJavaClassTypeConstructor@34['RuntimeException'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@42['UnsupportedOperationException'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['RuntimeException'] }
-}
-
-LazyJavaClassifierType@57['CharSequence'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@59['CharSequence']
-    memberScope = DeserializedClassMemberScope@60
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['CharSequence'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@59['CharSequence']
-    memberScope = DeserializedClassMemberScope@60
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@53['Exception'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Exception']
-}
-
-LazyJavaClassifierType@68['Foo'] {
-    arguments = ArrayList@69[1] { LazyStarProjection@70 }
-    classifier = JavaClassImpl@71['Foo']
-    nullable = 'false': Boolean@61
-    typeConstructor = LazyJavaClassTypeConstructor@32['Foo']
-}
-
-LazyJavaClassifierType@72['Foo'] {
-    arguments = ArrayList@73[1] { LazyStarProjection@74 }
-    classifier = JavaClassImpl@71['Foo']
-    nullable = 'true': Boolean@65
-    typeConstructor = LazyJavaClassTypeConstructor@32['Foo']
-}
-
-LazyJavaClassifierType@75['Object'] {
-    classifier = JavaClassImpl@76['Object']
-    typeConstructor = DeserializedClassTypeConstructor@77
-}
-
-LazyJavaClassifierType@56['RuntimeException'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
-}
-
-LazyJavaClassifierType@80['String'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['String']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@84['String'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['String']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@87['String'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@82['String']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@89['String'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@86['String']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@83
-}
-
-LazyJavaClassifierType@91['Throwable'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@93['Throwable']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@95['Throwable'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['Throwable']
-    nullable = 'false': Boolean@61
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@98['Throwable'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@97['Throwable']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@100['Throwable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@93['Throwable']
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@48['Throwable'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaPackageFragmentProvider@104 {
-    packageFragments('<root>': FqName@105) = LazyJavaPackageFragment@106['<root>']
-    packageFragments('Bar': FqName@107) = null
-    packageFragments('BarImpl': FqName@108) = null
-    packageFragments('CharSequence': FqName@109) = null
-    packageFragments('Foo': FqName@110) = null
-    packageFragments('java': FqName@111) = LazyJavaPackageFragment@112['java']
-    packageFragments('java.lang': FqName@113) = LazyJavaPackageFragment@114['lang']
-    packageFragments('java.lang.Bar': FqName@115) = null
-    packageFragments('java.lang.CharSequence': FqName@116) = null
-    packageFragments('java.lang.Foo': FqName@117) = null
-    packageFragments('kotlin': FqName@118) = null
-    packageFragments('kotlin.Bar': FqName@119) = null
-    packageFragments('kotlin.CharSequence': FqName@120) = null
-    packageFragments('kotlin.Foo': FqName@121) = null
-    packageFragments('kotlin.io': FqName@122) = null
-    packageFragments('kotlin.jvm': FqName@123) = null
-    topLevelClasses(JavaClassImpl@124['Bar']) = LazyJavaClassDescriptor@0['Bar']
-    topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@29['Exception']
-    topLevelClasses(JavaClassImpl@125['Foo']) = LazyJavaClassDescriptor@31['Foo']
-    topLevelClasses(JavaClassImpl@79['RuntimeException']) = LazyJavaClassDescriptor@33['RuntimeException']
-    topLevelClasses(JavaClassImpl@126['UnsupportedOperationException']) = LazyJavaClassDescriptor@35['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@106['<root>'] {
-    classes('Bar': Name@127) = LazyJavaClassDescriptor@0['Bar'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('CharSequence': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Foo': Name@130) = LazyJavaClassDescriptor@31['Foo'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('UnsupportedOperationException': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('UnsupportedOperationException': Name@131) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@128
-}
-
-LazyJavaPackageFragment@112['java'] {
-    classes('lang': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('lang': Name@136) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@135
-}
-
-LazyJavaPackageFragment@114['lang'] {
-    classes('UnsupportedOperationException': Name@131) = LazyJavaClassDescriptor@35['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('UnsupportedOperationException': Name@131) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@139 // through LazyPackageFragmentScopeForJavaPackage@138
-}
-
-LazyJavaTypeParameterDescriptor@50['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-    upperBounds = LinkedHashSet@141[1] { DelegatingFlexibleType@142 }
-    upperBoundsAsType = DelegatingFlexibleType@142
-}
-
-LazyJavaTypeParameterResolver@143 {
-    resolve(JavaTypeParameterImpl@144['T']) = LazyJavaTypeParameterDescriptor@50['T']
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-null {
-    <name not found> = ArrayList@150[4] { ResolutionCandidate@147, ResolutionCandidate@148, ResolutionCandidate@149, ... }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
deleted file mode 100644
index f26431dac63..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-LazyJavaClassDescriptor@0['Bar'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('baz': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['baz'] } // through LazyJavaStaticClassScope@6
-    functions('baz': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('baz': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('baz': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('baz': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bar']
-}
-
-LazyJavaClassTypeConstructor@11['Bar'] {
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['Object'] {
-    classifier = JavaClassImpl@15['Object']
-    typeConstructor = DeserializedClassTypeConstructor@16
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('<root>': FqName@18) = LazyJavaPackageFragment@19['<root>']
-    packageFragments('Bar': FqName@20) = null
-    packageFragments('foo': FqName@21) = LazyJavaPackageFragment@22['foo']
-    packageFragments('foo.Bar': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.Bar': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.Bar': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-    topLevelClasses(JavaClassImpl@33['Bar']) = LazyJavaClassDescriptor@0['Bar']
-}
-
-LazyJavaPackageFragment@22['foo'] {
-    classes('Bar': Name@34) = LazyJavaClassDescriptor@0['Bar'] // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@27['lang'] {
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log b/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
deleted file mode 100644
index 70fc2b8d71c..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
+++ /dev/null
@@ -1,508 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['MyJavaClass']
-    <name not found> = JetTypeImpl@2['MyJavaClass']
-    <name not found> = JetTypeImpl@2['MyJavaClass']
-    <name not found> = JetTypeImpl@3['NestedClass']
-    <name not found> = JetTypeImpl@3['NestedClass']
-    <name not found> = JetTypeImpl@3['NestedClass']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@4['MyJavaClass'] {
-    constructors = ArrayList@5[1] { JavaConstructorDescriptor@6['<init>'] } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@2['MyJavaClass']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@7
-    functionTypeForSamInterface = null
-    functions('NestedClass': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    functions('NestedClass': Name@9) = EmptyList@10[empty] // through LazyJavaStaticClassScope@11
-    functions('staticMethod': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['staticMethod'] } // through LazyJavaStaticClassScope@11
-    functions('staticMethod': Name@12) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@7
-    nestedClasses('NestedClass': Name@18) = LazyJavaClassDescriptor@19['NestedClass'] // through LazyJavaClassMemberScope@7
-    nestedClasses('staticMethod': Name@12) = null // through LazyJavaClassMemberScope@7
-    properties('NestedClass': Name@18) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    properties('NestedClass': Name@18) = EmptyList@10[empty] // through LazyJavaStaticClassScope@11
-    properties('staticMethod': Name@12) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    properties('staticMethod': Name@12) = EmptyList@10[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@20['MyJavaClass']
-}
-
-LazyJavaClassDescriptor@19['NestedClass'] {
-    constructors = ArrayList@21[1] { JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@3['NestedClass']
-    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@23
-    functionTypeForSamInterface = null
-    functions('staticMethodOfNested': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@27['staticMethodOfNested'] } // through LazyJavaStaticClassScope@28
-    functions('staticMethodOfNested': Name@25) = EmptyList@10[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaStaticClassScope@28
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@23
-    nestedClasses('staticMethodOfNested': Name@25) = null // through LazyJavaClassMemberScope@23
-    properties('staticMethodOfNested': Name@25) = EmptyList@10[empty] // through LazyJavaClassMemberScope@23
-    properties('staticMethodOfNested': Name@25) = EmptyList@10[empty] // through LazyJavaStaticClassScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@32['NestedClass']
-}
-
-LazyJavaClassTypeConstructor@20['MyJavaClass'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassTypeConstructor@32['NestedClass'] {
-    parameters = ArrayList@36[empty]
-    supertypes = ArrayList@37[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassifierType@38['Object'] {
-    classifier = JavaClassImpl@39['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('MyJavaClass': FqName@46) = null
-    packageFragments('a': FqName@47) = LazyJavaPackageFragment@48['a']
-    packageFragments('a.MyJavaClass': FqName@49) = null
-    packageFragments('a.c': FqName@50) = null
-    packageFragments('a.c.MyJavaClass': FqName@51) = null
-    packageFragments('a.c.mc1': FqName@52) = null
-    packageFragments('a.c.x': FqName@53) = null
-    packageFragments('a.c.y': FqName@54) = null
-    packageFragments('a.c.z': FqName@55) = null
-    packageFragments('a.mc': FqName@56) = null
-    packageFragments('a.x': FqName@57) = null
-    packageFragments('a.y': FqName@58) = null
-    packageFragments('a.z': FqName@59) = null
-    packageFragments('b': FqName@60) = null
-    packageFragments('b.MyJavaClass': FqName@61) = null
-    packageFragments('b.mc1': FqName@62) = null
-    packageFragments('b.x': FqName@63) = null
-    packageFragments('b.y': FqName@64) = null
-    packageFragments('b.z': FqName@65) = null
-    packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
-    packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
-    packageFragments('java.lang.MyJavaClass': FqName@70) = null
-    packageFragments('kotlin': FqName@71) = null
-    packageFragments('kotlin.MyJavaClass': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    topLevelClasses(JavaClassImpl@75['MyJavaClass']) = LazyJavaClassDescriptor@4['MyJavaClass']
-}
-
-LazyJavaPackageFragment@48['a'] {
-    classes('MyJavaClass': Name@76) = LazyJavaClassDescriptor@4['MyJavaClass'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('MyJavaClass': Name@79) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@69['lang'] {
-    classes('MyJavaClass': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('MyJavaClass': Name@85) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
deleted file mode 100644
index f20e9959719..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
+++ /dev/null
@@ -1,147 +0,0 @@
-LazyJavaClassDescriptor@0['Bar'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('doSmth': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['doSmth'] } // through LazyJavaStaticClassScope@6
-    functions('doSmth': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('doSmth': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('doSmth': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('doSmth': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Bar']
-}
-
-LazyJavaClassDescriptor@12['Foo'] {
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaStaticClassScope@16
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@14
-    nestedClasses('Bar': Name@18) = LazyJavaClassDescriptor@0['Bar'] // through LazyJavaClassMemberScope@14
-    properties('Bar': Name@18) = EmptyList@7[empty] // through LazyJavaClassMemberScope@14
-    properties('Bar': Name@18) = EmptyList@7[empty] // through LazyJavaStaticClassScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@19['Foo']
-}
-
-LazyJavaClassTypeConstructor@11['Bar'] {
-    supertypes = ArrayList@20[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassTypeConstructor@19['Foo'] {
-    supertypes = ArrayList@22[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassifierType@23['Object'] {
-    classifier = JavaClassImpl@24['Object']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@26['Object'] {
-    classifier = JavaClassImpl@27['Object']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Array': FqName@31) = null
-    packageFragments('String': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.Array': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('javaPackage': FqName@39) = LazyJavaPackageFragment@40['javaPackage']
-    packageFragments('javaPackage.Foo': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Array': FqName@43) = null
-    packageFragments('kotlin.String': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    topLevelClasses(JavaClassImpl@47['Foo']) = LazyJavaClassDescriptor@12['Foo']
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('Array': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('String': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('javaPackage': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@40['javaPackage'] {
-    classes('Foo': Name@57) = LazyJavaClassDescriptor@12['Foo'] // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@36['lang'] {
-    classes('javaPackage': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
deleted file mode 100644
index 60b8065a005..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
+++ /dev/null
@@ -1,114 +0,0 @@
-LazyJavaClassDescriptor@0['JavaClass'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('method': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['method'] } // through LazyJavaStaticClassScope@6
-    functions('method': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('field': Name@11) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('method': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('field': Name@11) = ArrayList@12[1] { JavaPropertyDescriptor@13['field'] } // through LazyJavaStaticClassScope@6
-    properties('field': Name@11) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('method': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('method': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@14['JavaClass']
-}
-
-LazyJavaClassTypeConstructor@14['JavaClass'] {
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
-}
-
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('JavaClass': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.JavaClass': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.JavaClass': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = null
-    packageFragments('kotlin.jvm': FqName@40) = null
-    packageFragments('test': FqName@41) = LazyJavaPackageFragment@42['test']
-    packageFragments('test.JavaClass': FqName@43) = null
-    topLevelClasses(JavaClassImpl@44['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@48) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@35['lang'] {
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@42['test'] {
-    classes('JavaClass': Name@51) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
deleted file mode 100644
index 167c646e76f..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DelegatingFlexibleType@1
-}
-
-LazyJavaClassDescriptor@2['Bad'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
-}
-
-LazyJavaClassDescriptor@4['X'] {
-    defaultType = JetTypeImpl@5['X']
-    enumEntryIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@7
-    functions('foo': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['foo'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@7
-    nestedClasses('foo': Name@8) = null // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['X']
-}
-
-LazyJavaClassTypeConstructor@3['Bad'] {
-    parameters = ArrayList@15[1] { LazyJavaTypeParameterDescriptor@16['T'] }
-}
-
-LazyJavaClassTypeConstructor@14['X'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { JetTypeImpl@19['Any'] }
-}
-
-LazyJavaClassifierType@20['Bad'] {
-    arguments = ArrayList@21[1] { LazyStarProjection@22 }
-    classifier = JavaClassImpl@23['Bad']
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
-}
-
-LazyJavaClassifierType@25['Bad'] {
-    arguments = ArrayList@26[1] { LazyStarProjection@27 }
-    classifier = JavaClassImpl@23['Bad']
-    nullable = 'true': Boolean@28
-    typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
-}
-
-LazyJavaClassifierType@29['Bad'] {
-    arguments = ArrayList@30[1] { TypeProjectionImpl@31 }
-    classifier = JavaClassImpl@32['Bad']
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
-}
-
-LazyJavaClassifierType@33['Bad'] {
-    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
-    classifier = JavaClassImpl@32['Bad']
-    nullable = 'true': Boolean@28
-    typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
-}
-
-LazyJavaClassifierType@36['Object'] {
-    classifier = JavaClassImpl@37['Object']
-    typeConstructor = DeserializedClassTypeConstructor@38
-}
-
-LazyJavaPackageFragmentProvider@39 {
-    packageFragments('<root>': FqName@40) = LazyJavaPackageFragment@41['<root>']
-    packageFragments('X': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.X': FqName@47) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.X': FqName@49) = null
-    packageFragments('kotlin.io': FqName@50) = null
-    packageFragments('kotlin.jvm': FqName@51) = null
-    topLevelClasses(JavaClassImpl@23['Bad']) = LazyJavaClassDescriptor@2['Bad']
-    topLevelClasses(JavaClassImpl@52['X']) = LazyJavaClassDescriptor@4['X']
-}
-
-LazyJavaPackageFragment@41['<root>'] {
-    classes('X': Name@53) = LazyJavaClassDescriptor@4['X'] // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaTypeParameterDescriptor@16['T'] {
-    upperBounds = LinkedHashSet@61[1] { DelegatingFlexibleType@62 }
-    upperBoundsAsType = DelegatingFlexibleType@62
-}
-
-LazyJavaTypeParameterResolver@63 {
-    resolve(JavaTypeParameterImpl@64['T']) = LazyJavaTypeParameterDescriptor@16['T']
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@70 }
-}
diff --git a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
deleted file mode 100644
index cfb459d6112..00000000000
--- a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
+++ /dev/null
@@ -1,157 +0,0 @@
-LazyJavaClassDescriptor@0['Observable'] {
-    allDescriptors = ArrayList@1[3] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'] } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[2] { JavaConstructorDescriptor@7['<init>'], SamAdapterConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@9['Observable<1>']
-    enumEntryIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@4['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@16) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@19) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@20) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@23) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@26['Observable']
-}
-
-LazyJavaClassDescriptor@27['OnSubscribe'] {
-    functionTypeForSamInterface = JetTypeImpl@28['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['OnSubscribe']
-}
-
-LazyJavaClassTypeConstructor@26['Observable'] {
-    parameters = ArrayList@31[1] { LazyJavaTypeParameterDescriptor@32['T'] }
-    supertypes = ArrayList@33[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['OnSubscribe'] {
-    parameters = ArrayList@35[1] { LazyJavaTypeParameterDescriptor@36['T'] }
-    supertypes = ArrayList@37[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassifierType@38['Object'] {
-    classifier = JavaClassImpl@39['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaClassifierType@43['OnSubscribe<T>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['OnSubscribe']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@48
-    typeConstructor = LazyJavaClassTypeConstructor@30['OnSubscribe']
-}
-
-LazyJavaClassifierType@49['OnSubscribe<T>'] {
-    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
-    classifier = JavaClassImpl@46['OnSubscribe']
-    memberScope = SubstitutingScope@52
-    nullable = 'true': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@30['OnSubscribe']
-}
-
-LazyJavaClassifierType@54['T'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['T']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@58['T'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['T']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@61['T'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@60['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@63['T'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@56['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaPackageFragmentProvider@65 {
-    packageFragments('<root>': FqName@66) = LazyJavaPackageFragment@67['<root>']
-    packageFragments('K': FqName@68) = null
-    packageFragments('Observable': FqName@69) = null
-    packageFragments('String': FqName@70) = null
-    packageFragments('j': FqName@71) = LazyJavaPackageFragment@72['j']
-    packageFragments('j.Observable': FqName@73) = null
-    packageFragments('j.String': FqName@74) = null
-    packageFragments('java': FqName@75) = LazyJavaPackageFragment@76['java']
-    packageFragments('java.lang': FqName@77) = LazyJavaPackageFragment@78['lang']
-    packageFragments('java.lang.Observable': FqName@79) = null
-    packageFragments('java.lang.String': FqName@80) = null
-    packageFragments('kotlin': FqName@81) = null
-    packageFragments('kotlin.Observable': FqName@82) = null
-    packageFragments('kotlin.String': FqName@83) = null
-    packageFragments('kotlin.io': FqName@84) = null
-    packageFragments('kotlin.jvm': FqName@85) = null
-    topLevelClasses(JavaClassImpl@86['Observable']) = LazyJavaClassDescriptor@0['Observable']
-    topLevelClasses(JavaClassImpl@46['OnSubscribe']) = LazyJavaClassDescriptor@27['OnSubscribe']
-}
-
-LazyJavaPackageFragment@67['<root>'] {
-    classes('Observable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('j': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('j': Name@92) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@72['j'] {
-    classes('Observable': Name@87) = LazyJavaClassDescriptor@0['Observable'] // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@76['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaTypeParameterDescriptor@32['T'] {
-    defaultType = JetTypeImpl@99['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    upperBounds = LinkedHashSet@100[1] { NullableType@101 }
-}
-
-LazyJavaTypeParameterDescriptor@36['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@102
-}
-
-LazyJavaTypeParameterResolver@103 {
-    resolve(JavaTypeParameterImpl@104['T']) = LazyJavaTypeParameterDescriptor@32['T']
-}
-
-LazyJavaTypeParameterResolver@105 {
-    resolve(JavaTypeParameterImpl@106['T']) = LazyJavaTypeParameterDescriptor@36['T']
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-null {
-    <name not found> = ArrayList@112[2] { ResolutionCandidate@109, ResolutionCandidate@111 }
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
deleted file mode 100644
index 088854376b4..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
+++ /dev/null
@@ -1,1642 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    functions('addAll': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['addAll'] } // through LazyJavaClassMemberScope@5
-    functions('clear': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['clear'] } // through LazyJavaClassMemberScope@5
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@17['AbstractList'] {
-    defaultType = JetTypeImpl@18['AbstractList<1>']
-    functions('add': Name@19) = ArrayList@20[2] { JavaMethodDescriptor@21['add'], JavaMethodDescriptor@22['add'] } // through LazyJavaClassMemberScope@23
-    functions('addAll': Name@24) = ArrayList@25[2] { JavaMethodDescriptor@26['addAll'], DeserializedSimpleFunctionDescriptor@27['addAll'] } // through LazyJavaClassMemberScope@23
-    functions('clear': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['clear'] } // through LazyJavaClassMemberScope@23
-    functions('get': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['get'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
-}
-
-LazyJavaClassDescriptor@37['AbstractMap'] {
-    defaultType = JetTypeImpl@38['AbstractMap<2>']
-    functions('get': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['get'] } // through LazyJavaClassMemberScope@42
-    functions('put': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['put'] } // through LazyJavaClassMemberScope@42
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@42
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@47['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@48['AbstractMap']
-}
-
-LazyJavaClassDescriptor@49['Appendable'] {
-    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@51
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@53['Appendable']
-}
-
-LazyJavaClassDescriptor@54['ArrayList'] {
-    constructors = ArrayList@55[3] { JavaConstructorDescriptor@56['<init>'], JavaConstructorDescriptor@57['<init>'], JavaConstructorDescriptor@58['<init>'] } // through LazyJavaClassMemberScope@59
-    defaultType = JetTypeImpl@60['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@61 // through LazyJavaClassMemberScope@59
-    functionTypeForSamInterface = null
-    functions('add': Name@62) = ArrayList@63[2] { JavaMethodDescriptor@64['add'], JavaMethodDescriptor@65['add'] } // through LazyJavaClassMemberScope@59
-    functions('addAll': Name@66) = ArrayList@67[2] { JavaMethodDescriptor@68['addAll'], JavaMethodDescriptor@69['addAll'] } // through LazyJavaClassMemberScope@59
-    functions('clear': Name@70) = ArrayList@71[1] { JavaMethodDescriptor@72['clear'] } // through LazyJavaClassMemberScope@59
-    functions('get': Name@73) = ArrayList@74[1] { JavaMethodDescriptor@75['get'] } // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@59
-    nestedClassIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@59
-    nestedClasses('add': Name@62) = null // through LazyJavaClassMemberScope@59
-    nestedClasses('addAll': Name@66) = null // through LazyJavaClassMemberScope@59
-    nestedClasses('clear': Name@70) = null // through LazyJavaClassMemberScope@59
-    nestedClasses('get': Name@73) = null // through LazyJavaClassMemberScope@59
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@78['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@79['ArrayList']
-}
-
-LazyJavaClassDescriptor@80['AutoCloseable'] {
-    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@81
-    memberIndex = computeMemberIndex$1@82 // through LazyJavaClassMemberScope@81
-    typeConstructor = LazyJavaClassTypeConstructor@83['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@84['Closeable'] {
-    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@85
-    memberIndex = computeMemberIndex$1@86 // through LazyJavaClassMemberScope@85
-    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
-}
-
-LazyJavaClassDescriptor@88['FilterOutputStream'] {
-    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@89
-    memberIndex = computeMemberIndex$1@90 // through LazyJavaClassMemberScope@89
-    typeConstructor = LazyJavaClassTypeConstructor@91['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@92['HashMap'] {
-    constructors = ArrayList@93[4] { JavaConstructorDescriptor@94['<init>'], JavaConstructorDescriptor@95['<init>'], JavaConstructorDescriptor@96['<init>'], ... } // through LazyJavaClassMemberScope@97
-    defaultType = JetTypeImpl@98['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@99 // through LazyJavaClassMemberScope@97
-    functionTypeForSamInterface = null
-    functions('get': Name@100) = ArrayList@101[1] { JavaMethodDescriptor@102['get'] } // through LazyJavaClassMemberScope@97
-    functions('put': Name@103) = ArrayList@104[1] { JavaMethodDescriptor@105['put'] } // through LazyJavaClassMemberScope@97
-    memberIndex = computeMemberIndex$1@106 // through LazyJavaClassMemberScope@97
-    nestedClassIndex = LinkedHashMap@107 // through LazyJavaClassMemberScope@97
-    nestedClasses('get': Name@100) = null // through LazyJavaClassMemberScope@97
-    nestedClasses('put': Name@103) = null // through LazyJavaClassMemberScope@97
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@108['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@109['HashMap']
-}
-
-LazyJavaClassDescriptor@110['OutputStream'] {
-    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@111
-    memberIndex = computeMemberIndex$1@112 // through LazyJavaClassMemberScope@111
-    typeConstructor = LazyJavaClassTypeConstructor@113['OutputStream']
-}
-
-LazyJavaClassDescriptor@114['PrintStream'] {
-    defaultType = JetTypeImpl@115['PrintStream']
-    enumEntryIndex = LinkedHashMap@116 // through LazyJavaClassMemberScope@117
-    functions('println': Name@118) = ArrayList@119[10] { JavaMethodDescriptor@120['println'], JavaMethodDescriptor@121['println'], JavaMethodDescriptor@122['println'], ... } // through LazyJavaClassMemberScope@117
-    memberIndex = computeMemberIndex$1@123 // through LazyJavaClassMemberScope@117
-    nestedClassIndex = LinkedHashMap@124 // through LazyJavaClassMemberScope@117
-    nestedClasses('println': Name@118) = null // through LazyJavaClassMemberScope@117
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@125['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@126['PrintStream']
-}
-
-LazyJavaClassDescriptor@127['RandomAccess'] {
-    functions('add': Name@19) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('addAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('clear': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('get': Name@31) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    memberIndex = computeMemberIndex$1@129 // through LazyJavaClassMemberScope@128
-    typeConstructor = LazyJavaClassTypeConstructor@130['RandomAccess']
-}
-
-LazyJavaClassDescriptor@131['Serializable'] {
-    functions('add': Name@19) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('addAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('clear': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('get': Name@31) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('put': Name@43) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    memberIndex = computeMemberIndex$1@133 // through LazyJavaClassMemberScope@132
-    typeConstructor = LazyJavaClassTypeConstructor@134['Serializable']
-}
-
-LazyJavaClassDescriptor@135['System'] {
-    enumEntryIndex = LinkedHashMap@136 // through LazyJavaClassMemberScope@137
-    memberIndex = computeMemberIndex$1@138 // through LazyJavaClassMemberScope@137
-    memberIndex = computeMemberIndex$1@139 // through LazyJavaStaticClassScope@140
-    nestedClassIndex = LinkedHashMap@141 // through LazyJavaClassMemberScope@137
-    nestedClasses('out': Name@142) = null // through LazyJavaClassMemberScope@137
-    properties('out': Name@142) = ArrayList@143[1] { JavaPropertyDescriptor@144['out'] } // through LazyJavaStaticClassScope@140
-    properties('out': Name@142) = EmptyList@13[empty] // through LazyJavaClassMemberScope@137
-    typeConstructor = LazyJavaClassTypeConstructor@145['System']
-}
-
-LazyJavaClassTypeConstructor@16['AbstractCollection'] {
-    parameters = ArrayList@146[1] { LazyJavaTypeParameterDescriptor@147['E'] }
-    supertypes = ArrayList@148[1] { LazyJavaClassifierType@149['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@36['AbstractList'] {
-    parameters = ArrayList@150[1] { LazyJavaTypeParameterDescriptor@151['E'] }
-    supertypes = ArrayList@152[2] { LazyJavaClassifierType@153['AbstractCollection<E>'], LazyJavaClassifierType@154['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@48['AbstractMap'] {
-    parameters = ArrayList@155[2] { LazyJavaTypeParameterDescriptor@156['K'], LazyJavaTypeParameterDescriptor@157['V'] }
-    supertypes = ArrayList@158[1] { LazyJavaClassifierType@159['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@53['Appendable'] {
-    parameters = ArrayList@160[empty]
-    supertypes = ArrayList@161[1] { JetTypeImpl@162['Any'] }
-}
-
-LazyJavaClassTypeConstructor@79['ArrayList'] {
-    parameters = ArrayList@163[1] { LazyJavaTypeParameterDescriptor@164['E'] }
-    supertypes = ArrayList@165[5] { LazyJavaClassifierType@166['AbstractList<E>'], LazyJavaClassifierType@167['List<E>'], LazyJavaClassifierType@168['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@83['AutoCloseable'] {
-    parameters = ArrayList@169[empty]
-    supertypes = ArrayList@170[1] { JetTypeImpl@162['Any'] }
-}
-
-LazyJavaClassTypeConstructor@87['Closeable'] {
-    parameters = ArrayList@171[empty]
-    supertypes = ArrayList@172[1] { LazyJavaClassifierType@173['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@91['FilterOutputStream'] {
-    parameters = ArrayList@174[empty]
-    supertypes = ArrayList@175[1] { LazyJavaClassifierType@176['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@109['HashMap'] {
-    parameters = ArrayList@177[2] { LazyJavaTypeParameterDescriptor@178['K'], LazyJavaTypeParameterDescriptor@179['V'] }
-    supertypes = ArrayList@180[4] { LazyJavaClassifierType@181['AbstractMap<K, V>'], LazyJavaClassifierType@182['Map<K, V>'], LazyJavaClassifierType@183['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@113['OutputStream'] {
-    parameters = ArrayList@184[empty]
-    supertypes = ArrayList@185[1] { LazyJavaClassifierType@186['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@126['PrintStream'] {
-    parameters = ArrayList@187[empty]
-    supertypes = ArrayList@188[3] { LazyJavaClassifierType@189['FilterOutputStream'], LazyJavaClassifierType@190['Appendable'], LazyJavaClassifierType@191['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@130['RandomAccess'] {
-    parameters = ArrayList@192[empty]
-    supertypes = ArrayList@193[1] { JetTypeImpl@162['Any'] }
-}
-
-LazyJavaClassTypeConstructor@134['Serializable'] {
-    parameters = ArrayList@194[empty]
-    supertypes = ArrayList@195[1] { JetTypeImpl@162['Any'] }
-}
-
-LazyJavaClassTypeConstructor@145['System'] {
-    supertypes = ArrayList@196[1] { JetTypeImpl@162['Any'] }
-}
-
-LazyJavaClassifierType@153['AbstractCollection<E>'] {
-    arguments = ArrayList@197[1] { TypeProjectionImpl@198 }
-    classifier = JavaClassImpl@199['AbstractCollection']
-    memberScope = SubstitutingScope@200
-    nullable = 'false': Boolean@201
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
-}
-
-LazyJavaClassifierType@166['AbstractList<E>'] {
-    arguments = ArrayList@202[1] { TypeProjectionImpl@203 }
-    classifier = JavaClassImpl@204['AbstractList']
-    memberScope = SubstitutingScope@205
-    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
-}
-
-LazyJavaClassifierType@181['AbstractMap<K, V>'] {
-    arguments = ArrayList@206[2] { TypeProjectionImpl@207, TypeProjectionImpl@208 }
-    classifier = JavaClassImpl@209['AbstractMap']
-    memberScope = SubstitutingScope@210
-    typeConstructor = LazyJavaClassTypeConstructor@48['AbstractMap']
-}
-
-LazyJavaClassifierType@190['Appendable'] {
-    arguments = ArrayList@211[empty]
-    classifier = JavaClassImpl@212['Appendable']
-    memberScope = LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@53['Appendable']
-}
-
-LazyJavaClassifierType@173['AutoCloseable'] {
-    arguments = ArrayList@213[empty]
-    classifier = JavaClassImpl@214['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@81
-    typeConstructor = LazyJavaClassTypeConstructor@83['AutoCloseable']
-}
-
-LazyJavaClassifierType@215['Cloneable'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaClassImpl@217['Cloneable']
-    memberScope = DeserializedClassMemberScope@218
-    typeConstructor = DeserializedClassTypeConstructor@219
-}
-
-LazyJavaClassifierType@183['Cloneable'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@221['Cloneable']
-    memberScope = DeserializedClassMemberScope@218
-    typeConstructor = DeserializedClassTypeConstructor@219
-}
-
-LazyJavaClassifierType@191['Closeable'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaClassImpl@223['Closeable']
-    memberScope = LazyJavaClassMemberScope@85
-    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
-}
-
-LazyJavaClassifierType@186['Closeable'] {
-    arguments = ArrayList@224[empty]
-    classifier = JavaClassImpl@225['Closeable']
-    memberScope = LazyJavaClassMemberScope@85
-    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
-}
-
-LazyJavaClassifierType@226['Collection<? extends E>'] {
-    arguments = ArrayList@227[1] { TypeProjectionImpl@228 }
-    classifier = JavaClassImpl@229['Collection']
-    memberScope = SubstitutingScope@230
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@232['Collection<? extends E>'] {
-    arguments = ArrayList@233[1] { TypeProjectionImpl@234 }
-    classifier = JavaClassImpl@235['Collection']
-    memberScope = SubstitutingScope@236
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@237['Collection<? extends E>'] {
-    arguments = ArrayList@238[1] { TypeProjectionImpl@239 }
-    classifier = JavaClassImpl@240['Collection']
-    memberScope = SubstitutingScope@241
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@242['Collection<? extends E>'] {
-    arguments = ArrayList@243[1] { TypeProjectionImpl@244 }
-    classifier = JavaClassImpl@245['Collection']
-    memberScope = SubstitutingScope@246
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@247['Collection<? extends E>'] {
-    arguments = ArrayList@248[1] { TypeProjectionImpl@249 }
-    classifier = JavaClassImpl@250['Collection']
-    memberScope = SubstitutingScope@251
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@252['Collection<? extends E>'] {
-    arguments = ArrayList@253[1] { TypeProjectionImpl@254 }
-    classifier = JavaClassImpl@229['Collection']
-    memberScope = SubstitutingScope@255
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@257
-}
-
-LazyJavaClassifierType@258['Collection<? extends E>'] {
-    arguments = ArrayList@259[1] { TypeProjectionImpl@260 }
-    classifier = JavaClassImpl@235['Collection']
-    memberScope = SubstitutingScope@261
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@257
-}
-
-LazyJavaClassifierType@262['Collection<? extends E>'] {
-    arguments = ArrayList@263[1] { TypeProjectionImpl@264 }
-    classifier = JavaClassImpl@250['Collection']
-    memberScope = SubstitutingScope@265
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@257
-}
-
-LazyJavaClassifierType@266['Collection<? extends E>'] {
-    arguments = ArrayList@267[1] { TypeProjectionImpl@268 }
-    classifier = JavaClassImpl@240['Collection']
-    memberScope = SubstitutingScope@269
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@257
-}
-
-LazyJavaClassifierType@270['Collection<? extends E>'] {
-    arguments = ArrayList@271[1] { TypeProjectionImpl@272 }
-    classifier = JavaClassImpl@245['Collection']
-    memberScope = SubstitutingScope@273
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@257
-}
-
-LazyJavaClassifierType@149['Collection<E>'] {
-    arguments = ArrayList@274[1] { TypeProjectionImpl@275 }
-    classifier = JavaClassImpl@276['Collection']
-    memberScope = SubstitutingScope@277
-    typeConstructor = DeserializedClassTypeConstructor@231
-}
-
-LazyJavaClassifierType@278['E'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaTypeParameterImpl@280['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@282['E'] {
-    arguments = ArrayList@283[empty]
-    classifier = JavaTypeParameterImpl@284['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@285['E'] {
-    arguments = ArrayList@286[empty]
-    classifier = JavaTypeParameterImpl@287['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@288['E'] {
-    arguments = ArrayList@289[empty]
-    classifier = JavaTypeParameterImpl@290['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@292['E'] {
-    arguments = ArrayList@293[empty]
-    classifier = JavaTypeParameterImpl@294['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@296['E'] {
-    arguments = ArrayList@297[empty]
-    classifier = JavaTypeParameterImpl@298['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@299['E'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaTypeParameterImpl@301['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@302['E'] {
-    arguments = ArrayList@303[empty]
-    classifier = JavaTypeParameterImpl@304['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@305['E'] {
-    arguments = ArrayList@306[empty]
-    classifier = JavaTypeParameterImpl@307['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@308['E'] {
-    arguments = ArrayList@309[empty]
-    classifier = JavaTypeParameterImpl@310['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@311['E'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaTypeParameterImpl@313['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@314['E'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaTypeParameterImpl@316['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@317['E'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaTypeParameterImpl@319['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@320['E'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaTypeParameterImpl@322['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@323['E'] {
-    arguments = ArrayList@324[empty]
-    classifier = JavaTypeParameterImpl@325['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@326['E'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaTypeParameterImpl@328['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@329['E'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaTypeParameterImpl@331['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@332['E'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaTypeParameterImpl@334['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@335['E'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaTypeParameterImpl@337['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@338['E'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaTypeParameterImpl@340['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@341['E'] {
-    arguments = ArrayList@342[empty]
-    classifier = JavaTypeParameterImpl@343['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@344['E'] {
-    arguments = ArrayList@345[empty]
-    classifier = JavaTypeParameterImpl@346['E']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@347['E'] {
-    arguments = ArrayList@348[empty]
-    classifier = JavaTypeParameterImpl@340['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@349['E'] {
-    arguments = ArrayList@350[empty]
-    classifier = JavaTypeParameterImpl@304['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@351['E'] {
-    arguments = ArrayList@352[empty]
-    classifier = JavaTypeParameterImpl@298['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@353['E'] {
-    arguments = ArrayList@354[empty]
-    classifier = JavaTypeParameterImpl@319['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@355['E'] {
-    arguments = ArrayList@356[empty]
-    classifier = JavaTypeParameterImpl@343['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@357['E'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaTypeParameterImpl@301['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@359['E'] {
-    arguments = ArrayList@360[empty]
-    classifier = JavaTypeParameterImpl@325['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@361['E'] {
-    arguments = ArrayList@362[empty]
-    classifier = JavaTypeParameterImpl@310['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@363['E'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaTypeParameterImpl@290['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@365['E'] {
-    arguments = ArrayList@366[empty]
-    classifier = JavaTypeParameterImpl@287['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@367['E'] {
-    arguments = ArrayList@368[empty]
-    classifier = JavaTypeParameterImpl@346['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@369['E'] {
-    arguments = ArrayList@370[empty]
-    classifier = JavaTypeParameterImpl@322['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@371['E'] {
-    arguments = ArrayList@372[empty]
-    classifier = JavaTypeParameterImpl@284['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@373['E'] {
-    arguments = ArrayList@374[empty]
-    classifier = JavaTypeParameterImpl@313['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@375['E'] {
-    arguments = ArrayList@376[empty]
-    classifier = JavaTypeParameterImpl@334['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@377['E'] {
-    arguments = ArrayList@378[empty]
-    classifier = JavaTypeParameterImpl@337['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@379['E'] {
-    arguments = ArrayList@380[empty]
-    classifier = JavaTypeParameterImpl@294['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-}
-
-LazyJavaClassifierType@381['E'] {
-    arguments = ArrayList@382[empty]
-    classifier = JavaTypeParameterImpl@280['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@383['E'] {
-    arguments = ArrayList@384[empty]
-    classifier = JavaTypeParameterImpl@331['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@385['E'] {
-    arguments = ArrayList@386[empty]
-    classifier = JavaTypeParameterImpl@328['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@387['E'] {
-    arguments = ArrayList@388[empty]
-    classifier = JavaTypeParameterImpl@307['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-}
-
-LazyJavaClassifierType@389['E'] {
-    arguments = ArrayList@390[empty]
-    classifier = JavaTypeParameterImpl@316['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-}
-
-LazyJavaClassifierType@189['FilterOutputStream'] {
-    arguments = ArrayList@391[empty]
-    classifier = JavaClassImpl@392['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@89
-    typeConstructor = LazyJavaClassTypeConstructor@91['FilterOutputStream']
-}
-
-LazyJavaClassifierType@393['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@394
-}
-
-LazyJavaClassifierType@395['K'] {
-    arguments = ArrayList@396[empty]
-    classifier = JavaTypeParameterImpl@397['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-}
-
-LazyJavaClassifierType@399['K'] {
-    arguments = ArrayList@400[empty]
-    classifier = JavaTypeParameterImpl@401['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@403['K'] {
-    arguments = ArrayList@404[empty]
-    classifier = JavaTypeParameterImpl@405['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@406['K'] {
-    arguments = ArrayList@407[empty]
-    classifier = JavaTypeParameterImpl@408['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@409['K'] {
-    arguments = ArrayList@410[empty]
-    classifier = JavaTypeParameterImpl@411['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@412['K'] {
-    arguments = ArrayList@413[empty]
-    classifier = JavaTypeParameterImpl@414['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@415['K'] {
-    arguments = ArrayList@416[empty]
-    classifier = JavaTypeParameterImpl@417['K']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-}
-
-LazyJavaClassifierType@418['K'] {
-    arguments = ArrayList@419[empty]
-    classifier = JavaTypeParameterImpl@408['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@420['K'] {
-    arguments = ArrayList@421[empty]
-    classifier = JavaTypeParameterImpl@405['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@422['K'] {
-    arguments = ArrayList@423[empty]
-    classifier = JavaTypeParameterImpl@411['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@424['K'] {
-    arguments = ArrayList@425[empty]
-    classifier = JavaTypeParameterImpl@401['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@426['K'] {
-    arguments = ArrayList@427[empty]
-    classifier = JavaTypeParameterImpl@414['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-}
-
-LazyJavaClassifierType@428['K'] {
-    arguments = ArrayList@429[empty]
-    classifier = JavaTypeParameterImpl@397['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-}
-
-LazyJavaClassifierType@430['K'] {
-    arguments = ArrayList@431[empty]
-    classifier = JavaTypeParameterImpl@417['K']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-}
-
-LazyJavaClassifierType@154['List<E>'] {
-    arguments = ArrayList@432[1] { TypeProjectionImpl@433 }
-    classifier = JavaClassImpl@434['List']
-    memberScope = SubstitutingScope@435
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@436
-}
-
-LazyJavaClassifierType@167['List<E>'] {
-    arguments = ArrayList@437[1] { TypeProjectionImpl@438 }
-    classifier = JavaClassImpl@439['List']
-    memberScope = SubstitutingScope@440
-    typeConstructor = DeserializedClassTypeConstructor@436
-}
-
-LazyJavaClassifierType@441['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@442[2] { TypeProjectionImpl@443, TypeProjectionImpl@444 }
-    classifier = JavaClassImpl@445['Map']
-    memberScope = SubstitutingScope@446
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@447
-}
-
-LazyJavaClassifierType@448['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@449[2] { TypeProjectionImpl@450, TypeProjectionImpl@451 }
-    classifier = JavaClassImpl@445['Map']
-    memberScope = SubstitutingScope@452
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@453
-}
-
-LazyJavaClassifierType@182['Map<K, V>'] {
-    arguments = ArrayList@454[2] { TypeProjectionImpl@455, TypeProjectionImpl@456 }
-    classifier = JavaClassImpl@457['Map']
-    memberScope = SubstitutingScope@458
-    typeConstructor = DeserializedClassTypeConstructor@447
-}
-
-LazyJavaClassifierType@159['Map<K, V>'] {
-    arguments = ArrayList@459[2] { TypeProjectionImpl@460, TypeProjectionImpl@461 }
-    classifier = JavaClassImpl@462['Map']
-    memberScope = SubstitutingScope@463
-    typeConstructor = DeserializedClassTypeConstructor@447
-}
-
-LazyJavaClassifierType@464['Object'] {
-    arguments = ArrayList@465[empty]
-    classifier = JavaClassImpl@466['Object']
-    memberScope = DeserializedClassMemberScope@467
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@469['Object'] {
-    arguments = ArrayList@470[empty]
-    classifier = JavaClassImpl@471['Object']
-    memberScope = DeserializedClassMemberScope@467
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@472['Object'] {
-    arguments = ArrayList@473[empty]
-    classifier = JavaClassImpl@466['Object']
-    memberScope = DeserializedClassMemberScope@467
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@474['Object'] {
-    arguments = ArrayList@475[empty]
-    classifier = JavaClassImpl@471['Object']
-    memberScope = DeserializedClassMemberScope@467
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@476['Object'] {
-    arguments = ArrayList@477[empty]
-    classifier = JavaClassImpl@478['Object']
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@479['Object'] {
-    arguments = ArrayList@480[empty]
-    classifier = JavaClassImpl@478['Object']
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@481['Object'] {
-    classifier = JavaClassImpl@482['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@483['Object'] {
-    classifier = JavaClassImpl@484['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@485['Object'] {
-    classifier = JavaClassImpl@486['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@487['Object'] {
-    classifier = JavaClassImpl@488['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@489['Object'] {
-    classifier = JavaClassImpl@490['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@491['Object'] {
-    classifier = JavaClassImpl@492['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@493['Object'] {
-    classifier = JavaClassImpl@494['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@495['Object'] {
-    classifier = JavaClassImpl@496['Object']
-    typeConstructor = DeserializedClassTypeConstructor@468
-}
-
-LazyJavaClassifierType@176['OutputStream'] {
-    arguments = ArrayList@497[empty]
-    classifier = JavaClassImpl@498['OutputStream']
-    memberScope = LazyJavaClassMemberScope@111
-    typeConstructor = LazyJavaClassTypeConstructor@113['OutputStream']
-}
-
-LazyJavaClassifierType@499['PrintStream'] {
-    arguments = ArrayList@500[empty]
-    classifier = JavaClassImpl@501['PrintStream']
-    memberScope = LazyJavaClassMemberScope@117
-    nullable = 'false': Boolean@201
-    typeConstructor = LazyJavaClassTypeConstructor@126['PrintStream']
-}
-
-LazyJavaClassifierType@502['PrintStream'] {
-    arguments = ArrayList@503[empty]
-    classifier = JavaClassImpl@501['PrintStream']
-    nullable = 'true': Boolean@256
-    typeConstructor = LazyJavaClassTypeConstructor@126['PrintStream']
-}
-
-LazyJavaClassifierType@168['RandomAccess'] {
-    arguments = ArrayList@504[empty]
-    classifier = JavaClassImpl@505['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@128
-    nullable = 'false': Boolean@201
-    typeConstructor = LazyJavaClassTypeConstructor@130['RandomAccess']
-}
-
-LazyJavaClassifierType@506['Serializable'] {
-    arguments = ArrayList@507[empty]
-    classifier = JavaClassImpl@508['Serializable']
-    memberScope = LazyJavaClassMemberScope@132
-    typeConstructor = LazyJavaClassTypeConstructor@134['Serializable']
-}
-
-LazyJavaClassifierType@509['Serializable'] {
-    arguments = ArrayList@510[empty]
-    classifier = JavaClassImpl@511['Serializable']
-    memberScope = LazyJavaClassMemberScope@132
-    typeConstructor = LazyJavaClassTypeConstructor@134['Serializable']
-}
-
-LazyJavaClassifierType@512['String'] {
-    arguments = ArrayList@513[empty]
-    classifier = JavaClassImpl@514['String']
-    nullable = 'false': Boolean@201
-    typeConstructor = DeserializedClassTypeConstructor@515
-}
-
-LazyJavaClassifierType@516['String'] {
-    arguments = ArrayList@517[empty]
-    classifier = JavaClassImpl@514['String']
-    nullable = 'true': Boolean@256
-    typeConstructor = DeserializedClassTypeConstructor@515
-}
-
-LazyJavaClassifierType@518['V'] {
-    arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@520['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@522['V'] {
-    arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@524['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@525['V'] {
-    arguments = ArrayList@526[empty]
-    classifier = JavaTypeParameterImpl@527['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@529['V'] {
-    arguments = ArrayList@530[empty]
-    classifier = JavaTypeParameterImpl@531['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@532['V'] {
-    arguments = ArrayList@533[empty]
-    classifier = JavaTypeParameterImpl@534['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@535['V'] {
-    arguments = ArrayList@536[empty]
-    classifier = JavaTypeParameterImpl@537['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@538['V'] {
-    arguments = ArrayList@539[empty]
-    classifier = JavaTypeParameterImpl@540['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@541['V'] {
-    arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@543['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@544['V'] {
-    arguments = ArrayList@545[empty]
-    classifier = JavaTypeParameterImpl@546['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@547['V'] {
-    arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@549['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@550['V'] {
-    arguments = ArrayList@551[empty]
-    classifier = JavaTypeParameterImpl@552['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@553['V'] {
-    arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@527['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@555['V'] {
-    arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@543['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@557['V'] {
-    arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@534['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@559['V'] {
-    arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@540['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@561['V'] {
-    arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@549['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@563['V'] {
-    arguments = ArrayList@564[empty]
-    classifier = JavaTypeParameterImpl@531['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@565['V'] {
-    arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@524['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@567['V'] {
-    arguments = ArrayList@568[empty]
-    classifier = JavaTypeParameterImpl@537['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@569['V'] {
-    arguments = ArrayList@570[empty]
-    classifier = JavaTypeParameterImpl@546['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@571['V'] {
-    arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@552['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-}
-
-LazyJavaClassifierType@573['V'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@520['V']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaPackageFragmentProvider@575 {
-    packageFragments('<root>': FqName@576) = LazyJavaPackageFragment@577['<root>']
-    packageFragments('Array': FqName@578) = null
-    packageFragments('ArrayList': FqName@579) = null
-    packageFragments('Boolean': FqName@580) = null
-    packageFragments('Int': FqName@581) = null
-    packageFragments('List': FqName@582) = null
-    packageFragments('Map': FqName@583) = null
-    packageFragments('RandomAccess': FqName@584) = null
-    packageFragments('String': FqName@585) = null
-    packageFragments('System': FqName@586) = null
-    packageFragments('Unit': FqName@587) = null
-    packageFragments('java': FqName@588) = LazyJavaPackageFragment@589['java']
-    packageFragments('java.io': FqName@590) = LazyJavaPackageFragment@591['io']
-    packageFragments('java.lang': FqName@592) = LazyJavaPackageFragment@593['lang']
-    packageFragments('java.lang.Array': FqName@594) = null
-    packageFragments('java.lang.ArrayList': FqName@595) = null
-    packageFragments('java.lang.Boolean': FqName@596) = null
-    packageFragments('java.lang.Int': FqName@597) = null
-    packageFragments('java.lang.List': FqName@598) = null
-    packageFragments('java.lang.Map': FqName@599) = null
-    packageFragments('java.lang.RandomAccess': FqName@600) = null
-    packageFragments('java.lang.String': FqName@601) = null
-    packageFragments('java.lang.System': FqName@602) = null
-    packageFragments('java.lang.Unit': FqName@603) = null
-    packageFragments('java.util': FqName@604) = LazyJavaPackageFragment@605['util']
-    packageFragments('java.util.Array': FqName@606) = null
-    packageFragments('java.util.ArrayList': FqName@607) = null
-    packageFragments('java.util.Boolean': FqName@608) = null
-    packageFragments('java.util.Int': FqName@609) = null
-    packageFragments('java.util.List': FqName@610) = null
-    packageFragments('java.util.Map': FqName@611) = null
-    packageFragments('java.util.RandomAccess': FqName@612) = null
-    packageFragments('java.util.String': FqName@613) = null
-    packageFragments('java.util.System': FqName@614) = null
-    packageFragments('java.util.Unit': FqName@615) = null
-    packageFragments('kotlin': FqName@616) = null
-    packageFragments('kotlin.Array': FqName@617) = null
-    packageFragments('kotlin.ArrayList': FqName@618) = null
-    packageFragments('kotlin.Boolean': FqName@619) = null
-    packageFragments('kotlin.Int': FqName@620) = null
-    packageFragments('kotlin.List': FqName@621) = null
-    packageFragments('kotlin.Map': FqName@622) = null
-    packageFragments('kotlin.RandomAccess': FqName@623) = null
-    packageFragments('kotlin.String': FqName@624) = null
-    packageFragments('kotlin.System': FqName@625) = null
-    packageFragments('kotlin.Unit': FqName@626) = null
-    packageFragments('kotlin.io': FqName@627) = null
-    packageFragments('kotlin.jvm': FqName@628) = null
-    packageFragments('kotlin1': FqName@629) = null
-    packageFragments('kotlin1.Array': FqName@630) = null
-    packageFragments('kotlin1.ArrayList': FqName@631) = null
-    packageFragments('kotlin1.Boolean': FqName@632) = null
-    packageFragments('kotlin1.Int': FqName@633) = null
-    packageFragments('kotlin1.List': FqName@634) = null
-    packageFragments('kotlin1.Map': FqName@635) = null
-    packageFragments('kotlin1.RandomAccess': FqName@636) = null
-    packageFragments('kotlin1.String': FqName@637) = null
-    packageFragments('kotlin1.System': FqName@638) = null
-    packageFragments('kotlin1.Unit': FqName@639) = null
-    topLevelClasses(JavaClassImpl@199['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@204['AbstractList']) = LazyJavaClassDescriptor@17['AbstractList']
-    topLevelClasses(JavaClassImpl@209['AbstractMap']) = LazyJavaClassDescriptor@37['AbstractMap']
-    topLevelClasses(JavaClassImpl@212['Appendable']) = LazyJavaClassDescriptor@49['Appendable']
-    topLevelClasses(JavaClassImpl@640['ArrayList']) = LazyJavaClassDescriptor@54['ArrayList']
-    topLevelClasses(JavaClassImpl@214['AutoCloseable']) = LazyJavaClassDescriptor@80['AutoCloseable']
-    topLevelClasses(JavaClassImpl@223['Closeable']) = LazyJavaClassDescriptor@84['Closeable']
-    topLevelClasses(JavaClassImpl@392['FilterOutputStream']) = LazyJavaClassDescriptor@88['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@641['HashMap']) = LazyJavaClassDescriptor@92['HashMap']
-    topLevelClasses(JavaClassImpl@642['List']) = LazyJavaClassDescriptor@643['List']
-    topLevelClasses(JavaClassImpl@644['Map']) = LazyJavaClassDescriptor@645['Map']
-    topLevelClasses(JavaClassImpl@498['OutputStream']) = LazyJavaClassDescriptor@110['OutputStream']
-    topLevelClasses(JavaClassImpl@501['PrintStream']) = LazyJavaClassDescriptor@114['PrintStream']
-    topLevelClasses(JavaClassImpl@505['RandomAccess']) = LazyJavaClassDescriptor@127['RandomAccess']
-    topLevelClasses(JavaClassImpl@511['Serializable']) = LazyJavaClassDescriptor@131['Serializable']
-    topLevelClasses(JavaClassImpl@646['System']) = LazyJavaClassDescriptor@135['System']
-}
-
-LazyJavaPackageFragment@589['java'] {
-    classes('lang': Name@647) = null // through LazyPackageFragmentScopeForJavaPackage@648
-    classes('util': Name@649) = null // through LazyPackageFragmentScopeForJavaPackage@648
-    deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@648
-    functions('lang': Name@651) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@648
-    functions('util': Name@652) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@648
-    memberIndex = computeMemberIndex$1@653 // through LazyPackageFragmentScopeForJavaPackage@648
-}
-
-LazyJavaPackageFragment@593['lang'] {
-    classes('ArrayList': Name@654) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('HashMap': Name@656) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('System': Name@657) = LazyJavaClassDescriptor@135['System'] // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('equals': Name@658) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('test': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('ArrayList': Name@654) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('HashMap': Name@656) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('equals': Name@658) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('test': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    memberIndex = computeMemberIndex$1@660 // through LazyPackageFragmentScopeForJavaPackage@655
-}
-
-LazyJavaPackageFragment@605['util'] {
-    classes('Array': Name@661) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('ArrayList': Name@663) = LazyJavaClassDescriptor@54['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('Boolean': Name@664) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('HashMap': Name@656) = LazyJavaClassDescriptor@92['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('Int': Name@665) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('List': Name@666) = LazyJavaClassDescriptor@643['List'] // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('Map': Name@667) = LazyJavaClassDescriptor@645['Map'] // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('RandomAccess': Name@668) = LazyJavaClassDescriptor@127['RandomAccess'] // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('String': Name@669) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('System': Name@657) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('Unit': Name@670) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('equals': Name@658) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    classes('test': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@662
-    deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@662
-    functions('ArrayList': Name@654) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
-    functions('HashMap': Name@656) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
-    functions('equals': Name@658) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
-    functions('test': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
-    memberIndex = computeMemberIndex$1@671 // through LazyPackageFragmentScopeForJavaPackage@662
-}
-
-LazyJavaTypeParameterDescriptor@164['E'] {
-    defaultType = JetTypeImpl@672['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-    upperBounds = LinkedHashSet@673[1] { NullableType@674 }
-    upperBoundsAsType = NullableType@674
-}
-
-LazyJavaTypeParameterDescriptor@151['E'] {
-    defaultType = JetTypeImpl@675['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@291
-    upperBounds = LinkedHashSet@676[1] { NullableType@677 }
-    upperBoundsAsType = NullableType@677
-}
-
-LazyJavaTypeParameterDescriptor@147['E'] {
-    defaultType = JetTypeImpl@678['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
-    upperBounds = LinkedHashSet@679[1] { NullableType@680 }
-    upperBoundsAsType = NullableType@680
-}
-
-LazyJavaTypeParameterDescriptor@178['K'] {
-    defaultType = JetTypeImpl@681['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-    upperBounds = LinkedHashSet@682[1] { NullableType@683 }
-    upperBoundsAsType = NullableType@683
-}
-
-LazyJavaTypeParameterDescriptor@156['K'] {
-    defaultType = JetTypeImpl@684['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-    upperBounds = LinkedHashSet@685[1] { NullableType@686 }
-    upperBoundsAsType = NullableType@686
-}
-
-LazyJavaTypeParameterDescriptor@157['V'] {
-    defaultType = JetTypeImpl@687['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@528
-    upperBounds = LinkedHashSet@688[1] { NullableType@689 }
-    upperBoundsAsType = NullableType@689
-}
-
-LazyJavaTypeParameterDescriptor@179['V'] {
-    defaultType = JetTypeImpl@690['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-    upperBounds = LinkedHashSet@691[1] { NullableType@692 }
-    upperBoundsAsType = NullableType@692
-}
-
-LazyJavaTypeParameterResolver@693 {
-    resolve(JavaTypeParameterImpl@301['E']) = LazyJavaTypeParameterDescriptor@151['E']
-}
-
-LazyJavaTypeParameterResolver@694 {
-    resolve(JavaTypeParameterImpl@325['E']) = LazyJavaTypeParameterDescriptor@147['E']
-}
-
-LazyJavaTypeParameterResolver@695 {
-    resolve(JavaTypeParameterImpl@696['E']) = LazyJavaTypeParameterDescriptor@164['E']
-}
-
-LazyJavaTypeParameterResolver@697 {
-    resolve(JavaTypeParameterImpl@307['E']) = null
-}
-
-LazyJavaTypeParameterResolver@698 {
-    resolve(JavaTypeParameterImpl@316['E']) = null
-}
-
-LazyJavaTypeParameterResolver@699 {
-    resolve(JavaTypeParameterImpl@343['E']) = null
-}
-
-LazyJavaTypeParameterResolver@700 {
-    resolve(JavaTypeParameterImpl@331['E']) = null
-}
-
-LazyJavaTypeParameterResolver@701 {
-    resolve(JavaTypeParameterImpl@340['E']) = null
-}
-
-LazyJavaTypeParameterResolver@702 {
-    resolve(JavaTypeParameterImpl@294['E']) = null
-}
-
-LazyJavaTypeParameterResolver@703 {
-    resolve(JavaTypeParameterImpl@346['E']) = null
-}
-
-LazyJavaTypeParameterResolver@704 {
-    resolve(JavaTypeParameterImpl@304['E']) = null
-}
-
-LazyJavaTypeParameterResolver@705 {
-    resolve(JavaTypeParameterImpl@322['E']) = null
-}
-
-LazyJavaTypeParameterResolver@706 {
-    resolve(JavaTypeParameterImpl@310['E']) = null
-}
-
-LazyJavaTypeParameterResolver@707 {
-    resolve(JavaTypeParameterImpl@337['E']) = null
-}
-
-LazyJavaTypeParameterResolver@708 {
-    resolve(JavaTypeParameterImpl@709['K']) = LazyJavaTypeParameterDescriptor@178['K']
-    resolve(JavaTypeParameterImpl@710['V']) = LazyJavaTypeParameterDescriptor@179['V']
-}
-
-LazyJavaTypeParameterResolver@711 {
-    resolve(JavaTypeParameterImpl@712['K']) = LazyJavaTypeParameterDescriptor@156['K']
-    resolve(JavaTypeParameterImpl@713['V']) = LazyJavaTypeParameterDescriptor@157['V']
-}
-
-LazyJavaTypeParameterResolver@714 {
-    resolve(JavaTypeParameterImpl@408['K']) = null
-    resolve(JavaTypeParameterImpl@537['V']) = null
-}
-
-LazyJavaTypeParameterResolver@715 {
-    resolve(JavaTypeParameterImpl@397['K']) = null
-    resolve(JavaTypeParameterImpl@552['V']) = null
-}
-
-LazyJavaTypeParameterResolver@716 {
-    resolve(JavaTypeParameterImpl@549['V']) = null
-}
-
-LazyJavaTypeParameterResolver@717 {
-    resolve(JavaTypeParameterImpl@546['V']) = null
-}
-
-ResolutionTaskHolder@718 {
-    <name not found> = ArrayList@719[10] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[10] { ResolutionCandidate@725, ResolutionCandidate@726, ResolutionCandidate@727, ... }
-}
-
-ResolutionTaskHolder@728 {
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@730 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@732 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@733 {
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@735 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@736 {
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@738 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@739 {
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@741 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@742 {
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@744 }
-}
-
-ResolutionTaskHolder@745 {
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@747 }
-}
-
-ResolutionTaskHolder@748 {
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@750 }
-}
-
-ResolutionTaskHolder@751 {
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@753 }
-}
-
-ResolutionTaskHolder@754 {
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@756 }
-}
-
-ResolutionTaskHolder@757 {
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@759 }
-}
-
-ResolutionTaskHolder@760 {
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@762 }
-}
-
-ResolutionTaskHolder@763 {
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@765 }
-}
-
-ResolutionTaskHolder@766 {
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@768 }
-}
-
-ResolutionTaskHolder@769 {
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@771 }
-}
-
-ResolutionTaskHolder@772 {
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@774 }
-}
-
-ResolutionTaskHolder@775 {
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@777 }
-}
-
-ResolutionTaskHolder@778 {
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@780 }
-}
-
-ResolutionTaskHolder@781 {
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@783 }
-}
-
-ResolutionTaskHolder@784 {
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@786 }
-}
-
-ResolutionTaskHolder@787 {
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@789 }
-}
-
-ResolutionTaskHolder@790 {
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@792 }
-}
-
-ResolutionTaskHolder@793 {
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@795 }
-}
-
-ResolutionTaskHolder@796 {
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@798 }
-}
-
-ResolutionTaskHolder@799 {
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@801 }
-}
-
-ResolutionTaskHolder@802 {
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@804 }
-}
-
-ResolutionTaskHolder@805 {
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@807 }
-}
-
-ResolutionTaskHolder@808 {
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@810 }
-}
-
-ResolutionTaskHolder@811 {
-    <name not found> = ArrayList@812[2] { ResolutionCandidate@813, ResolutionCandidate@814 }
-}
-
-ResolutionTaskHolder@815 {
-    <name not found> = ArrayList@816[2] { ResolutionCandidate@817, ResolutionCandidate@818 }
-}
-
-ResolutionTaskHolder@819 {
-    <name not found> = ArrayList@820[2] { ResolutionCandidate@821, ResolutionCandidate@822 }
-}
-
-ResolutionTaskHolder@823 {
-    <name not found> = ArrayList@824[2] { ResolutionCandidate@825, ResolutionCandidate@826 }
-}
-
-ResolutionTaskHolder@827 {
-    <name not found> = ArrayList@828[3] { ResolutionCandidate@829, ResolutionCandidate@830, ResolutionCandidate@831 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@832 {
-    <name not found> = ArrayList@833[3] { ResolutionCandidate@834, ResolutionCandidate@835, ResolutionCandidate@836 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@837 {
-    <name not found> = ArrayList@838[3] { ResolutionCandidate@839, ResolutionCandidate@840, ResolutionCandidate@841 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@842 {
-    <name not found> = ArrayList@843[3] { ResolutionCandidate@844, ResolutionCandidate@845, ResolutionCandidate@846 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@847 {
-    <name not found> = ArrayList@848[4] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@852 {
-    <name not found> = ArrayList@853[4] { ResolutionCandidate@854, ResolutionCandidate@855, ResolutionCandidate@856, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@857 {
-    <name not found> = ArrayList@858[8] { ResolutionCandidate@859, ResolutionCandidate@860, ResolutionCandidate@861, ... }
-}
-
-ResolutionTaskHolder@862 {
-    <name not found> = ArrayList@863[8] { ResolutionCandidate@864, ResolutionCandidate@865, ResolutionCandidate@866, ... }
-}
-
-ResolutionTaskHolder@867 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@868 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-null {
-    <name not found> = ArrayList@869[10] { ResolutionCandidate@725, ResolutionCandidate@726, ResolutionCandidate@727, ... }
-    <name not found> = ArrayList@870[10] { ResolutionCandidate@720, ResolutionCandidate@721, ResolutionCandidate@722, ... }
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@801 }
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@780 }
-    <name not found> = ArrayList@873[1] { ResolutionCandidate@771 }
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@786 }
-    <name not found> = ArrayList@875[1] { ResolutionCandidate@762 }
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@789 }
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@747 }
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@807 }
-    <name not found> = ArrayList@879[1] { ResolutionCandidate@750 }
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@798 }
-    <name not found> = ArrayList@881[1] { ResolutionCandidate@756 }
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@759 }
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@753 }
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@795 }
-    <name not found> = ArrayList@885[1] { ResolutionCandidate@804 }
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@735 }
-    <name not found> = ArrayList@887[1] { ResolutionCandidate@741 }
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@768 }
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@777 }
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@744 }
-    <name not found> = ArrayList@891[1] { ResolutionCandidate@783 }
-    <name not found> = ArrayList@892[1] { ResolutionCandidate@774 }
-    <name not found> = ArrayList@893[1] { ResolutionCandidate@730 }
-    <name not found> = ArrayList@894[1] { ResolutionCandidate@732 }
-    <name not found> = ArrayList@895[1] { ResolutionCandidate@738 }
-    <name not found> = ArrayList@896[1] { ResolutionCandidate@792 }
-    <name not found> = ArrayList@897[1] { ResolutionCandidate@810 }
-    <name not found> = ArrayList@898[1] { ResolutionCandidate@765 }
-    <name not found> = ArrayList@899[2] { ResolutionCandidate@821, ResolutionCandidate@822 }
-    <name not found> = ArrayList@900[2] { ResolutionCandidate@825, ResolutionCandidate@826 }
-    <name not found> = ArrayList@901[2] { ResolutionCandidate@813, ResolutionCandidate@814 }
-    <name not found> = ArrayList@902[2] { ResolutionCandidate@817, ResolutionCandidate@818 }
-    <name not found> = ArrayList@903[3] { ResolutionCandidate@829, ResolutionCandidate@830, ResolutionCandidate@831 }
-    <name not found> = ArrayList@904[3] { ResolutionCandidate@844, ResolutionCandidate@845, ResolutionCandidate@846 }
-    <name not found> = ArrayList@905[3] { ResolutionCandidate@839, ResolutionCandidate@840, ResolutionCandidate@841 }
-    <name not found> = ArrayList@906[3] { ResolutionCandidate@834, ResolutionCandidate@835, ResolutionCandidate@836 }
-    <name not found> = ArrayList@907[4] { ResolutionCandidate@849, ResolutionCandidate@850, ResolutionCandidate@851, ... }
-    <name not found> = ArrayList@908[4] { ResolutionCandidate@854, ResolutionCandidate@855, ResolutionCandidate@856, ... }
-    <name not found> = ArrayList@909[8] { ResolutionCandidate@864, ResolutionCandidate@865, ResolutionCandidate@866, ... }
-    <name not found> = ArrayList@910[8] { ResolutionCandidate@859, ResolutionCandidate@860, ResolutionCandidate@861, ... }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
deleted file mode 100644
index 316e9e18411..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
+++ /dev/null
@@ -1,379 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@6['AbstractList'] {
-    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassDescriptor@10['ArrayList'] {
-    constructors = ArrayList@11[3] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
-    functionTypeForSamInterface = null
-    functions('clone': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['clone'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@15
-    nestedClasses('clone': Name@18) = null // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['ArrayList']
-}
-
-LazyJavaClassDescriptor@25['RandomAccess'] {
-    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['RandomAccess']
-}
-
-LazyJavaClassDescriptor@29['Serializable'] {
-    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['Serializable']
-}
-
-LazyJavaClassTypeConstructor@5['AbstractCollection'] {
-    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    supertypes = ArrayList@35[1] { LazyJavaClassifierType@36['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@9['AbstractList'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['E'] }
-    supertypes = ArrayList@39[2] { LazyJavaClassifierType@40['AbstractCollection<E>'], LazyJavaClassifierType@41['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@24['ArrayList'] {
-    parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['E'] }
-    supertypes = ArrayList@44[5] { LazyJavaClassifierType@45['AbstractList<E>'], LazyJavaClassifierType@46['List<E>'], LazyJavaClassifierType@47['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@28['RandomAccess'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@32['Serializable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassifierType@40['AbstractCollection<E>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@55['AbstractCollection']
-    memberScope = SubstitutingScope@56
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
-}
-
-LazyJavaClassifierType@45['AbstractList<E>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@59['AbstractList']
-    memberScope = SubstitutingScope@60
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
-}
-
-LazyJavaClassifierType@61['Cloneable'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@63['Cloneable']
-    memberScope = DeserializedClassMemberScope@64
-    typeConstructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaClassifierType@66['Collection<? extends E>'] {
-    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    classifier = JavaClassImpl@69['Collection']
-    memberScope = SubstitutingScope@70
-    nullable = 'false': Boolean@71
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@73['Collection<? extends E>'] {
-    arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
-    classifier = JavaClassImpl@69['Collection']
-    memberScope = SubstitutingScope@76
-    nullable = 'true': Boolean@77
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@36['Collection<E>'] {
-    arguments = ArrayList@79[1] { TypeProjectionImpl@80 }
-    classifier = JavaClassImpl@81['Collection']
-    memberScope = SubstitutingScope@82
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@89['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@92['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@93['E'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-}
-
-LazyJavaClassifierType@97['E'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-}
-
-LazyJavaClassifierType@107['E'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@89['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@92['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@95['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-}
-
-LazyJavaClassifierType@46['List<E>'] {
-    arguments = ArrayList@121[1] { TypeProjectionImpl@122 }
-    classifier = JavaClassImpl@123['List']
-    memberScope = SubstitutingScope@124
-    typeConstructor = DeserializedClassTypeConstructor@125
-}
-
-LazyJavaClassifierType@41['List<E>'] {
-    arguments = ArrayList@126[1] { TypeProjectionImpl@127 }
-    classifier = JavaClassImpl@128['List']
-    memberScope = SubstitutingScope@129
-    typeConstructor = DeserializedClassTypeConstructor@125
-}
-
-LazyJavaClassifierType@130['Object'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@132['Object']
-    memberScope = DeserializedClassMemberScope@133
-    nullable = 'false': Boolean@71
-    typeConstructor = DeserializedClassTypeConstructor@134
-}
-
-LazyJavaClassifierType@135['Object'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@132['Object']
-    memberScope = DeserializedClassMemberScope@133
-    nullable = 'true': Boolean@77
-    typeConstructor = DeserializedClassTypeConstructor@134
-}
-
-LazyJavaClassifierType@137['Object'] {
-    classifier = JavaClassImpl@138['Object']
-    typeConstructor = DeserializedClassTypeConstructor@134
-}
-
-LazyJavaClassifierType@139['Object'] {
-    classifier = JavaClassImpl@140['Object']
-    typeConstructor = DeserializedClassTypeConstructor@134
-}
-
-LazyJavaClassifierType@141['Object'] {
-    classifier = JavaClassImpl@142['Object']
-    typeConstructor = DeserializedClassTypeConstructor@134
-}
-
-LazyJavaClassifierType@47['RandomAccess'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['RandomAccess']
-}
-
-LazyJavaClassifierType@145['Serializable'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@147['Serializable']
-    memberScope = LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@148 {
-    packageFragments('<root>': FqName@149) = LazyJavaPackageFragment@150['<root>']
-    packageFragments('Any': FqName@151) = null
-    packageFragments('Array': FqName@152) = null
-    packageFragments('ArrayList': FqName@153) = null
-    packageFragments('Int': FqName@154) = null
-    packageFragments('String': FqName@155) = null
-    packageFragments('java': FqName@156) = LazyJavaPackageFragment@157['java']
-    packageFragments('java.io': FqName@158) = LazyJavaPackageFragment@159['io']
-    packageFragments('java.lang': FqName@160) = LazyJavaPackageFragment@161['lang']
-    packageFragments('java.lang.Any': FqName@162) = null
-    packageFragments('java.lang.Array': FqName@163) = null
-    packageFragments('java.lang.ArrayList': FqName@164) = null
-    packageFragments('java.lang.Int': FqName@165) = null
-    packageFragments('java.lang.String': FqName@166) = null
-    packageFragments('java.util': FqName@167) = LazyJavaPackageFragment@168['util']
-    packageFragments('java.util.Any': FqName@169) = null
-    packageFragments('java.util.Array': FqName@170) = null
-    packageFragments('java.util.ArrayList': FqName@171) = null
-    packageFragments('java.util.Int': FqName@172) = null
-    packageFragments('java.util.String': FqName@173) = null
-    packageFragments('kotlin': FqName@174) = null
-    packageFragments('kotlin.Any': FqName@175) = null
-    packageFragments('kotlin.Array': FqName@176) = null
-    packageFragments('kotlin.ArrayList': FqName@177) = null
-    packageFragments('kotlin.Int': FqName@178) = null
-    packageFragments('kotlin.String': FqName@179) = null
-    packageFragments('kotlin.io': FqName@180) = null
-    packageFragments('kotlin.jvm': FqName@181) = null
-    packageFragments('kotlin1': FqName@182) = null
-    packageFragments('kotlin1.Any': FqName@183) = null
-    packageFragments('kotlin1.Array': FqName@184) = null
-    packageFragments('kotlin1.ArrayList': FqName@185) = null
-    packageFragments('kotlin1.Int': FqName@186) = null
-    packageFragments('kotlin1.String': FqName@187) = null
-    topLevelClasses(JavaClassImpl@55['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@59['AbstractList']) = LazyJavaClassDescriptor@6['AbstractList']
-    topLevelClasses(JavaClassImpl@188['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
-    topLevelClasses(JavaClassImpl@144['RandomAccess']) = LazyJavaClassDescriptor@25['RandomAccess']
-    topLevelClasses(JavaClassImpl@147['Serializable']) = LazyJavaClassDescriptor@29['Serializable']
-}
-
-LazyJavaPackageFragment@157['java'] {
-    classes('lang': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('util': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('lang': Name@193) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('util': Name@194) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@190
-}
-
-LazyJavaPackageFragment@161['lang'] {
-    classes('ArrayList': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('ArrayList': Name@196) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaPackageFragment@168['util'] {
-    classes('Any': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Array': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('ArrayList': Name@202) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Int': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('String': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('ArrayList': Name@196) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
-}
-
-LazyJavaTypeParameterDescriptor@43['E'] {
-    defaultType = JetTypeImpl@206['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
-    upperBounds = LinkedHashSet@207[1] { NullableType@208 }
-}
-
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-}
-
-LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@210['E']) = LazyJavaTypeParameterDescriptor@38['E']
-}
-
-LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@34['E']
-}
-
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['E']) = LazyJavaTypeParameterDescriptor@43['E']
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@228[3] { ResolutionCandidate@223, ResolutionCandidate@224, ResolutionCandidate@225 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
deleted file mode 100644
index cf9498d241e..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
+++ /dev/null
@@ -1,486 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('toArray': Name@2) = ArrayList@3[2] { JavaMethodDescriptor@4['toArray'], JavaMethodDescriptor@5['toArray'] } // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@8['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@10['AbstractList'] {
-    defaultType = JetTypeImpl@11['AbstractList<1>']
-    functions('toArray': Name@2) = ArrayList@12[2] { JavaMethodDescriptor@13['toArray'], JavaMethodDescriptor@14['toArray'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassDescriptor@18['ArrayList'] {
-    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@24['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
-    functionTypeForSamInterface = null
-    functions('toArray': Name@26) = ArrayList@27[2] { JavaMethodDescriptor@28['toArray'], JavaMethodDescriptor@29['toArray'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@23
-    nestedClasses('toArray': Name@26) = null // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['ArrayList']
-}
-
-LazyJavaClassDescriptor@34['RandomAccess'] {
-    functions('toArray': Name@2) = EmptyList@35[empty] // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['RandomAccess']
-}
-
-LazyJavaClassDescriptor@39['Serializable'] {
-    functions('toArray': Name@2) = EmptyList@35[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['Serializable']
-}
-
-LazyJavaClassTypeConstructor@9['AbstractCollection'] {
-    parameters = ArrayList@43[1] { LazyJavaTypeParameterDescriptor@44['E'] }
-    supertypes = ArrayList@45[1] { LazyJavaClassifierType@46['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@17['AbstractList'] {
-    parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
-    supertypes = ArrayList@49[2] { LazyJavaClassifierType@50['AbstractCollection<E>'], LazyJavaClassifierType@51['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@33['ArrayList'] {
-    parameters = ArrayList@52[1] { LazyJavaTypeParameterDescriptor@53['E'] }
-    supertypes = ArrayList@54[5] { LazyJavaClassifierType@55['AbstractList<E>'], LazyJavaClassifierType@56['List<E>'], LazyJavaClassifierType@57['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@38['RandomAccess'] {
-    parameters = ArrayList@58[empty]
-    supertypes = ArrayList@59[1] { JetTypeImpl@60['Any'] }
-}
-
-LazyJavaClassTypeConstructor@42['Serializable'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { JetTypeImpl@60['Any'] }
-}
-
-LazyJavaClassifierType@50['AbstractCollection<E>'] {
-    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
-    classifier = JavaClassImpl@65['AbstractCollection']
-    memberScope = SubstitutingScope@66
-    nullable = 'false': Boolean@67
-    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractCollection']
-}
-
-LazyJavaClassifierType@55['AbstractList<E>'] {
-    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
-    classifier = JavaClassImpl@70['AbstractList']
-    memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassifierType@72['Cloneable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Cloneable']
-    memberScope = DeserializedClassMemberScope@75
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Collection<? extends E>'] {
-    arguments = ArrayList@78[1] { TypeProjectionImpl@79 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@81
-    nullable = 'false': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@83['Collection<? extends E>'] {
-    arguments = ArrayList@84[1] { TypeProjectionImpl@85 }
-    classifier = JavaClassImpl@80['Collection']
-    memberScope = SubstitutingScope@86
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@88
-}
-
-LazyJavaClassifierType@46['Collection<E>'] {
-    arguments = ArrayList@89[1] { TypeProjectionImpl@90 }
-    classifier = JavaClassImpl@91['Collection']
-    memberScope = SubstitutingScope@92
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@93['E'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['E']
-    memberScope = LazyScopeAdapter@96
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@118['E'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@95['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@120['E'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@122['E'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@107['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@117['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@126['E'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@51['List<E>'] {
-    arguments = ArrayList@132[1] { TypeProjectionImpl@133 }
-    classifier = JavaClassImpl@134['List']
-    memberScope = SubstitutingScope@135
-    nullable = 'false': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@56['List<E>'] {
-    arguments = ArrayList@137[1] { TypeProjectionImpl@138 }
-    classifier = JavaClassImpl@139['List']
-    memberScope = SubstitutingScope@140
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@141['Object'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@143['Object']
-    memberScope = DeserializedClassMemberScope@144
-    nullable = 'false': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@146['Object'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@148['Object']
-    memberScope = DeserializedClassMemberScope@144
-    nullable = 'false': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@149['Object'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@148['Object']
-    memberScope = DeserializedClassMemberScope@144
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@151['Object'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@143['Object']
-    memberScope = DeserializedClassMemberScope@144
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@153['Object'] {
-    classifier = JavaClassImpl@154['Object']
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@155['Object'] {
-    classifier = JavaClassImpl@156['Object']
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@157['Object'] {
-    classifier = JavaClassImpl@158['Object']
-    typeConstructor = DeserializedClassTypeConstructor@145
-}
-
-LazyJavaClassifierType@57['RandomAccess'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaClassImpl@160['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['RandomAccess']
-}
-
-LazyJavaClassifierType@161['Serializable'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@163['Serializable']
-    memberScope = LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['Serializable']
-}
-
-LazyJavaClassifierType@164['T'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@166['T']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
-}
-
-LazyJavaClassifierType@168['T'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@170['T']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
-}
-
-LazyJavaClassifierType@171['T'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaTypeParameterImpl@173['T']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
-}
-
-LazyJavaClassifierType@175['T'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaTypeParameterImpl@177['T']
-    nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
-}
-
-LazyJavaClassifierType@178['T'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@170['T']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
-}
-
-LazyJavaClassifierType@180['T'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@166['T']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
-}
-
-LazyJavaClassifierType@182['T'] {
-    arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@177['T']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
-}
-
-LazyJavaClassifierType@184['T'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@173['T']
-    nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
-}
-
-LazyJavaPackageFragmentProvider@186 {
-    packageFragments('<root>': FqName@187) = LazyJavaPackageFragment@188['<root>']
-    packageFragments('Array': FqName@189) = null
-    packageFragments('ArrayList': FqName@190) = null
-    packageFragments('Int': FqName@191) = null
-    packageFragments('String': FqName@192) = null
-    packageFragments('java': FqName@193) = LazyJavaPackageFragment@194['java']
-    packageFragments('java.io': FqName@195) = LazyJavaPackageFragment@196['io']
-    packageFragments('java.lang': FqName@197) = LazyJavaPackageFragment@198['lang']
-    packageFragments('java.lang.Array': FqName@199) = null
-    packageFragments('java.lang.ArrayList': FqName@200) = null
-    packageFragments('java.lang.Int': FqName@201) = null
-    packageFragments('java.lang.String': FqName@202) = null
-    packageFragments('java.util': FqName@203) = LazyJavaPackageFragment@204['util']
-    packageFragments('java.util.Array': FqName@205) = null
-    packageFragments('java.util.ArrayList': FqName@206) = null
-    packageFragments('java.util.Int': FqName@207) = null
-    packageFragments('java.util.String': FqName@208) = null
-    packageFragments('kotlin': FqName@209) = null
-    packageFragments('kotlin.Array': FqName@210) = null
-    packageFragments('kotlin.ArrayList': FqName@211) = null
-    packageFragments('kotlin.Int': FqName@212) = null
-    packageFragments('kotlin.String': FqName@213) = null
-    packageFragments('kotlin.io': FqName@214) = null
-    packageFragments('kotlin.jvm': FqName@215) = null
-    packageFragments('kotlin1': FqName@216) = null
-    packageFragments('kotlin1.Array': FqName@217) = null
-    packageFragments('kotlin1.ArrayList': FqName@218) = null
-    packageFragments('kotlin1.Int': FqName@219) = null
-    packageFragments('kotlin1.String': FqName@220) = null
-    topLevelClasses(JavaClassImpl@65['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@10['AbstractList']
-    topLevelClasses(JavaClassImpl@221['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
-    topLevelClasses(JavaClassImpl@160['RandomAccess']) = LazyJavaClassDescriptor@34['RandomAccess']
-    topLevelClasses(JavaClassImpl@163['Serializable']) = LazyJavaClassDescriptor@39['Serializable']
-}
-
-LazyJavaPackageFragment@194['java'] {
-    classes('lang': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@223
-    classes('util': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@223
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@223
-    functions('lang': Name@226) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@223
-    functions('util': Name@227) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@223
-    memberIndex = computeMemberIndex$1@228 // through LazyPackageFragmentScopeForJavaPackage@223
-}
-
-LazyJavaPackageFragment@198['lang'] {
-    classes('Array': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('ArrayList': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('Array': Name@229) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('ArrayList': Name@231) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@230
-}
-
-LazyJavaPackageFragment@204['util'] {
-    classes('Array': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('ArrayList': Name@235) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Int': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('String': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('Array': Name@229) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('ArrayList': Name@231) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    memberIndex = computeMemberIndex$1@238 // through LazyPackageFragmentScopeForJavaPackage@234
-}
-
-LazyJavaTypeParameterDescriptor@53['E'] {
-    defaultType = JetTypeImpl@239['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@240[1] { NullableType@241 }
-}
-
-LazyJavaTypeParameterDescriptor@44['E'] {
-    defaultType = JetTypeImpl@242['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaTypeParameterDescriptor@48['E'] {
-    defaultType = JetTypeImpl@243['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaTypeParameterDescriptor@244['T'] {
-    defaultType = JetTypeImpl@245['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@174
-    upperBounds = LinkedHashSet@246[1] { NullableType@247 }
-    upperBoundsAsType = NullableType@247
-}
-
-LazyJavaTypeParameterDescriptor@248['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
-    upperBounds = LinkedHashSet@249[1] { NullableType@250 }
-    upperBoundsAsType = NullableType@250
-}
-
-LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@53['E']
-}
-
-LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@48['E']
-}
-
-LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@44['E']
-}
-
-LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@258['T']) = LazyJavaTypeParameterDescriptor@244['T']
-}
-
-LazyJavaTypeParameterResolver@259 {
-    resolve(JavaTypeParameterImpl@260['T']) = LazyJavaTypeParameterDescriptor@248['T']
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[2] { ResolutionCandidate@269, ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[3] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@278[2] { ResolutionCandidate@269, ResolutionCandidate@270 }
-    <name not found> = ArrayList@279[3] { ResolutionCandidate@273, ResolutionCandidate@274, ResolutionCandidate@275 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
deleted file mode 100644
index 863b43b5cd5..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
+++ /dev/null
@@ -1,929 +0,0 @@
-LazyJavaClassDescriptor@0['AutoCloseable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@2['ClassLoader'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@3['ClassLoader']
-}
-
-LazyJavaClassDescriptor@4['Connection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassDescriptor@6['Driver'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassDescriptor@8['DriverManager'] {
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functionTypeForSamInterface = null
-    functions('getConnection': Name@11) = ArrayList@12[4] { JavaMethodDescriptor@13['getConnection'], JavaMethodDescriptor@14['getConnection'], JavaMethodDescriptor@15['getConnection'], ... } // through LazyJavaStaticClassScope@16
-    functions('getConnection': Name@11) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    functions('getDriver': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['getDriver'] } // through LazyJavaStaticClassScope@16
-    functions('getDriver': Name@18) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    functions('getDrivers': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['getDrivers'] } // through LazyJavaStaticClassScope@16
-    functions('getDrivers': Name@21) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    functions('registerDriver': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['registerDriver'] } // through LazyJavaStaticClassScope@16
-    functions('registerDriver': Name@24) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaStaticClassScope@16
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@10
-    nestedClasses('getConnection': Name@11) = null // through LazyJavaClassMemberScope@10
-    nestedClasses('getDriver': Name@18) = null // through LazyJavaClassMemberScope@10
-    nestedClasses('getDrivers': Name@21) = null // through LazyJavaClassMemberScope@10
-    nestedClasses('registerDriver': Name@24) = null // through LazyJavaClassMemberScope@10
-    properties('getConnection': Name@11) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    properties('getConnection': Name@11) = EmptyList@17[empty] // through LazyJavaStaticClassScope@16
-    properties('getDriver': Name@18) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    properties('getDriver': Name@18) = EmptyList@17[empty] // through LazyJavaStaticClassScope@16
-    properties('getDrivers': Name@21) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    properties('getDrivers': Name@21) = EmptyList@17[empty] // through LazyJavaStaticClassScope@16
-    properties('registerDriver': Name@24) = EmptyList@17[empty] // through LazyJavaClassMemberScope@10
-    properties('registerDriver': Name@24) = EmptyList@17[empty] // through LazyJavaStaticClassScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@30['DriverManager']
-}
-
-LazyJavaClassDescriptor@31['Enumeration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@32['Enumeration']
-}
-
-LazyJavaClassDescriptor@33['Properties'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
-}
-
-LazyJavaClassTypeConstructor@1['AutoCloseable'] {
-    supertypes = ArrayList@35[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3['ClassLoader'] {
-    parameters = ArrayList@37[empty]
-}
-
-LazyJavaClassTypeConstructor@5['Connection'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { LazyJavaClassifierType@40['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@7['Driver'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['DriverManager'] {
-    supertypes = ArrayList@43[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@32['Enumeration'] {
-    parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
-    supertypes = ArrayList@46[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Properties'] {
-    parameters = ArrayList@47[empty]
-    supertypes = ArrayList@48[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassifierType@40['AutoCloseable'] {
-    classifier = JavaClassImpl@49['AutoCloseable']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AutoCloseable']
-}
-
-LazyJavaClassifierType@50['ClassLoader'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@52['ClassLoader']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@3['ClassLoader']
-}
-
-LazyJavaClassifierType@54['ClassLoader'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaClassImpl@52['ClassLoader']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@3['ClassLoader']
-}
-
-LazyJavaClassifierType@57['Connection'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@59['Connection']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@60['Connection'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaClassImpl@62['Connection']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@63['Connection'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@65['Connection']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@66['Connection'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['Connection']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@69['Connection'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@65['Connection']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@71['Connection'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@68['Connection']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@73['Connection'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@59['Connection']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@75['Connection'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@62['Connection']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
-}
-
-LazyJavaClassifierType@77['Driver'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['Driver']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@80['Driver'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['Driver']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@83['Driver'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['Driver']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@86['Driver'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['Driver']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@89['Driver'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@85['Driver']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@91['Driver'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@79['Driver']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@93['Driver'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@82['Driver']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@95['Driver'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@88['Driver']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
-}
-
-LazyJavaClassifierType@97['Enumeration<Driver>'] {
-    arguments = ArrayList@98[1] { TypeProjectionImpl@99 }
-    classifier = JavaClassImpl@100['Enumeration']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@32['Enumeration']
-}
-
-LazyJavaClassifierType@101['Enumeration<Driver>'] {
-    arguments = ArrayList@102[1] { TypeProjectionImpl@103 }
-    classifier = JavaClassImpl@100['Enumeration']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@32['Enumeration']
-}
-
-LazyJavaClassifierType@104['Hashtable<Object, Object>'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@105
-}
-
-LazyJavaClassifierType@106['Object'] {
-    classifier = JavaClassImpl@107['Object']
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@109['Object'] {
-    classifier = JavaClassImpl@110['Object']
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@111['Object'] {
-    classifier = JavaClassImpl@112['Object']
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@113['Object'] {
-    classifier = JavaClassImpl@114['Object']
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@115['Properties'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@117['Properties']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
-}
-
-LazyJavaClassifierType@118['Properties'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@120['Properties']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
-}
-
-LazyJavaClassifierType@121['Properties'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@117['Properties']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
-}
-
-LazyJavaClassifierType@123['Properties'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@120['Properties']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
-}
-
-LazyJavaClassifierType@125['String'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@129['String'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@131['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@132['String'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@134['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@135['String'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@137['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@138['String'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@140['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@141['String'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@143['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@144['String'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['String']
-    nullable = 'false': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@147['String'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@134['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@149['String'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@127['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@151['String'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@143['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@153['String'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@140['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@155['String'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaClassImpl@146['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@157['String'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@137['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@159['String'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@131['String']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@128
-}
-
-LazyJavaClassifierType@161['Wrapper'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@162
-}
-
-LazyJavaPackageFragmentProvider@163 {
-    packageFragments('<root>': FqName@164) = LazyJavaPackageFragment@165['<root>']
-    packageFragments('DriverManager': FqName@166) = null
-    packageFragments('String': FqName@167) = null
-    packageFragments('java': FqName@168) = LazyJavaPackageFragment@169['java']
-    packageFragments('java.lang': FqName@170) = LazyJavaPackageFragment@171['lang']
-    packageFragments('java.lang.DriverManager': FqName@172) = null
-    packageFragments('java.lang.String': FqName@173) = null
-    packageFragments('java.sql': FqName@174) = LazyJavaPackageFragment@175['sql']
-    packageFragments('java.sql.Connection': FqName@176) = null
-    packageFragments('java.sql.Driver': FqName@177) = null
-    packageFragments('java.sql.DriverManager': FqName@178) = null
-    packageFragments('java.util': FqName@179) = LazyJavaPackageFragment@180['util']
-    packageFragments('java.util.Enumeration': FqName@181) = null
-    packageFragments('java.util.Properties': FqName@182) = null
-    packageFragments('kotlin': FqName@183) = null
-    packageFragments('kotlin.DriverManager': FqName@184) = null
-    packageFragments('kotlin.String': FqName@185) = null
-    packageFragments('kotlin.io': FqName@186) = null
-    packageFragments('kotlin.jvm': FqName@187) = null
-    topLevelClasses(JavaClassImpl@49['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@52['ClassLoader']) = LazyJavaClassDescriptor@2['ClassLoader']
-    topLevelClasses(JavaClassImpl@65['Connection']) = LazyJavaClassDescriptor@4['Connection']
-    topLevelClasses(JavaClassImpl@188['Driver']) = LazyJavaClassDescriptor@6['Driver']
-    topLevelClasses(JavaClassImpl@189['DriverManager']) = LazyJavaClassDescriptor@8['DriverManager']
-    topLevelClasses(JavaClassImpl@190['Enumeration']) = LazyJavaClassDescriptor@31['Enumeration']
-    topLevelClasses(JavaClassImpl@191['Properties']) = LazyJavaClassDescriptor@33['Properties']
-}
-
-LazyJavaPackageFragment@165['<root>'] {
-    classes('DriverManager': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('String': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('java': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('java': Name@197) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@169['java'] {
-    classes('lang': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('sql': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('util': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('lang': Name@203) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('sql': Name@204) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
-}
-
-LazyJavaPackageFragment@171['lang'] {
-    classes('java': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@207
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@207
-}
-
-LazyJavaPackageFragment@175['sql'] {
-    classes('Connection': Name@208) = LazyJavaClassDescriptor@4['Connection'] // through LazyPackageFragmentScopeForJavaPackage@209
-    classes('Driver': Name@210) = LazyJavaClassDescriptor@6['Driver'] // through LazyPackageFragmentScopeForJavaPackage@209
-    classes('DriverManager': Name@211) = LazyJavaClassDescriptor@8['DriverManager'] // through LazyPackageFragmentScopeForJavaPackage@209
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@209
-    functions('DriverManager': Name@212) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@209
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@209
-}
-
-LazyJavaPackageFragment@180['util'] {
-    classes('Enumeration': Name@214) = LazyJavaClassDescriptor@31['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Properties': Name@216) = LazyJavaClassDescriptor@33['Properties'] // through LazyPackageFragmentScopeForJavaPackage@215
-}
-
-LazyJavaTypeParameterDescriptor@45['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@217
-    upperBounds = LinkedHashSet@218[1] { NullableType@219 }
-    upperBoundsAsType = NullableType@219
-}
-
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@45['E']
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[3] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[3] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[3] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[3] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[3] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[3] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[3] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[3] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@383 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-null {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@435[4] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
-    <name not found> = ArrayList@436[4] { ResolutionCandidate@349, ResolutionCandidate@350, ResolutionCandidate@351, ... }
-    <name not found> = ArrayList@437[4] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-    <name not found> = ArrayList@438[4] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-    <name not found> = ArrayList@439[4] { ResolutionCandidate@369, ResolutionCandidate@370, ResolutionCandidate@371, ... }
-    <name not found> = ArrayList@440[4] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-    <name not found> = ArrayList@441[4] { ResolutionCandidate@344, ResolutionCandidate@345, ResolutionCandidate@346, ... }
-    <name not found> = ArrayList@442[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
deleted file mode 100644
index 2c6c945b6c1..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-LazyJavaClassDescriptor@0['AutoCloseable'] {
-    functions('getMetaData': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@6['ResultSet'] {
-    defaultType = JetTypeImpl@7['ResultSet']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@9
-    functions('getMetaData': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['getMetaData'] } // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@9
-    nestedClasses('getMetaData': Name@10) = null // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['ResultSet']
-}
-
-LazyJavaClassDescriptor@17['ResultSetMetaData'] {
-    typeConstructor = LazyJavaClassTypeConstructor@18['ResultSetMetaData']
-}
-
-LazyJavaClassTypeConstructor@5['AutoCloseable'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['ResultSet'] {
-    parameters = ArrayList@22[empty]
-    supertypes = ArrayList@23[1] { LazyJavaClassifierType@24['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@18['ResultSetMetaData'] {
-    parameters = ArrayList@25[empty]
-    supertypes = ArrayList@26[1] { JetTypeImpl@21['Any'] }
-}
-
-LazyJavaClassifierType@24['AutoCloseable'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AutoCloseable']
-}
-
-LazyJavaClassifierType@29['Object'] {
-    classifier = JavaClassImpl@30['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['ResultSetMetaData'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['ResultSetMetaData']
-    nullable = 'false': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@18['ResultSetMetaData']
-}
-
-LazyJavaClassifierType@36['ResultSetMetaData'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@34['ResultSetMetaData']
-    nullable = 'true': Boolean@38
-    typeConstructor = LazyJavaClassTypeConstructor@18['ResultSetMetaData']
-}
-
-LazyJavaClassifierType@39['Wrapper'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@40
-}
-
-LazyJavaClassifierType@41['Wrapper'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@42
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.sql': FqName@50) = LazyJavaPackageFragment@51['sql']
-    packageFragments('java.sql.ResultSet': FqName@52) = null
-    packageFragments('java.sql.ResultSetMetaData': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.io': FqName@55) = null
-    packageFragments('kotlin.jvm': FqName@56) = null
-    topLevelClasses(JavaClassImpl@28['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@6['ResultSet']
-    topLevelClasses(JavaClassImpl@58['ResultSetMetaData']) = LazyJavaClassDescriptor@17['ResultSetMetaData']
-}
-
-LazyJavaPackageFragment@45['<root>'] {
-    classes('java': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('sql': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@65) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@49['lang'] {
-    classes('java': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@51['sql'] {
-    classes('ResultSet': Name@68) = LazyJavaClassDescriptor@6['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('ResultSetMetaData': Name@70) = LazyJavaClassDescriptor@17['ResultSetMetaData'] // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@76 }
-}
diff --git a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
deleted file mode 100644
index b48d36bc21d..00000000000
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
+++ /dev/null
@@ -1,326 +0,0 @@
-LazyJavaClassDescriptor@0['AutoCloseable'] {
-    functions('executeQuery': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    functions('executeUpdate': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@7['PreparedStatement'] {
-    defaultType = JetTypeImpl@8['PreparedStatement']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functions('executeQuery': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['executeQuery'], JavaMethodDescriptor@14['executeQuery'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@10
-    nestedClasses('executeQuery': Name@11) = null // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['PreparedStatement']
-}
-
-LazyJavaClassDescriptor@19['ResultSet'] {
-    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
-}
-
-LazyJavaClassDescriptor@21['Statement'] {
-    defaultType = JetTypeImpl@22['Statement']
-    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@24
-    functions('executeQuery': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@27['executeQuery'] } // through LazyJavaClassMemberScope@24
-    functions('executeUpdate': Name@28) = ArrayList@29[4] { JavaMethodDescriptor@30['executeUpdate'], JavaMethodDescriptor@31['executeUpdate'], JavaMethodDescriptor@32['executeUpdate'], ... } // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@24
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@24
-    nestedClasses('executeQuery': Name@25) = null // through LazyJavaClassMemberScope@24
-    nestedClasses('executeUpdate': Name@28) = null // through LazyJavaClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['Statement']
-}
-
-LazyJavaClassTypeConstructor@6['AutoCloseable'] {
-    parameters = ArrayList@37[empty]
-    supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
-}
-
-LazyJavaClassTypeConstructor@18['PreparedStatement'] {
-    parameters = ArrayList@40[empty]
-    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Statement'] }
-}
-
-LazyJavaClassTypeConstructor@20['ResultSet'] {
-    parameters = ArrayList@43[empty]
-    supertypes = ArrayList@44[1] { LazyJavaClassifierType@45['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@36['Statement'] {
-    parameters = ArrayList@46[empty]
-    supertypes = ArrayList@47[1] { LazyJavaClassifierType@48['AutoCloseable'] }
-}
-
-LazyJavaClassifierType@48['AutoCloseable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
-}
-
-LazyJavaClassifierType@45['AutoCloseable'] {
-    classifier = JavaClassImpl@51['AutoCloseable']
-    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
-}
-
-LazyJavaClassifierType@52['Object'] {
-    classifier = JavaClassImpl@53['Object']
-    typeConstructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaClassifierType@55['ResultSet'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@57['ResultSet']
-    nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
-}
-
-LazyJavaClassifierType@59['ResultSet'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['ResultSet']
-    nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
-}
-
-LazyJavaClassifierType@62['ResultSet'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@61['ResultSet']
-    nullable = 'true': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
-}
-
-LazyJavaClassifierType@65['ResultSet'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@57['ResultSet']
-    nullable = 'true': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
-}
-
-LazyJavaClassifierType@42['Statement'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['Statement']
-    memberScope = LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@36['Statement']
-}
-
-LazyJavaClassifierType@69['String'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@73['String'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@76['String'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@79['String'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@81['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@82['String'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@84['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@85['String'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['String']
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@88['String'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@87['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@90['String'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@75['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@92['String'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@78['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@94['String'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@81['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@96['String'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@84['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@98['String'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@71['String']
-    nullable = 'true': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@100['Wrapper'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@101
-}
-
-LazyJavaClassifierType@102['Wrapper'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@103
-}
-
-LazyJavaPackageFragmentProvider@104 {
-    packageFragments('<root>': FqName@105) = LazyJavaPackageFragment@106['<root>']
-    packageFragments('String': FqName@107) = null
-    packageFragments('java': FqName@108) = LazyJavaPackageFragment@109['java']
-    packageFragments('java.lang': FqName@110) = LazyJavaPackageFragment@111['lang']
-    packageFragments('java.lang.String': FqName@112) = null
-    packageFragments('java.sql': FqName@113) = LazyJavaPackageFragment@114['sql']
-    packageFragments('java.sql.PreparedStatement': FqName@115) = null
-    packageFragments('java.sql.ResultSet': FqName@116) = null
-    packageFragments('java.sql.Statement': FqName@117) = null
-    packageFragments('kotlin': FqName@118) = null
-    packageFragments('kotlin.String': FqName@119) = null
-    packageFragments('kotlin.io': FqName@120) = null
-    packageFragments('kotlin.jvm': FqName@121) = null
-    topLevelClasses(JavaClassImpl@50['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@122['PreparedStatement']) = LazyJavaClassDescriptor@7['PreparedStatement']
-    topLevelClasses(JavaClassImpl@61['ResultSet']) = LazyJavaClassDescriptor@19['ResultSet']
-    topLevelClasses(JavaClassImpl@123['Statement']) = LazyJavaClassDescriptor@21['Statement']
-}
-
-LazyJavaPackageFragment@106['<root>'] {
-    classes('String': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('java': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-LazyJavaPackageFragment@109['java'] {
-    classes('lang': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('sql': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('lang': Name@131) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@128
-}
-
-LazyJavaPackageFragment@111['lang'] {
-    classes('java': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@133
-}
-
-LazyJavaPackageFragment@114['sql'] {
-    classes('PreparedStatement': Name@134) = LazyJavaClassDescriptor@7['PreparedStatement'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('ResultSet': Name@136) = LazyJavaClassDescriptor@19['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Statement': Name@137) = LazyJavaClassDescriptor@21['Statement'] // through LazyPackageFragmentScopeForJavaPackage@135
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[2] { ResolutionCandidate@179, ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-}
-
-null {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@204[2] { ResolutionCandidate@179, ResolutionCandidate@180 }
-    <name not found> = ArrayList@205[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@206[4] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/kt310.lazy.log b/compiler/testData/diagnostics/tests/kt310.lazy.log
deleted file mode 100644
index dd031228181..00000000000
--- a/compiler/testData/diagnostics/tests/kt310.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('length': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('length': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('length': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('length': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/kt53.lazy.log b/compiler/testData/diagnostics/tests/kt53.lazy.log
deleted file mode 100644
index b12c99a638c..00000000000
--- a/compiler/testData/diagnostics/tests/kt53.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('E': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.E': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.E': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log b/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
deleted file mode 100644
index 53a4b411707..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
+++ /dev/null
@@ -1,163 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Array': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.Unit': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.Unit': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Array': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Unit': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('forEach': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('operation': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('use': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Array': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('forEach': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('operation': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('use': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Array': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('forEach': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('operation': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('use': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('Array': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('equals': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('forEach': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('operation': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('use': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-null {
-    <name not found> = ArrayList@95[16] { ResolutionCandidate@48, ResolutionCandidate@49, ResolutionCandidate@50, ... }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log b/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
deleted file mode 100644
index 9b4cf7afc7a..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Boolean': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Boolean': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log b/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
deleted file mode 100644
index 01a1d86cc66..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[7] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log b/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
deleted file mode 100644
index 1bac6a2bb23..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ExtensionFunction0<2>']
-    <name not found> = JetTypeImpl@2['ExtensionFunction0<2>']
-    <name not found> = JetTypeImpl@3['String']
-    <name not found> = JetTypeImpl@3['String']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Array': FqName@7) = null
-    packageFragments('Comment': FqName@8) = null
-    packageFragments('Comment2': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('Unit': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Array': FqName@16) = null
-    packageFragments('java.lang.Comment': FqName@17) = null
-    packageFragments('java.lang.Comment2': FqName@18) = null
-    packageFragments('java.lang.String': FqName@19) = null
-    packageFragments('java.lang.Unit': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Array': FqName@22) = null
-    packageFragments('kotlin.Comment': FqName@23) = null
-    packageFragments('kotlin.Comment2': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.Unit': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Array': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('Unit': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('new': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('new2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('new': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('new2': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('new': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('new2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('new': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('new2': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
deleted file mode 100644
index 786951a2f0f..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bar1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar1': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('bar1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar1': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
deleted file mode 100644
index 0ec1d388d67..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
+++ /dev/null
@@ -1,990 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@3['AbstractStringBuilder']
-    functions('append': Name@4) = ArrayList@5[13] { JavaMethodDescriptor@6['append'], JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], ... } // through LazyJavaClassMemberScope@9
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    functions('toString': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['toString'] } // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@9
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@19['Appendable'] {
-    defaultType = JetTypeImpl@20['Appendable']
-    functions('append': Name@21) = ArrayList@22[3] { JavaMethodDescriptor@23['append'], JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'] } // through LazyJavaClassMemberScope@26
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@26
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassDescriptor@33['Serializable'] {
-    defaultType = JetTypeImpl@34['Serializable']
-    functions('append': Name@4) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
-    functions('toString': Name@13) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@37['toString'] } // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@35
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
-}
-
-LazyJavaClassDescriptor@40['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
-}
-
-LazyJavaClassDescriptor@42['StringBuilder'] {
-    constructors = ArrayList@43[4] { JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], ... } // through LazyJavaClassMemberScope@47
-    defaultType = JetTypeImpl@48['StringBuilder']
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@47
-    functionTypeForSamInterface = null
-    functions('append': Name@50) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@47
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
-    functions('toString': Name@55) = ArrayList@56[1] { JavaMethodDescriptor@57['toString'] } // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@47
-    nestedClassIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@47
-    nestedClasses('append': Name@50) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('init': Name@10) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('string': Name@12) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('toString': Name@55) = null // through LazyJavaClassMemberScope@47
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@60['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@18['AbstractStringBuilder'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[2] { LazyJavaClassifierType@64['Appendable'], LazyJavaClassifierType@65['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@32['Appendable'] {
-    parameters = ArrayList@66[empty]
-    supertypes = ArrayList@67[1] { JetTypeImpl@68['Any'] }
-}
-
-LazyJavaClassTypeConstructor@39['Serializable'] {
-    parameters = ArrayList@69[empty]
-    supertypes = ArrayList@70[1] { JetTypeImpl@68['Any'] }
-}
-
-LazyJavaClassTypeConstructor@41['StringBuffer'] {
-    parameters = ArrayList@71[empty]
-    supertypes = ArrayList@72[3] { LazyJavaClassifierType@73['AbstractStringBuilder'], LazyJavaClassifierType@74['Serializable'], LazyJavaClassifierType@75['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@61['StringBuilder'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['AbstractStringBuilder'], LazyJavaClassifierType@79['Serializable'], LazyJavaClassifierType@80['CharSequence'] }
-}
-
-LazyJavaClassifierType@78['AbstractStringBuilder'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@83['AbstractStringBuilder'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@87['AbstractStringBuilder'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@90['AbstractStringBuilder'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@93['AbstractStringBuilder'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@96['AbstractStringBuilder'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@99['AbstractStringBuilder'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@102['AbstractStringBuilder'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@105['AbstractStringBuilder'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@108['AbstractStringBuilder'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@111['AbstractStringBuilder'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@114['AbstractStringBuilder'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@117['AbstractStringBuilder'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@120['AbstractStringBuilder'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@123['AbstractStringBuilder'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@126['AbstractStringBuilder'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@128['AbstractStringBuilder'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@130['AbstractStringBuilder'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@85['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@132['AbstractStringBuilder'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@92['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@134['AbstractStringBuilder'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@89['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@136['AbstractStringBuilder'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@138['AbstractStringBuilder'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@140['AbstractStringBuilder'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@142['AbstractStringBuilder'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@144['AbstractStringBuilder'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@146['AbstractStringBuilder'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@148['AbstractStringBuilder'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@113['AbstractStringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@73['AbstractStringBuilder'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@151['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@64['Appendable'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@153['Appendable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@154['Appendable'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@156['Appendable']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@157['Appendable'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@159['Appendable']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@160['Appendable'] {
-    arguments = ArrayList@161[empty]
-    classifier = JavaClassImpl@162['Appendable']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@163['Appendable'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@159['Appendable']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@165['Appendable'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@156['Appendable']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@167['Appendable'] {
-    arguments = ArrayList@168[empty]
-    classifier = JavaClassImpl@162['Appendable']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
-}
-
-LazyJavaClassifierType@65['CharSequence'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaClassImpl@170['CharSequence']
-    memberScope = DeserializedClassMemberScope@171
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@80['CharSequence'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@174['CharSequence']
-    memberScope = DeserializedClassMemberScope@171
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@175['CharSequence'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@178['CharSequence'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaClassImpl@180['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@181['CharSequence'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaClassImpl@183['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@184['CharSequence'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaClassImpl@186['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@187['CharSequence'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaClassImpl@189['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@190['CharSequence'] {
-    arguments = ArrayList@191[empty]
-    classifier = JavaClassImpl@192['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@193['CharSequence'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaClassImpl@195['CharSequence']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@196['CharSequence'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@189['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@198['CharSequence'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@180['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@200['CharSequence'] {
-    arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@177['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@202['CharSequence'] {
-    arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@195['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@204['CharSequence'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@186['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@206['CharSequence'] {
-    arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@192['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@208['CharSequence'] {
-    arguments = ArrayList@209[empty]
-    classifier = JavaClassImpl@183['CharSequence']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@75['CharSequence'] {
-    classifier = JavaClassImpl@210['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@172
-}
-
-LazyJavaClassifierType@211['Object'] {
-    arguments = ArrayList@212[empty]
-    classifier = JavaClassImpl@213['Object']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@215['Object'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaClassImpl@217['Object']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@218['Object'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@217['Object']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@220['Object'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaClassImpl@213['Object']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@222['Object'] {
-    classifier = JavaClassImpl@223['Object']
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@224['Object'] {
-    classifier = JavaClassImpl@225['Object']
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@226['Object'] {
-    classifier = JavaClassImpl@227['Object']
-    typeConstructor = DeserializedClassTypeConstructor@214
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    arguments = ArrayList@228[empty]
-    classifier = JavaClassImpl@229['Serializable']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
-}
-
-LazyJavaClassifierType@74['Serializable'] {
-    classifier = JavaClassImpl@230['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
-}
-
-LazyJavaClassifierType@231['String'] {
-    arguments = ArrayList@232[empty]
-    classifier = JavaClassImpl@233['String']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@235['String'] {
-    arguments = ArrayList@236[empty]
-    classifier = JavaClassImpl@237['String']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@238['String'] {
-    arguments = ArrayList@239[empty]
-    classifier = JavaClassImpl@240['String']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@241['String'] {
-    arguments = ArrayList@242[empty]
-    classifier = JavaClassImpl@243['String']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@244['String'] {
-    arguments = ArrayList@245[empty]
-    classifier = JavaClassImpl@246['String']
-    nullable = 'false': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@247['String'] {
-    arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@240['String']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@249['String'] {
-    arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@246['String']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@251['String'] {
-    arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@237['String']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@253['String'] {
-    arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@233['String']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@255['String'] {
-    arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@243['String']
-    nullable = 'true': Boolean@125
-    typeConstructor = DeserializedClassTypeConstructor@234
-}
-
-LazyJavaClassifierType@257['StringBuffer'] {
-    arguments = ArrayList@258[empty]
-    classifier = JavaClassImpl@259['StringBuffer']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
-}
-
-LazyJavaClassifierType@260['StringBuffer'] {
-    arguments = ArrayList@261[empty]
-    classifier = JavaClassImpl@262['StringBuffer']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
-}
-
-LazyJavaClassifierType@263['StringBuffer'] {
-    arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@262['StringBuffer']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
-}
-
-LazyJavaClassifierType@265['StringBuffer'] {
-    arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@259['StringBuffer']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
-}
-
-LazyJavaClassifierType@267['StringBuilder'] {
-    arguments = ArrayList@268[empty]
-    classifier = JavaClassImpl@269['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@270['StringBuilder'] {
-    arguments = ArrayList@271[empty]
-    classifier = JavaClassImpl@272['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@273['StringBuilder'] {
-    arguments = ArrayList@274[empty]
-    classifier = JavaClassImpl@275['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@276['StringBuilder'] {
-    arguments = ArrayList@277[empty]
-    classifier = JavaClassImpl@278['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@279['StringBuilder'] {
-    arguments = ArrayList@280[empty]
-    classifier = JavaClassImpl@281['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@282['StringBuilder'] {
-    arguments = ArrayList@283[empty]
-    classifier = JavaClassImpl@284['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@285['StringBuilder'] {
-    arguments = ArrayList@286[empty]
-    classifier = JavaClassImpl@287['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@288['StringBuilder'] {
-    arguments = ArrayList@289[empty]
-    classifier = JavaClassImpl@290['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@291['StringBuilder'] {
-    arguments = ArrayList@292[empty]
-    classifier = JavaClassImpl@293['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@294['StringBuilder'] {
-    arguments = ArrayList@295[empty]
-    classifier = JavaClassImpl@296['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@297['StringBuilder'] {
-    arguments = ArrayList@298[empty]
-    classifier = JavaClassImpl@299['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@300['StringBuilder'] {
-    arguments = ArrayList@301[empty]
-    classifier = JavaClassImpl@302['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@303['StringBuilder'] {
-    arguments = ArrayList@304[empty]
-    classifier = JavaClassImpl@305['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@306['StringBuilder'] {
-    arguments = ArrayList@307[empty]
-    classifier = JavaClassImpl@308['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@309['StringBuilder'] {
-    arguments = ArrayList@310[empty]
-    classifier = JavaClassImpl@311['StringBuilder']
-    nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@312['StringBuilder'] {
-    arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@299['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@314['StringBuilder'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@275['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@316['StringBuilder'] {
-    arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@269['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@318['StringBuilder'] {
-    arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@305['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@320['StringBuilder'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@290['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@322['StringBuilder'] {
-    arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@302['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@324['StringBuilder'] {
-    arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@296['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@326['StringBuilder'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@278['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@328['StringBuilder'] {
-    arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@284['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@330['StringBuilder'] {
-    arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@287['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@332['StringBuilder'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@311['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@334['StringBuilder'] {
-    arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@308['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@336['StringBuilder'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@272['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@338['StringBuilder'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@293['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaClassifierType@340['StringBuilder'] {
-    arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@281['StringBuilder']
-    nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
-}
-
-LazyJavaPackageFragmentProvider@342 {
-    packageFragments('<root>': FqName@343) = LazyJavaPackageFragment@344['<root>']
-    packageFragments('String': FqName@345) = null
-    packageFragments('StringBuilder': FqName@346) = null
-    packageFragments('Unit': FqName@347) = null
-    packageFragments('java': FqName@348) = LazyJavaPackageFragment@349['java']
-    packageFragments('java.io': FqName@350) = LazyJavaPackageFragment@351['io']
-    packageFragments('java.lang': FqName@352) = LazyJavaPackageFragment@353['lang']
-    packageFragments('java.lang.String': FqName@354) = null
-    packageFragments('java.lang.StringBuilder': FqName@355) = null
-    packageFragments('java.lang.Unit': FqName@356) = null
-    packageFragments('kotlin': FqName@357) = null
-    packageFragments('kotlin.String': FqName@358) = null
-    packageFragments('kotlin.StringBuilder': FqName@359) = null
-    packageFragments('kotlin.Unit': FqName@360) = null
-    packageFragments('kotlin.io': FqName@361) = null
-    packageFragments('kotlin.jvm': FqName@362) = null
-    packageFragments('str': FqName@363) = null
-    topLevelClasses(JavaClassImpl@82['AbstractStringBuilder']) = LazyJavaClassDescriptor@2['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@153['Appendable']) = LazyJavaClassDescriptor@19['Appendable']
-    topLevelClasses(JavaClassImpl@229['Serializable']) = LazyJavaClassDescriptor@33['Serializable']
-    topLevelClasses(JavaClassImpl@262['StringBuffer']) = LazyJavaClassDescriptor@40['StringBuffer']
-    topLevelClasses(JavaClassImpl@364['StringBuilder']) = LazyJavaClassDescriptor@42['StringBuilder']
-}
-
-LazyJavaPackageFragment@344['<root>'] {
-    classes('String': Name@365) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('StringBuilder': Name@367) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('Unit': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('append': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('init': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('invoke': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('string': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    deserializedPackageScope = Empty@371 // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('StringBuilder': Name@372) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('append': Name@50) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('invoke': Name@369) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('string': Name@370) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    memberIndex = computeMemberIndex$1@373 // through LazyPackageFragmentScopeForJavaPackage@366
-}
-
-LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@375
-    deserializedPackageScope = Empty@371 // through LazyPackageFragmentScopeForJavaPackage@375
-    functions('lang': Name@376) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@375
-    memberIndex = computeMemberIndex$1@377 // through LazyPackageFragmentScopeForJavaPackage@375
-}
-
-LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@367) = LazyJavaClassDescriptor@42['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('append': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('init': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('invoke': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('string': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    deserializedPackageScope = Empty@371 // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('StringBuilder': Name@372) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('append': Name@50) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('invoke': Name@369) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('string': Name@370) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    memberIndex = computeMemberIndex$1@379 // through LazyPackageFragmentScopeForJavaPackage@378
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[13] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[13] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[13] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-null {
-    <name not found> = ArrayList@424[14] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@425, ... }
-    <name not found> = ArrayList@426[14] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@427, ... }
-    <name not found> = ArrayList@428[14] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@429, ... }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@438[4] { ResolutionCandidate@421, ResolutionCandidate@422, ResolutionCandidate@423, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt4603.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4603.lazy.log
deleted file mode 100644
index ce0952c6d88..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt4603.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/labels/kt591.lazy.log b/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
deleted file mode 100644
index 7911557ae7b..00000000000
--- a/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
+++ /dev/null
@@ -1,56 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[14] { ResolutionCandidate@31, ResolutionCandidate@32, ResolutionCandidate@33, ... }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@39[14] { ResolutionCandidate@31, ResolutionCandidate@32, ResolutionCandidate@33, ... }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log b/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
deleted file mode 100644
index ca033050e87..00000000000
--- a/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log b/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
deleted file mode 100644
index c589d2cd550..00000000000
--- a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function0<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Any': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Unit': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('bar': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/library/Collections.lazy.log b/compiler/testData/diagnostics/tests/library/Collections.lazy.log
deleted file mode 100644
index 308e94a7f0b..00000000000
--- a/compiler/testData/diagnostics/tests/library/Collections.lazy.log
+++ /dev/null
@@ -1,1666 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Collection': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Iterator': FqName@6) = null
-    packageFragments('K': FqName@7) = null
-    packageFragments('List': FqName@8) = null
-    packageFragments('ListIterator': FqName@9) = null
-    packageFragments('Map': FqName@10) = null
-    packageFragments('MutableCollection': FqName@11) = null
-    packageFragments('MutableIterator': FqName@12) = null
-    packageFragments('MutableList': FqName@13) = null
-    packageFragments('MutableListIterator': FqName@14) = null
-    packageFragments('MutableMap': FqName@15) = null
-    packageFragments('MutableSet': FqName@16) = null
-    packageFragments('Set': FqName@17) = null
-    packageFragments('T': FqName@18) = null
-    packageFragments('V': FqName@19) = null
-    packageFragments('collections': FqName@20) = null
-    packageFragments('collections.Array': FqName@21) = null
-    packageFragments('collections.Collection': FqName@22) = null
-    packageFragments('collections.Int': FqName@23) = null
-    packageFragments('collections.Iterator': FqName@24) = null
-    packageFragments('collections.K': FqName@25) = null
-    packageFragments('collections.List': FqName@26) = null
-    packageFragments('collections.ListIterator': FqName@27) = null
-    packageFragments('collections.Map': FqName@28) = null
-    packageFragments('collections.MutableCollection': FqName@29) = null
-    packageFragments('collections.MutableIterator': FqName@30) = null
-    packageFragments('collections.MutableList': FqName@31) = null
-    packageFragments('collections.MutableListIterator': FqName@32) = null
-    packageFragments('collections.MutableMap': FqName@33) = null
-    packageFragments('collections.MutableSet': FqName@34) = null
-    packageFragments('collections.Set': FqName@35) = null
-    packageFragments('collections.T': FqName@36) = null
-    packageFragments('collections.V': FqName@37) = null
-    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    packageFragments('java.lang.Array': FqName@42) = null
-    packageFragments('java.lang.Collection': FqName@43) = null
-    packageFragments('java.lang.Int': FqName@44) = null
-    packageFragments('java.lang.Iterator': FqName@45) = null
-    packageFragments('java.lang.K': FqName@46) = null
-    packageFragments('java.lang.List': FqName@47) = null
-    packageFragments('java.lang.ListIterator': FqName@48) = null
-    packageFragments('java.lang.Map': FqName@49) = null
-    packageFragments('java.lang.MutableCollection': FqName@50) = null
-    packageFragments('java.lang.MutableIterator': FqName@51) = null
-    packageFragments('java.lang.MutableList': FqName@52) = null
-    packageFragments('java.lang.MutableListIterator': FqName@53) = null
-    packageFragments('java.lang.MutableMap': FqName@54) = null
-    packageFragments('java.lang.MutableSet': FqName@55) = null
-    packageFragments('java.lang.Set': FqName@56) = null
-    packageFragments('java.lang.T': FqName@57) = null
-    packageFragments('java.lang.V': FqName@58) = null
-    packageFragments('kotlin': FqName@59) = null
-    packageFragments('kotlin.Array': FqName@60) = null
-    packageFragments('kotlin.Collection': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.Iterator': FqName@63) = null
-    packageFragments('kotlin.K': FqName@64) = null
-    packageFragments('kotlin.List': FqName@65) = null
-    packageFragments('kotlin.ListIterator': FqName@66) = null
-    packageFragments('kotlin.Map': FqName@67) = null
-    packageFragments('kotlin.MutableCollection': FqName@68) = null
-    packageFragments('kotlin.MutableIterator': FqName@69) = null
-    packageFragments('kotlin.MutableList': FqName@70) = null
-    packageFragments('kotlin.MutableListIterator': FqName@71) = null
-    packageFragments('kotlin.MutableMap': FqName@72) = null
-    packageFragments('kotlin.MutableSet': FqName@73) = null
-    packageFragments('kotlin.Set': FqName@74) = null
-    packageFragments('kotlin.T': FqName@75) = null
-    packageFragments('kotlin.V': FqName@76) = null
-    packageFragments('kotlin.io': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = null
-}
-
-LazyJavaPackageFragment@39['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@41['lang'] {
-    classes('add': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('addAll': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('clear': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('remove': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('removeAll': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('retainAll': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('set': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('add': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('addAll': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('clear': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('remove': Name@89) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('removeAll': Name@90) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('retainAll': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('set': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@420 }
-}
-
-ResolutionTaskHolder@421 {
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@423 }
-}
-
-ResolutionTaskHolder@424 {
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@429 }
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@432 }
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@435 }
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@438 }
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@441 }
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@444 }
-}
-
-ResolutionTaskHolder@445 {
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@447 }
-}
-
-ResolutionTaskHolder@448 {
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@450 }
-}
-
-ResolutionTaskHolder@451 {
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@453 }
-}
-
-ResolutionTaskHolder@454 {
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@456 }
-}
-
-ResolutionTaskHolder@457 {
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@459 }
-}
-
-ResolutionTaskHolder@460 {
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
-}
-
-ResolutionTaskHolder@463 {
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@465 }
-}
-
-ResolutionTaskHolder@466 {
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@468 }
-}
-
-ResolutionTaskHolder@469 {
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@471 }
-}
-
-ResolutionTaskHolder@472 {
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
-}
-
-ResolutionTaskHolder@475 {
-    <name not found> = ArrayList@476[1] { ResolutionCandidate@477 }
-}
-
-ResolutionTaskHolder@478 {
-    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[1] { ResolutionCandidate@483 }
-}
-
-ResolutionTaskHolder@484 {
-    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
-}
-
-ResolutionTaskHolder@487 {
-    <name not found> = ArrayList@488[1] { ResolutionCandidate@489 }
-}
-
-ResolutionTaskHolder@490 {
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@492 }
-}
-
-ResolutionTaskHolder@493 {
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@495 }
-}
-
-ResolutionTaskHolder@496 {
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
-}
-
-ResolutionTaskHolder@499 {
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@501 }
-}
-
-ResolutionTaskHolder@502 {
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@504 }
-}
-
-ResolutionTaskHolder@505 {
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@507 }
-}
-
-ResolutionTaskHolder@508 {
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
-}
-
-ResolutionTaskHolder@511 {
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@513 }
-}
-
-ResolutionTaskHolder@514 {
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@516 }
-}
-
-ResolutionTaskHolder@517 {
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
-}
-
-ResolutionTaskHolder@520 {
-    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
-}
-
-ResolutionTaskHolder@523 {
-    <name not found> = ArrayList@524[1] { ResolutionCandidate@525 }
-}
-
-ResolutionTaskHolder@526 {
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@528 }
-}
-
-ResolutionTaskHolder@529 {
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
-}
-
-ResolutionTaskHolder@532 {
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@534 }
-}
-
-ResolutionTaskHolder@535 {
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@537 }
-}
-
-ResolutionTaskHolder@538 {
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@540 }
-}
-
-ResolutionTaskHolder@541 {
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
-}
-
-ResolutionTaskHolder@544 {
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@546 }
-}
-
-ResolutionTaskHolder@547 {
-    <name not found> = ArrayList@548[2] { ResolutionCandidate@549, ResolutionCandidate@550 }
-}
-
-ResolutionTaskHolder@551 {
-    <name not found> = ArrayList@552[2] { ResolutionCandidate@553, ResolutionCandidate@554 }
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[2] { ResolutionCandidate@557, ResolutionCandidate@558 }
-}
-
-ResolutionTaskHolder@559 {
-    <name not found> = ArrayList@560[2] { ResolutionCandidate@561, ResolutionCandidate@562 }
-}
-
-ResolutionTaskHolder@563 {
-    <name not found> = ArrayList@564[2] { ResolutionCandidate@565, ResolutionCandidate@566 }
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[2] { ResolutionCandidate@569, ResolutionCandidate@570 }
-}
-
-ResolutionTaskHolder@571 {
-    <name not found> = ArrayList@572[2] { ResolutionCandidate@573, ResolutionCandidate@574 }
-}
-
-ResolutionTaskHolder@575 {
-    <name not found> = ArrayList@576[2] { ResolutionCandidate@577, ResolutionCandidate@578 }
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@580 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@581 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@583 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@584 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@586 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@587 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@589 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@590 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@592 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@593 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@595 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@596 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@598 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@599 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@601 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@602 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@604 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@605 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@607 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@608 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@609[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@611[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@612[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@614[1] { ResolutionCandidate@435 }
-    <name not found> = ArrayList@615[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@617[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@618[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@453 }
-    <name not found> = ArrayList@620[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@621[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@623[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@624[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@626[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@627[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@438 }
-    <name not found> = ArrayList@629[1] { ResolutionCandidate@540 }
-    <name not found> = ArrayList@630[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@632[1] { ResolutionCandidate@522 }
-    <name not found> = ArrayList@633[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@483 }
-    <name not found> = ArrayList@635[1] { ResolutionCandidate@504 }
-    <name not found> = ArrayList@636[1] { ResolutionCandidate@519 }
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@638[1] { ResolutionCandidate@474 }
-    <name not found> = ArrayList@639[1] { ResolutionCandidate@513 }
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@641[1] { ResolutionCandidate@444 }
-    <name not found> = ArrayList@642[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@644[1] { ResolutionCandidate@498 }
-    <name not found> = ArrayList@645[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@647[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@648[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@650[1] { ResolutionCandidate@510 }
-    <name not found> = ArrayList@651[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@653[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@654[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@656[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@657[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@659[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@660[1] { ResolutionCandidate@468 }
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@662[1] { ResolutionCandidate@543 }
-    <name not found> = ArrayList@663[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@534 }
-    <name not found> = ArrayList@665[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@666[1] { ResolutionCandidate@432 }
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@668[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@669[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@671[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@672[1] { ResolutionCandidate@423 }
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@674[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@462 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@480 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@420 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@516 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@546 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@465 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@486 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@447 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@441 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@531 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@525 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@507 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@426 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@528 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@429 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@477 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@537 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@471 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@501 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@489 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@492 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@456 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@495 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@450 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@459 }
-    <name not found> = ArrayList@760[2] { ResolutionCandidate@561, ResolutionCandidate@562 }
-    <name not found> = ArrayList@761[2] { ResolutionCandidate@549, ResolutionCandidate@550 }
-    <name not found> = ArrayList@762[2] { ResolutionCandidate@553, ResolutionCandidate@554 }
-    <name not found> = ArrayList@763[2] { ResolutionCandidate@577, ResolutionCandidate@578 }
-    <name not found> = ArrayList@764[2] { ResolutionCandidate@565, ResolutionCandidate@566 }
-    <name not found> = ArrayList@765[2] { ResolutionCandidate@557, ResolutionCandidate@558 }
-    <name not found> = ArrayList@766[2] { ResolutionCandidate@573, ResolutionCandidate@574 }
-    <name not found> = ArrayList@767[2] { ResolutionCandidate@569, ResolutionCandidate@570 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/library/kt828.lazy.log b/compiler/testData/diagnostics/tests/library/kt828.lazy.log
deleted file mode 100644
index 02f4ed7148b..00000000000
--- a/compiler/testData/diagnostics/tests/library/kt828.lazy.log
+++ /dev/null
@@ -1,120 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Boolean': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Boolean': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
deleted file mode 100644
index d2afbc46bbf..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('Boolean': FqName@54) = null
-    packageFragments('C': FqName@55) = null
-    packageFragments('Int': FqName@56) = null
-    packageFragments('MutableIterator': FqName@57) = null
-    packageFragments('Unit': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Boolean': FqName@63) = null
-    packageFragments('java.lang.Int': FqName@64) = null
-    packageFragments('java.lang.MutableIterator': FqName@65) = null
-    packageFragments('java.lang.Unit': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Boolean': FqName@68) = null
-    packageFragments('kotlin.Int': FqName@69) = null
-    packageFragments('kotlin.MutableIterator': FqName@70) = null
-    packageFragments('kotlin.Unit': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@74['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('Boolean': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('MutableIterator': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('UnsupportedOperationException': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('UnsupportedOperationException': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('UnsupportedOperationException': Name@80) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('UnsupportedOperationException': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[4] { ResolutionCandidate@97, ResolutionCandidate@98, ResolutionCandidate@99, ... }
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@102, ResolutionCandidate@103, ResolutionCandidate@104, ... }
-    <name not found> = ArrayList@107[4] { ResolutionCandidate@92, ResolutionCandidate@93, ResolutionCandidate@94, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
deleted file mode 100644
index b35a0fe0ef6..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
+++ /dev/null
@@ -1,186 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.Int': FqName@18) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('A': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = null
-    packageFragments('p.A': FqName@32) = null
-    packageFragments('p.M1': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    packageFragments('p': FqName@43) = null
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('A': Name@68) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-null {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
deleted file mode 100644
index db8a5dfebdb..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
+++ /dev/null
@@ -1,186 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.Int': FqName@18) = null
-    packageFragments('p.M1': FqName@19) = null
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('A': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.A': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.A': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('p': FqName@32) = null
-    packageFragments('p.A': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    packageFragments('p': FqName@43) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('A': Name@68) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-null {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
deleted file mode 100644
index 541aaf45013..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
+++ /dev/null
@@ -1,188 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.B': FqName@18) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('A': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = null
-    packageFragments('p.A': FqName@32) = null
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@34['<root>']
-    packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
-    packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('p': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@34['<root>'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('p': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@57) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@36['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('A': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('A': Name@67) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@38['lang'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
deleted file mode 100644
index 0217f37b180..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
+++ /dev/null
@@ -1,517 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('M1': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.M1': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.M1': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.M1': FqName@18) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('A': FqName@21) = null
-    packageFragments('M1': FqName@4) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.M1': FqName@10) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.M1': FqName@13) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = null
-    packageFragments('p.A': FqName@32) = null
-    packageFragments('p.M1': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('M1': FqName@4) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.M1': FqName@10) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.M1': FqName@13) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    packageFragments('p': FqName@43) = null
-    packageFragments('p.M1': FqName@18) = null
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('p': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('A': Name@74) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-null {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
deleted file mode 100644
index 44c0d490763..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.B': FqName@18) = null
-    packageFragments('p.M1': FqName@19) = null
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('A': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.A': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.A': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('p': FqName@32) = null
-    packageFragments('p.A': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    packageFragments('p': FqName@43) = null
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('p': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('B': Name@68) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-null {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
deleted file mode 100644
index ccb5903ff18..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
+++ /dev/null
@@ -1,185 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.Int': FqName@18) = null
-    packageFragments('p.M1': FqName@19) = null
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('A': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.A': FqName@28) = null
-    packageFragments('java.lang.Int': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('p': FqName@35) = null
-    packageFragments('p.A': FqName@36) = null
-    packageFragments('p.Int': FqName@37) = null
-}
-
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('p': FqName@47) = null
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@72) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@27['lang'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-null {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
deleted file mode 100644
index 632af4e9e20..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
+++ /dev/null
@@ -1,294 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.D': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.D': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('p': FqName@25) = null
-    packageFragments('p.A': FqName@26) = null
-    packageFragments('p.B': FqName@27) = null
-    packageFragments('p.C': FqName@28) = null
-    packageFragments('p.D': FqName@29) = null
-    packageFragments('p.Int': FqName@30) = null
-    packageFragments('p.M1': FqName@31) = null
-}
-
-LazyJavaPackageFragmentProvider@32 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('A': FqName@34) = null
-    packageFragments('C': FqName@35) = null
-    packageFragments('D': FqName@36) = null
-    packageFragments('Int': FqName@37) = null
-    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    packageFragments('java.lang.A': FqName@42) = null
-    packageFragments('java.lang.C': FqName@43) = null
-    packageFragments('java.lang.D': FqName@44) = null
-    packageFragments('java.lang.Int': FqName@45) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.A': FqName@47) = null
-    packageFragments('kotlin.C': FqName@48) = null
-    packageFragments('kotlin.D': FqName@49) = null
-    packageFragments('kotlin.Int': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-    packageFragments('p': FqName@53) = null
-    packageFragments('p.A': FqName@54) = null
-    packageFragments('p.C': FqName@55) = null
-    packageFragments('p.D': FqName@56) = null
-    packageFragments('p.Int': FqName@57) = null
-}
-
-LazyJavaPackageFragmentProvider@58 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@59['<root>']
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.io': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = null
-    packageFragments('p': FqName@67) = null
-}
-
-LazyJavaPackageFragment@33['<root>'] {
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('p': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('p': Name@76) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('p': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('p': Name@76) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@59['<root>'] {
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('p': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('p': Name@76) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@39['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@84) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('B': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('B': Name@94) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@63['lang'] {
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@41['lang'] {
-    classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('d': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('M1': Name@68) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('a': Name@70) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('c': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-null {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-    <name not found> = EmptyList@75[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
deleted file mode 100644
index 5b2dc4ae06b..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('p': FqName@13) = null
-    packageFragments('p.A': FqName@14) = null
-    packageFragments('p.B': FqName@15) = null
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.A': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('p': FqName@28) = null
-    packageFragments('p.A': FqName@29) = null
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('B': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('A': Name@40) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('B': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('B': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('B': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
deleted file mode 100644
index 587d6831572..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
+++ /dev/null
@@ -1,153 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('p': FqName@13) = null
-    packageFragments('p.A': FqName@14) = null
-    packageFragments('p.B': FqName@15) = null
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('p': FqName@25) = null
-    packageFragments('p.A': FqName@26) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@40) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('B': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('B': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@40) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
deleted file mode 100644
index bd2602d34ef..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
+++ /dev/null
@@ -1,224 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('p': FqName@13) = null
-    packageFragments('p.A': FqName@14) = null
-    packageFragments('p.M1': FqName@15) = null
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.A': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('p': FqName@28) = null
-    packageFragments('p.A': FqName@29) = null
-    packageFragments('p.M2': FqName@30) = null
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@32['<root>']
-    packageFragments('A': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.A': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.A': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    packageFragments('p': FqName@43) = null
-    packageFragments('p.A': FqName@44) = null
-}
-
-LazyJavaPackageFragment@32['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('A': Name@70) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('A': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-null {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
deleted file mode 100644
index 664c9846f96..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
+++ /dev/null
@@ -1,114 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('p': FqName@13) = null
-    packageFragments('p.A': FqName@14) = null
-    packageFragments('p.B': FqName@15) = null
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.A': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('p': FqName@28) = null
-    packageFragments('p.A': FqName@29) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('B': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('p': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('B': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('B': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('p': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('B': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@47) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('B': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('B': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('B': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
deleted file mode 100644
index 98fdf6bae31..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.A': FqName@17) = null
-    packageFragments('p.Int': FqName@18) = null
-    packageFragments('p.M1': FqName@19) = null
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('A': FqName@22) = null
-    packageFragments('Int': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.A': FqName@28) = null
-    packageFragments('java.lang.Int': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('p': FqName@35) = null
-    packageFragments('p.A': FqName@36) = null
-    packageFragments('p.Int': FqName@37) = null
-}
-
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('p': FqName@47) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@72) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@27['lang'] {
-    classes('M1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('M1': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-    <name not found> = EmptyList@53[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
deleted file mode 100644
index 029e1b8b265..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.X': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('p': FqName@55) = null
-    packageFragments('p.B': FqName@56) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-}
-
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.T': FqName@64) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    packageFragments('p': FqName@69) = null
-    packageFragments('p.B': FqName@70) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@71) = null
-    packageFragments('p.X': FqName@45) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
deleted file mode 100644
index 09e728f0854..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.T': FqName@25) = null
-    packageFragments('p.Tr': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Tr': FqName@30) = null
-    packageFragments('X': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.B': FqName@36) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Tr': FqName@37) = null
-    packageFragments('java.lang.X': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.B': FqName@40) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Tr': FqName@41) = null
-    packageFragments('kotlin.X': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('p': FqName@45) = null
-    packageFragments('p.B': FqName@46) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Tr': FqName@48) = null
-    packageFragments('p.X': FqName@49) = null
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Tr': FqName@30) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Tr': FqName@37) = null
-    packageFragments('kotlin': FqName@56) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Tr': FqName@41) = null
-    packageFragments('kotlin.io': FqName@57) = null
-    packageFragments('kotlin.jvm': FqName@58) = null
-    packageFragments('p': FqName@59) = null
-    packageFragments('p.B': FqName@60) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Tr': FqName@48) = null
-}
-
-LazyJavaPackageFragmentProvider@61 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@62['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('T': FqName@63) = null
-    packageFragments('X': FqName@31) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.B': FqName@36) = null
-    packageFragments('java.lang.T': FqName@68) = null
-    packageFragments('java.lang.X': FqName@38) = null
-    packageFragments('kotlin': FqName@69) = null
-    packageFragments('kotlin.B': FqName@40) = null
-    packageFragments('kotlin.T': FqName@70) = null
-    packageFragments('kotlin.X': FqName@42) = null
-    packageFragments('kotlin.io': FqName@71) = null
-    packageFragments('kotlin.jvm': FqName@72) = null
-    packageFragments('p': FqName@73) = null
-    packageFragments('p.B': FqName@74) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.T': FqName@75) = null
-    packageFragments('p.X': FqName@49) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@118[3] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
deleted file mode 100644
index 5c660c7107b..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
+++ /dev/null
@@ -1,189 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('Z': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('java.lang.Y': FqName@15) = null
-    packageFragments('java.lang.Z': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.Y': FqName@21) = null
-    packageFragments('kotlin.Z': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('p': FqName@25) = null
-    packageFragments('p.B': FqName@26) = null
-    packageFragments('p.C': FqName@27) = null
-    packageFragments('p.T': FqName@28) = null
-    packageFragments('p.Y': FqName@29) = null
-    packageFragments('p.Z': FqName@30) = null
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@32['<root>']
-    packageFragments('B': FqName@33) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('X': FqName@34) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('Z': FqName@7) = null
-    packageFragments('_': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.B': FqName@40) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.X': FqName@41) = null
-    packageFragments('java.lang.Y': FqName@15) = null
-    packageFragments('java.lang.Z': FqName@16) = null
-    packageFragments('java.lang._': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.B': FqName@44) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.X': FqName@45) = null
-    packageFragments('kotlin.Y': FqName@21) = null
-    packageFragments('kotlin.Z': FqName@22) = null
-    packageFragments('kotlin._': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('p': FqName@49) = null
-    packageFragments('p.B': FqName@50) = null
-    packageFragments('p.C': FqName@51) = null
-    packageFragments('p.X': FqName@52) = null
-    packageFragments('p.Y': FqName@29) = null
-    packageFragments('p.Z': FqName@30) = null
-    packageFragments('p._': FqName@53) = null
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('Z': FqName@7) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.Y': FqName@15) = null
-    packageFragments('java.lang.Z': FqName@16) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.Y': FqName@21) = null
-    packageFragments('kotlin.Z': FqName@22) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    packageFragments('p': FqName@63) = null
-    packageFragments('p.B': FqName@64) = null
-    packageFragments('p.C': FqName@27) = null
-    packageFragments('p.Y': FqName@29) = null
-    packageFragments('p.Z': FqName@30) = null
-}
-
-LazyJavaPackageFragmentProvider@65 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@66['<root>']
-    packageFragments('B': FqName@33) = null
-    packageFragments('T': FqName@67) = null
-    packageFragments('X': FqName@34) = null
-    packageFragments('_': FqName@35) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.B': FqName@40) = null
-    packageFragments('java.lang.T': FqName@72) = null
-    packageFragments('java.lang.X': FqName@41) = null
-    packageFragments('java.lang._': FqName@42) = null
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.B': FqName@44) = null
-    packageFragments('kotlin.T': FqName@74) = null
-    packageFragments('kotlin.X': FqName@45) = null
-    packageFragments('kotlin._': FqName@46) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('p': FqName@77) = null
-    packageFragments('p.B': FqName@78) = null
-    packageFragments('p.C': FqName@51) = null
-    packageFragments('p.T': FqName@79) = null
-    packageFragments('p.X': FqName@52) = null
-    packageFragments('p._': FqName@53) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@55['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@32['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
-}
-
-null {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
deleted file mode 100644
index 57cd315ab04..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
+++ /dev/null
@@ -1,174 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('T1': FqName@5) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T1': FqName@13) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.T1': FqName@18) = null
-    packageFragments('kotlin.Y': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.T1': FqName@25) = null
-    packageFragments('p.Y': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.Y': FqName@19) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.X': FqName@45) = null
-    packageFragments('p.Y': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Y': FqName@19) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('p': FqName@55) = null
-    packageFragments('p.B': FqName@56) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Y': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.T': FqName@64) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    packageFragments('p': FqName@69) = null
-    packageFragments('p.B': FqName@70) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@71) = null
-    packageFragments('p.X': FqName@45) = null
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@117[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
deleted file mode 100644
index f28e7d0b15d..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.X': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('p': FqName@55) = null
-    packageFragments('p.B': FqName@56) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-}
-
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('X': FqName@30) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.T': FqName@64) = null
-    packageFragments('java.lang.X': FqName@36) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.X': FqName@39) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    packageFragments('p': FqName@69) = null
-    packageFragments('p.B': FqName@70) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@71) = null
-    packageFragments('p.X': FqName@45) = null
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
deleted file mode 100644
index fe8651f7cde..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
+++ /dev/null
@@ -1,189 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.R': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.R': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.Any': FqName@23) = null
-    packageFragments('p.B': FqName@24) = null
-    packageFragments('p.C': FqName@25) = null
-    packageFragments('p.R': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('R': FqName@29) = null
-    packageFragments('T': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.R': FqName@35) = null
-    packageFragments('java.lang.T': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.R': FqName@38) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.Any': FqName@23) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@25) = null
-    packageFragments('p.R': FqName@44) = null
-    packageFragments('p.T': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@48) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('R': FqName@49) = null
-    packageFragments('T': FqName@50) = null
-    packageFragments('java': FqName@51) = LazyJavaPackageFragment@52['java']
-    packageFragments('java.lang': FqName@53) = LazyJavaPackageFragment@54['lang']
-    packageFragments('java.lang.B': FqName@55) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.R': FqName@56) = null
-    packageFragments('java.lang.T': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.B': FqName@59) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.R': FqName@60) = null
-    packageFragments('kotlin.T': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = null
-    packageFragments('kotlin.jvm': FqName@63) = null
-    packageFragments('p': FqName@64) = null
-    packageFragments('p.B': FqName@65) = null
-    packageFragments('p.C': FqName@66) = null
-    packageFragments('p.R': FqName@67) = null
-    packageFragments('p.T': FqName@68) = null
-}
-
-LazyJavaPackageFragmentProvider@69 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@70['<root>']
-    packageFragments('B': FqName@48) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@71) = LazyJavaPackageFragment@72['java']
-    packageFragments('java.lang': FqName@73) = LazyJavaPackageFragment@74['lang']
-    packageFragments('java.lang.B': FqName@55) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('kotlin': FqName@75) = null
-    packageFragments('kotlin.B': FqName@59) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    packageFragments('p': FqName@78) = null
-    packageFragments('p.B': FqName@79) = null
-    packageFragments('p.C': FqName@66) = null
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@70['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@72['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@52['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
-}
-
-null {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@137[3] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
deleted file mode 100644
index fb00c69056f..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
+++ /dev/null
@@ -1,145 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.Any': FqName@20) = null
-    packageFragments('p.B': FqName@21) = null
-    packageFragments('p.C': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.B': FqName@30) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.B': FqName@32) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('p': FqName@35) = null
-    packageFragments('p.B': FqName@36) = null
-    packageFragments('p.C': FqName@37) = null
-}
-
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('p': FqName@47) = null
-    packageFragments('p.B': FqName@48) = null
-    packageFragments('p.C': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('B': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.B': FqName@56) = null
-    packageFragments('kotlin': FqName@57) = null
-    packageFragments('kotlin.B': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    packageFragments('p': FqName@61) = null
-    packageFragments('p.B': FqName@62) = null
-    packageFragments('p.C': FqName@37) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
deleted file mode 100644
index 9e8bade54af..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Int': FqName@25) = null
-    packageFragments('p.String': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@30) = null
-    packageFragments('String': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.B': FqName@36) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.B': FqName@40) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@41) = null
-    packageFragments('kotlin.String': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('p': FqName@45) = null
-    packageFragments('p.B': FqName@46) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Int': FqName@48) = null
-    packageFragments('p.String': FqName@49) = null
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('B': FqName@52) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.B': FqName@57) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.B': FqName@59) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    packageFragments('p': FqName@62) = null
-    packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@24) = null
-}
-
-LazyJavaPackageFragmentProvider@64 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@65['<root>']
-    packageFragments('B': FqName@66) = null
-    packageFragments('Int': FqName@67) = null
-    packageFragments('String': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.B': FqName@73) = null
-    packageFragments('java.lang.Int': FqName@74) = null
-    packageFragments('java.lang.String': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.B': FqName@77) = null
-    packageFragments('kotlin.Int': FqName@78) = null
-    packageFragments('kotlin.String': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    packageFragments('p': FqName@82) = null
-    packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Int': FqName@84) = null
-    packageFragments('p.String': FqName@85) = null
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
deleted file mode 100644
index 4a150e73e78..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
+++ /dev/null
@@ -1,243 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('G1': FqName@6) = null
-    packageFragments('G2': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.G1': FqName@17) = null
-    packageFragments('java.lang.G2': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.Any': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.G1': FqName@25) = null
-    packageFragments('kotlin.G2': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = null
-    packageFragments('p.Any': FqName@32) = null
-    packageFragments('p.B': FqName@33) = null
-    packageFragments('p.C': FqName@34) = null
-    packageFragments('p.G1': FqName@35) = null
-    packageFragments('p.G2': FqName@36) = null
-    packageFragments('p.Int': FqName@37) = null
-    packageFragments('p.String': FqName@38) = null
-}
-
-LazyJavaPackageFragmentProvider@39 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@40['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@41) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('G1': FqName@42) = null
-    packageFragments('G2': FqName@43) = null
-    packageFragments('Int': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.B': FqName@49) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.G1': FqName@50) = null
-    packageFragments('java.lang.G2': FqName@51) = null
-    packageFragments('java.lang.Int': FqName@52) = null
-    packageFragments('kotlin': FqName@53) = null
-    packageFragments('kotlin.Any': FqName@22) = null
-    packageFragments('kotlin.B': FqName@54) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.G1': FqName@55) = null
-    packageFragments('kotlin.G2': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.io': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = null
-    packageFragments('p': FqName@60) = null
-    packageFragments('p.Any': FqName@32) = null
-    packageFragments('p.B': FqName@61) = null
-    packageFragments('p.C': FqName@62) = null
-    packageFragments('p.G1': FqName@63) = null
-    packageFragments('p.G2': FqName@64) = null
-    packageFragments('p.Int': FqName@65) = null
-}
-
-LazyJavaPackageFragmentProvider@66 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@67['<root>']
-    packageFragments('B': FqName@68) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('G1': FqName@69) = null
-    packageFragments('G2': FqName@70) = null
-    packageFragments('Int': FqName@71) = null
-    packageFragments('String': FqName@72) = null
-    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
-    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
-    packageFragments('java.lang.B': FqName@77) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.G1': FqName@78) = null
-    packageFragments('java.lang.G2': FqName@79) = null
-    packageFragments('java.lang.Int': FqName@80) = null
-    packageFragments('java.lang.String': FqName@81) = null
-    packageFragments('kotlin': FqName@82) = null
-    packageFragments('kotlin.B': FqName@83) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.G1': FqName@84) = null
-    packageFragments('kotlin.G2': FqName@85) = null
-    packageFragments('kotlin.Int': FqName@86) = null
-    packageFragments('kotlin.String': FqName@87) = null
-    packageFragments('kotlin.io': FqName@88) = null
-    packageFragments('kotlin.jvm': FqName@89) = null
-    packageFragments('p': FqName@90) = null
-    packageFragments('p.B': FqName@91) = null
-    packageFragments('p.C': FqName@34) = null
-    packageFragments('p.G1': FqName@92) = null
-    packageFragments('p.G2': FqName@93) = null
-    packageFragments('p.Int': FqName@94) = null
-    packageFragments('p.String': FqName@95) = null
-}
-
-LazyJavaPackageFragmentProvider@96 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@97['<root>']
-    packageFragments('B': FqName@41) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@98) = LazyJavaPackageFragment@99['java']
-    packageFragments('java.lang': FqName@100) = LazyJavaPackageFragment@101['lang']
-    packageFragments('java.lang.B': FqName@49) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('kotlin': FqName@102) = null
-    packageFragments('kotlin.B': FqName@54) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.io': FqName@103) = null
-    packageFragments('kotlin.jvm': FqName@104) = null
-    packageFragments('p': FqName@105) = null
-    packageFragments('p.B': FqName@106) = null
-    packageFragments('p.C': FqName@62) = null
-}
-
-LazyJavaPackageFragmentProvider@107 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@108['<root>']
-    packageFragments('B': FqName@4) = null
-    packageFragments('G1': FqName@6) = null
-    packageFragments('G2': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
-    packageFragments('java.lang': FqName@111) = LazyJavaPackageFragment@112['lang']
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.G1': FqName@17) = null
-    packageFragments('java.lang.G2': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.String': FqName@20) = null
-    packageFragments('kotlin': FqName@113) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.G1': FqName@25) = null
-    packageFragments('kotlin.G2': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.String': FqName@28) = null
-    packageFragments('kotlin.io': FqName@114) = null
-    packageFragments('kotlin.jvm': FqName@115) = null
-    packageFragments('p': FqName@116) = null
-    packageFragments('p.B': FqName@33) = null
-    packageFragments('p.C': FqName@34) = null
-    packageFragments('p.G1': FqName@117) = null
-    packageFragments('p.G2': FqName@118) = null
-    packageFragments('p.Int': FqName@37) = null
-    packageFragments('p.String': FqName@38) = null
-}
-
-LazyJavaPackageFragment@40['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@120
-}
-
-LazyJavaPackageFragment@97['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
-}
-
-LazyJavaPackageFragment@67['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@129
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaPackageFragment@99['java'] {
-    classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('lang': Name@135) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('lang': Name@139) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@138
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('lang': Name@143) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('lang': Name@147) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@146
-}
-
-LazyJavaPackageFragment@110['java'] {
-    classes('lang': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('lang': Name@151) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@150
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
-}
-
-null {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@166[3] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
deleted file mode 100644
index fc6f3de0215..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Int': FqName@25) = null
-    packageFragments('p.String': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@30) = null
-    packageFragments('String': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.B': FqName@36) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.B': FqName@40) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@41) = null
-    packageFragments('kotlin.String': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('p': FqName@45) = null
-    packageFragments('p.B': FqName@46) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Int': FqName@48) = null
-    packageFragments('p.String': FqName@49) = null
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('B': FqName@52) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.B': FqName@57) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.B': FqName@59) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    packageFragments('p': FqName@62) = null
-    packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@24) = null
-}
-
-LazyJavaPackageFragmentProvider@64 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@65['<root>']
-    packageFragments('B': FqName@66) = null
-    packageFragments('Int': FqName@67) = null
-    packageFragments('String': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.B': FqName@73) = null
-    packageFragments('java.lang.Int': FqName@74) = null
-    packageFragments('java.lang.String': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.B': FqName@77) = null
-    packageFragments('kotlin.Int': FqName@78) = null
-    packageFragments('kotlin.String': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    packageFragments('p': FqName@82) = null
-    packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Int': FqName@84) = null
-    packageFragments('p.String': FqName@85) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
deleted file mode 100644
index 3adc94aa4ef..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
+++ /dev/null
@@ -1,145 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.B': FqName@20) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.Int': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.B': FqName@30) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.B': FqName@32) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('p': FqName@35) = null
-    packageFragments('p.B': FqName@36) = null
-    packageFragments('p.C': FqName@37) = null
-}
-
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('p': FqName@47) = null
-    packageFragments('p.B': FqName@48) = null
-    packageFragments('p.C': FqName@21) = null
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('B': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.B': FqName@56) = null
-    packageFragments('kotlin': FqName@57) = null
-    packageFragments('kotlin.B': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    packageFragments('p': FqName@61) = null
-    packageFragments('p.B': FqName@62) = null
-    packageFragments('p.C': FqName@37) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@104[3] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
deleted file mode 100644
index 95672d41759..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
+++ /dev/null
@@ -1,147 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.B': FqName@20) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.String': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.B': FqName@31) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.String': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.B': FqName@34) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.String': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-    packageFragments('p': FqName@38) = null
-    packageFragments('p.B': FqName@39) = null
-    packageFragments('p.C': FqName@40) = null
-    packageFragments('p.String': FqName@41) = null
-}
-
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('B': FqName@44) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.B': FqName@49) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.B': FqName@51) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    packageFragments('p': FqName@54) = null
-    packageFragments('p.B': FqName@55) = null
-    packageFragments('p.C': FqName@40) = null
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('B': FqName@58) = null
-    packageFragments('String': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@64) = null
-    packageFragments('java.lang.String': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.B': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    packageFragments('p': FqName@71) = null
-    packageFragments('p.B': FqName@72) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.String': FqName@73) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-null {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
deleted file mode 100644
index ed1e558c6f4..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@48) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.B': FqName@53) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.B': FqName@55) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    packageFragments('p': FqName@58) = null
-    packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-}
-
-LazyJavaPackageFragmentProvider@60 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('B': FqName@62) = null
-    packageFragments('T': FqName@63) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.B': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.B': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    packageFragments('p': FqName@75) = null
-    packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@77) = null
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
-}
-
-null {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@133[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
deleted file mode 100644
index e829c6a9d18..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Tr': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Tr': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Tr': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.T': FqName@25) = null
-    packageFragments('p.Tr': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('T': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@48) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.B': FqName@53) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.B': FqName@55) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    packageFragments('p': FqName@58) = null
-    packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@24) = null
-}
-
-LazyJavaPackageFragmentProvider@60 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('B': FqName@62) = null
-    packageFragments('T': FqName@63) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.B': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.B': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    packageFragments('p': FqName@75) = null
-    packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@77) = null
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@85) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@85) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('p': Name@85) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-null {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@126[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
deleted file mode 100644
index c3623e865c2..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
+++ /dev/null
@@ -1,262 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.B': FqName@20) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.String': FqName@22) = null
-    packageFragments('p.T': FqName@23) = null
-}
-
-LazyJavaPackageFragmentProvider@24 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@25['<root>']
-    packageFragments('B': FqName@26) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('T': FqName@27) = null
-    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    packageFragments('java.lang.B': FqName@32) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.T': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = null
-    packageFragments('kotlin.B': FqName@35) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.T': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('p': FqName@39) = null
-    packageFragments('p.B': FqName@40) = null
-    packageFragments('p.String': FqName@22) = null
-    packageFragments('p.T': FqName@41) = null
-}
-
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('B': FqName@44) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.B': FqName@49) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.B': FqName@51) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    packageFragments('p': FqName@54) = null
-    packageFragments('p.B': FqName@55) = null
-    packageFragments('p.String': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('B': FqName@58) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@64) = null
-    packageFragments('java.lang.T': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.B': FqName@67) = null
-    packageFragments('kotlin.T': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    packageFragments('p': FqName@71) = null
-    packageFragments('p.B': FqName@72) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.T': FqName@73) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@25['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
-}
-
-null {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@185[2] { ResolutionCandidate@167, ResolutionCandidate@168 }
-    <name not found> = ArrayList@186[2] { ResolutionCandidate@155, ResolutionCandidate@156 }
-    <name not found> = ArrayList@187[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
-    <name not found> = ArrayList@188[2] { ResolutionCandidate@159, ResolutionCandidate@160 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
deleted file mode 100644
index 01601fd44bb..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@48) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.B': FqName@53) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.B': FqName@55) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    packageFragments('p': FqName@58) = null
-    packageFragments('p.B': FqName@59) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-}
-
-LazyJavaPackageFragmentProvider@60 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('B': FqName@62) = null
-    packageFragments('T': FqName@63) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.B': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.B': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    packageFragments('p': FqName@75) = null
-    packageFragments('p.B': FqName@76) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.T': FqName@77) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
-}
-
-null {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@133[3] { ResolutionCandidate@121, ResolutionCandidate@122, ResolutionCandidate@123 }
-    <name not found> = ArrayList@134[3] { ResolutionCandidate@126, ResolutionCandidate@127, ResolutionCandidate@128 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
deleted file mode 100644
index dbf7d17ec57..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
+++ /dev/null
@@ -1,195 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.Foo': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.Foo': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('p': FqName@25) = null
-    packageFragments('p.B': FqName@26) = null
-    packageFragments('p.C': FqName@27) = null
-    packageFragments('p.Foo': FqName@28) = null
-    packageFragments('p.String': FqName@29) = null
-    packageFragments('p.T': FqName@30) = null
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@32['<root>']
-    packageFragments('B': FqName@33) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Foo': FqName@34) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.B': FqName@40) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.Foo': FqName@41) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = null
-    packageFragments('kotlin.B': FqName@44) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.Foo': FqName@45) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('p': FqName@49) = null
-    packageFragments('p.B': FqName@50) = null
-    packageFragments('p.C': FqName@51) = null
-    packageFragments('p.Foo': FqName@52) = null
-    packageFragments('p.String': FqName@29) = null
-    packageFragments('p.T': FqName@53) = null
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.C': FqName@19) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    packageFragments('p': FqName@63) = null
-    packageFragments('p.B': FqName@64) = null
-    packageFragments('p.C': FqName@27) = null
-    packageFragments('p.String': FqName@29) = null
-}
-
-LazyJavaPackageFragmentProvider@65 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@66['<root>']
-    packageFragments('B': FqName@33) = null
-    packageFragments('Foo': FqName@67) = null
-    packageFragments('T': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.B': FqName@40) = null
-    packageFragments('java.lang.Foo': FqName@73) = null
-    packageFragments('java.lang.T': FqName@74) = null
-    packageFragments('kotlin': FqName@75) = null
-    packageFragments('kotlin.B': FqName@44) = null
-    packageFragments('kotlin.Foo': FqName@76) = null
-    packageFragments('kotlin.T': FqName@77) = null
-    packageFragments('kotlin.io': FqName@78) = null
-    packageFragments('kotlin.jvm': FqName@79) = null
-    packageFragments('p': FqName@80) = null
-    packageFragments('p.B': FqName@81) = null
-    packageFragments('p.C': FqName@51) = null
-    packageFragments('p.Foo': FqName@82) = null
-    packageFragments('p.T': FqName@83) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@55['<root>'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@32['<root>'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('lang': Name@111) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@139[3] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129 }
-    <name not found> = ArrayList@140[3] { ResolutionCandidate@132, ResolutionCandidate@133, ResolutionCandidate@134 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
deleted file mode 100644
index fd2c2b3584e..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('p': FqName@42) = null
-    packageFragments('p.B': FqName@43) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.String': FqName@25) = null
-    packageFragments('p.T': FqName@45) = null
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    packageFragments('p': FqName@55) = null
-    packageFragments('p.B': FqName@56) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.String': FqName@25) = null
-}
-
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@35) = null
-    packageFragments('java.lang.T': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@38) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = null
-    packageFragments('p': FqName@69) = null
-    packageFragments('p.B': FqName@70) = null
-    packageFragments('p.C': FqName@44) = null
-    packageFragments('p.T': FqName@71) = null
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
deleted file mode 100644
index b6e9dab7b92..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
+++ /dev/null
@@ -1,165 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('p': FqName@22) = null
-    packageFragments('p.B': FqName@23) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Int': FqName@25) = null
-    packageFragments('p.String': FqName@26) = null
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('B': FqName@29) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('Int': FqName@30) = null
-    packageFragments('String': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.B': FqName@36) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.B': FqName@40) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@41) = null
-    packageFragments('kotlin.String': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('p': FqName@45) = null
-    packageFragments('p.B': FqName@46) = null
-    packageFragments('p.C': FqName@47) = null
-    packageFragments('p.Int': FqName@48) = null
-    packageFragments('p.String': FqName@49) = null
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('B': FqName@52) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.B': FqName@57) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.B': FqName@59) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    packageFragments('p': FqName@62) = null
-    packageFragments('p.B': FqName@63) = null
-    packageFragments('p.C': FqName@47) = null
-}
-
-LazyJavaPackageFragmentProvider@64 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@65['<root>']
-    packageFragments('B': FqName@66) = null
-    packageFragments('Int': FqName@67) = null
-    packageFragments('String': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.B': FqName@73) = null
-    packageFragments('java.lang.Int': FqName@74) = null
-    packageFragments('java.lang.String': FqName@75) = null
-    packageFragments('kotlin': FqName@76) = null
-    packageFragments('kotlin.B': FqName@77) = null
-    packageFragments('kotlin.Int': FqName@78) = null
-    packageFragments('kotlin.String': FqName@79) = null
-    packageFragments('kotlin.io': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = null
-    packageFragments('p': FqName@82) = null
-    packageFragments('p.B': FqName@83) = null
-    packageFragments('p.C': FqName@24) = null
-    packageFragments('p.Int': FqName@84) = null
-    packageFragments('p.String': FqName@85) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@104) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@127[3] { ResolutionCandidate@122, ResolutionCandidate@123, ResolutionCandidate@124 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
deleted file mode 100644
index 99feec92832..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.B': FqName@9) = null
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.B': FqName@12) = null
-    packageFragments('kotlin.C': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.B': FqName@17) = null
-    packageFragments('p.C': FqName@18) = null
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('B': FqName@21) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.B': FqName@26) = null
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.C': FqName@13) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = null
-    packageFragments('p.B': FqName@32) = null
-    packageFragments('p.C': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('B': FqName@36) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.B': FqName@41) = null
-    packageFragments('java.lang.C': FqName@10) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.B': FqName@43) = null
-    packageFragments('kotlin.C': FqName@13) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    packageFragments('p': FqName@46) = null
-    packageFragments('p.B': FqName@47) = null
-    packageFragments('p.C': FqName@33) = null
-}
-
-LazyJavaPackageFragmentProvider@48 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('B': FqName@50) = null
-    packageFragments('java': FqName@51) = LazyJavaPackageFragment@52['java']
-    packageFragments('java.lang': FqName@53) = LazyJavaPackageFragment@54['lang']
-    packageFragments('java.lang.B': FqName@55) = null
-    packageFragments('kotlin': FqName@56) = null
-    packageFragments('kotlin.B': FqName@57) = null
-    packageFragments('kotlin.io': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = null
-    packageFragments('p': FqName@60) = null
-    packageFragments('p.B': FqName@61) = null
-    packageFragments('p.C': FqName@18) = null
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('lang': Name@76) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@52['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@84) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
-}
-
-null {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@103[3] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
deleted file mode 100644
index 91ad05589c5..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
+++ /dev/null
@@ -1,281 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('G1': FqName@5) = null
-    packageFragments('G2': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.G1': FqName@15) = null
-    packageFragments('java.lang.G2': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.G1': FqName@22) = null
-    packageFragments('kotlin.G2': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.String': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-    packageFragments('p': FqName@28) = null
-    packageFragments('p.B': FqName@29) = null
-    packageFragments('p.C': FqName@30) = null
-    packageFragments('p.G1': FqName@31) = null
-    packageFragments('p.G2': FqName@32) = null
-    packageFragments('p.Int': FqName@33) = null
-    packageFragments('p.String': FqName@34) = null
-}
-
-LazyJavaPackageFragmentProvider@35 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('B': FqName@37) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('G1': FqName@38) = null
-    packageFragments('G2': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('String': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.B': FqName@46) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.G1': FqName@47) = null
-    packageFragments('java.lang.G2': FqName@48) = null
-    packageFragments('java.lang.Int': FqName@49) = null
-    packageFragments('java.lang.String': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.G1': FqName@53) = null
-    packageFragments('kotlin.G2': FqName@54) = null
-    packageFragments('kotlin.Int': FqName@55) = null
-    packageFragments('kotlin.String': FqName@56) = null
-    packageFragments('kotlin.io': FqName@57) = null
-    packageFragments('kotlin.jvm': FqName@58) = null
-    packageFragments('p': FqName@59) = null
-    packageFragments('p.B': FqName@60) = null
-    packageFragments('p.C': FqName@61) = null
-    packageFragments('p.G1': FqName@62) = null
-    packageFragments('p.G2': FqName@63) = null
-    packageFragments('p.Int': FqName@64) = null
-    packageFragments('p.String': FqName@65) = null
-}
-
-LazyJavaPackageFragmentProvider@66 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@67['<root>']
-    packageFragments('B': FqName@68) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('G1': FqName@69) = null
-    packageFragments('G2': FqName@70) = null
-    packageFragments('Int': FqName@71) = null
-    packageFragments('String': FqName@72) = null
-    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
-    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
-    packageFragments('java.lang.B': FqName@77) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.G1': FqName@78) = null
-    packageFragments('java.lang.G2': FqName@79) = null
-    packageFragments('java.lang.Int': FqName@80) = null
-    packageFragments('java.lang.String': FqName@81) = null
-    packageFragments('kotlin': FqName@82) = null
-    packageFragments('kotlin.B': FqName@83) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.G1': FqName@84) = null
-    packageFragments('kotlin.G2': FqName@85) = null
-    packageFragments('kotlin.Int': FqName@86) = null
-    packageFragments('kotlin.String': FqName@87) = null
-    packageFragments('kotlin.io': FqName@88) = null
-    packageFragments('kotlin.jvm': FqName@89) = null
-    packageFragments('p': FqName@90) = null
-    packageFragments('p.B': FqName@91) = null
-    packageFragments('p.C': FqName@61) = null
-    packageFragments('p.G1': FqName@92) = null
-    packageFragments('p.G2': FqName@93) = null
-    packageFragments('p.Int': FqName@94) = null
-    packageFragments('p.String': FqName@95) = null
-}
-
-LazyJavaPackageFragmentProvider@96 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@97['<root>']
-    packageFragments('B': FqName@98) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('G1': FqName@99) = null
-    packageFragments('G2': FqName@100) = null
-    packageFragments('Int': FqName@101) = null
-    packageFragments('String': FqName@102) = null
-    packageFragments('java': FqName@103) = LazyJavaPackageFragment@104['java']
-    packageFragments('java.lang': FqName@105) = LazyJavaPackageFragment@106['lang']
-    packageFragments('java.lang.B': FqName@107) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.G1': FqName@108) = null
-    packageFragments('java.lang.G2': FqName@109) = null
-    packageFragments('java.lang.Int': FqName@110) = null
-    packageFragments('java.lang.String': FqName@111) = null
-    packageFragments('kotlin': FqName@112) = null
-    packageFragments('kotlin.B': FqName@113) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.G1': FqName@114) = null
-    packageFragments('kotlin.G2': FqName@115) = null
-    packageFragments('kotlin.Int': FqName@116) = null
-    packageFragments('kotlin.String': FqName@117) = null
-    packageFragments('kotlin.io': FqName@118) = null
-    packageFragments('kotlin.jvm': FqName@119) = null
-    packageFragments('p': FqName@120) = null
-    packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@30) = null
-    packageFragments('p.G1': FqName@122) = null
-    packageFragments('p.G2': FqName@123) = null
-    packageFragments('p.Int': FqName@124) = null
-    packageFragments('p.String': FqName@125) = null
-}
-
-LazyJavaPackageFragmentProvider@126 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@127['<root>']
-    packageFragments('B': FqName@98) = null
-    packageFragments('G1': FqName@99) = null
-    packageFragments('G2': FqName@100) = null
-    packageFragments('Int': FqName@101) = null
-    packageFragments('String': FqName@102) = null
-    packageFragments('java': FqName@128) = LazyJavaPackageFragment@129['java']
-    packageFragments('java.lang': FqName@130) = LazyJavaPackageFragment@131['lang']
-    packageFragments('java.lang.B': FqName@107) = null
-    packageFragments('java.lang.G1': FqName@108) = null
-    packageFragments('java.lang.G2': FqName@109) = null
-    packageFragments('java.lang.Int': FqName@110) = null
-    packageFragments('java.lang.String': FqName@111) = null
-    packageFragments('kotlin': FqName@132) = null
-    packageFragments('kotlin.B': FqName@113) = null
-    packageFragments('kotlin.G1': FqName@114) = null
-    packageFragments('kotlin.G2': FqName@115) = null
-    packageFragments('kotlin.Int': FqName@116) = null
-    packageFragments('kotlin.String': FqName@117) = null
-    packageFragments('kotlin.io': FqName@133) = null
-    packageFragments('kotlin.jvm': FqName@134) = null
-    packageFragments('p': FqName@135) = null
-    packageFragments('p.B': FqName@121) = null
-    packageFragments('p.C': FqName@30) = null
-    packageFragments('p.G1': FqName@136) = null
-    packageFragments('p.G2': FqName@137) = null
-    packageFragments('p.Int': FqName@124) = null
-    packageFragments('p.String': FqName@125) = null
-}
-
-LazyJavaPackageFragment@36['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@139
-}
-
-LazyJavaPackageFragment@67['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@152
-}
-
-LazyJavaPackageFragment@97['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@154
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('lang': Name@158) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@157
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('lang': Name@162) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
-}
-
-LazyJavaPackageFragment@129['java'] {
-    classes('lang': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('lang': Name@166) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@165
-}
-
-LazyJavaPackageFragment@104['java'] {
-    classes('lang': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('lang': Name@170) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@169
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('lang': Name@174) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@173
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
-}
-
-null {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@197[3] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
deleted file mode 100644
index e0a8499e8c2..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
+++ /dev/null
@@ -1,161 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.D': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.B': FqName@20) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.D': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.B': FqName@30) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('kotlin': FqName@31) = null
-    packageFragments('kotlin.B': FqName@32) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.D': FqName@16) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-    packageFragments('p': FqName@35) = null
-    packageFragments('p.B': FqName@36) = null
-    packageFragments('p.C': FqName@37) = null
-    packageFragments('p.D': FqName@38) = null
-}
-
-LazyJavaPackageFragmentProvider@39 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@40['<root>']
-    packageFragments('B': FqName@41) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.B': FqName@46) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('kotlin': FqName@47) = null
-    packageFragments('kotlin.B': FqName@48) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.D': FqName@16) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-    packageFragments('p': FqName@51) = null
-    packageFragments('p.B': FqName@52) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.D': FqName@38) = null
-}
-
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('B': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@60) = null
-    packageFragments('kotlin': FqName@61) = null
-    packageFragments('kotlin.B': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    packageFragments('p': FqName@65) = null
-    packageFragments('p.B': FqName@66) = null
-    packageFragments('p.C': FqName@37) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@40['<root>'] {
-    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@113[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
deleted file mode 100644
index bbcfdf2a10d..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
+++ /dev/null
@@ -1,157 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.B': FqName@20) = null
-    packageFragments('p.C': FqName@21) = null
-    packageFragments('p.String': FqName@22) = null
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.B': FqName@31) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('java.lang.String': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.B': FqName@34) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.String': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-    packageFragments('p': FqName@38) = null
-    packageFragments('p.B': FqName@39) = null
-    packageFragments('p.C': FqName@40) = null
-    packageFragments('p.String': FqName@41) = null
-}
-
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-    packageFragments('p': FqName@51) = null
-    packageFragments('p.B': FqName@52) = null
-    packageFragments('p.C': FqName@21) = null
-}
-
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('B': FqName@25) = null
-    packageFragments('String': FqName@26) = null
-    packageFragments('T': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@31) = null
-    packageFragments('java.lang.String': FqName@32) = null
-    packageFragments('java.lang.T': FqName@60) = null
-    packageFragments('kotlin': FqName@61) = null
-    packageFragments('kotlin.B': FqName@34) = null
-    packageFragments('kotlin.String': FqName@35) = null
-    packageFragments('kotlin.T': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    packageFragments('p': FqName@65) = null
-    packageFragments('p.B': FqName@66) = null
-    packageFragments('p.C': FqName@40) = null
-    packageFragments('p.String': FqName@41) = null
-    packageFragments('p.T': FqName@67) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@109[3] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106 }
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
deleted file mode 100644
index 5ae0a22200c..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
+++ /dev/null
@@ -1,116 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.C': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('p': FqName@23) = null
-    packageFragments('p.A': FqName@24) = null
-    packageFragments('p.B': FqName@25) = null
-    packageFragments('p.Base': FqName@26) = null
-    packageFragments('p.C': FqName@27) = null
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@30) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Base': FqName@35) = null
-    packageFragments('java.lang.C': FqName@15) = null
-    packageFragments('kotlin': FqName@36) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.Base': FqName@37) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-    packageFragments('p': FqName@40) = null
-    packageFragments('p.B': FqName@41) = null
-    packageFragments('p.Base': FqName@42) = null
-    packageFragments('p.C': FqName@43) = null
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.C': FqName@15) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.B': FqName@18) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-    packageFragments('p': FqName@53) = null
-    packageFragments('p.B': FqName@25) = null
-    packageFragments('p.C': FqName@43) = null
-}
-
-LazyJavaPackageFragment@45['<root>'] {
-    classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('p': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@29['<root>'] {
-    classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('p': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('C': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('lang': Name@76) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
deleted file mode 100644
index fe83893a5a6..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
+++ /dev/null
@@ -1,112 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Base': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('p': FqName@20) = null
-    packageFragments('p.A': FqName@21) = null
-    packageFragments('p.B': FqName@22) = null
-    packageFragments('p.Base': FqName@23) = null
-}
-
-LazyJavaPackageFragmentProvider@24 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@25['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@26) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.Base': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    packageFragments('p': FqName@36) = null
-    packageFragments('p.A': FqName@37) = null
-    packageFragments('p.B': FqName@38) = null
-    packageFragments('p.Base': FqName@39) = null
-}
-
-LazyJavaPackageFragmentProvider@40 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@41['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('p': FqName@49) = null
-    packageFragments('p.A': FqName@37) = null
-    packageFragments('p.B': FqName@22) = null
-}
-
-LazyJavaPackageFragment@25['<root>'] {
-    classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('p': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@41['<root>'] {
-    classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('B': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('p': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('p': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
deleted file mode 100644
index 11b01401774..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
+++ /dev/null
@@ -1,146 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Base': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Base': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Array': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Base': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('p': FqName@26) = null
-    packageFragments('p.A': FqName@27) = null
-    packageFragments('p.Array': FqName@28) = null
-    packageFragments('p.B': FqName@29) = null
-    packageFragments('p.Base': FqName@30) = null
-    packageFragments('p.T': FqName@31) = null
-}
-
-LazyJavaPackageFragmentProvider@32 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@34) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Base': FqName@35) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('T': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@41) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Base': FqName@42) = null
-    packageFragments('java.lang.T': FqName@43) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Array': FqName@45) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Base': FqName@46) = null
-    packageFragments('kotlin.T': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    packageFragments('p': FqName@50) = null
-    packageFragments('p.A': FqName@51) = null
-    packageFragments('p.Array': FqName@52) = null
-    packageFragments('p.B': FqName@29) = null
-    packageFragments('p.Base': FqName@53) = null
-    packageFragments('p.T': FqName@54) = null
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@56['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@57) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Base': FqName@58) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@64) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Base': FqName@65) = null
-    packageFragments('java.lang.T': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.Array': FqName@68) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Base': FqName@69) = null
-    packageFragments('kotlin.T': FqName@70) = null
-    packageFragments('kotlin.io': FqName@71) = null
-    packageFragments('kotlin.jvm': FqName@72) = null
-    packageFragments('p': FqName@73) = null
-    packageFragments('p.A': FqName@27) = null
-    packageFragments('p.Array': FqName@74) = null
-    packageFragments('p.B': FqName@75) = null
-    packageFragments('p.Base': FqName@76) = null
-    packageFragments('p.T': FqName@77) = null
-}
-
-LazyJavaPackageFragment@33['<root>'] {
-    classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Base': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@56['<root>'] {
-    classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Base': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('Base': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
deleted file mode 100644
index b2966d2cc60..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
+++ /dev/null
@@ -1,135 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Base': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.T': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('p': FqName@26) = null
-    packageFragments('p.A': FqName@27) = null
-    packageFragments('p.B': FqName@28) = null
-    packageFragments('p.Base': FqName@29) = null
-    packageFragments('p.String': FqName@30) = null
-    packageFragments('p.T': FqName@31) = null
-}
-
-LazyJavaPackageFragmentProvider@32 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Base': FqName@34) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('String': FqName@35) = null
-    packageFragments('T': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Base': FqName@41) = null
-    packageFragments('java.lang.String': FqName@42) = null
-    packageFragments('java.lang.T': FqName@43) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Base': FqName@45) = null
-    packageFragments('kotlin.String': FqName@46) = null
-    packageFragments('kotlin.T': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    packageFragments('p': FqName@50) = null
-    packageFragments('p.A': FqName@51) = null
-    packageFragments('p.B': FqName@52) = null
-    packageFragments('p.Base': FqName@53) = null
-    packageFragments('p.String': FqName@54) = null
-    packageFragments('p.T': FqName@55) = null
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@62) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    packageFragments('p': FqName@65) = null
-    packageFragments('p.A': FqName@51) = null
-    packageFragments('p.B': FqName@28) = null
-    packageFragments('p.String': FqName@30) = null
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('p': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('p': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('p': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('p': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@33['<root>'] {
-    classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@72) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log b/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
deleted file mode 100644
index d7b2d63d7e0..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
+++ /dev/null
@@ -1,272 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('p': FqName@12) = null
-    packageFragments('p.A': FqName@13) = null
-    packageFragments('p.B': FqName@14) = null
-    packageFragments('p.a': FqName@15) = null
-    packageFragments('p.v': FqName@16) = null
-}
-
-LazyJavaPackageFragmentProvider@17 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('p': FqName@26) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('p': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('v': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('A': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('B': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('a': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('p': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('p': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('v': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('a': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('p': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('v': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('A': Name@48) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('B': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('a': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('v': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('A': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('B': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('a': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-null {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
deleted file mode 100644
index b48e505d714..00000000000
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-DescriptorResolver@4 {
-    <name not found> = IntValue@5
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('p': FqName@16) = null
-    packageFragments('p.a': FqName@17) = null
-    packageFragments('p.b': FqName@18) = null
-    packageFragments('p.c': FqName@19) = null
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-    packageFragments('p': FqName@29) = null
-    packageFragments('p.c': FqName@19) = null
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('a': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('a': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
deleted file mode 100644
index b3a4c66a9fe..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['A']
-    valueArguments(ValueParameterDescriptorImpl@3['x']) = IntegerValueTypeConstant@4
-    valueArguments(ValueParameterDescriptorImpl@5['y']) = StringValue@6
-}
-
-LazyJavaClassDescriptor@7['A'] {
-    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['A']
-    typeConstructor = LazyJavaClassTypeConstructor@12['A']
-}
-
-LazyJavaClassTypeConstructor@12['A'] {
-    parameters = ArrayList@13[empty]
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaPackageFragmentProvider@18 {
-    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('A': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    topLevelClasses(JavaClassImpl@31['A']) = LazyJavaClassDescriptor@7['A']
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('A': Name@32) = LazyJavaClassDescriptor@7['A'] // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
deleted file mode 100644
index 2cf8851230b..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
+++ /dev/null
@@ -1,72 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['A']
-}
-
-LazyJavaClassDescriptor@2['A'] {
-    constructors = ArrayList@3[1] { JavaConstructorDescriptor@4['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@1['A']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@6['A']
-}
-
-LazyJavaClassTypeConstructor@6['A'] {
-    parameters = ArrayList@7[empty]
-}
-
-LazyJavaClassifierType@8['String'] {
-    arguments = ArrayList@9[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'false': Boolean@11
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'true': Boolean@15
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('test': FqName@26) = null
-    topLevelClasses(JavaClassImpl@27['A']) = LazyJavaClassDescriptor@2['A']
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@28) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('A': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
deleted file mode 100644
index e3cd31b93cc..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
+++ /dev/null
@@ -1,222 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaClassDescriptor@2['JavaSuperClass'] {
-    allDescriptors = ArrayList@3[5] { DeserializedSimpleFunctionDescriptor@4['hashCode'], JavaMethodDescriptor@5['foo'], JavaMethodDescriptor@6['multipleParameters'], ... } // through LazyJavaClassMemberScope@7
-    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@10['JavaSuperClass']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
-    functionTypeForSamInterface = null
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['equals'] } // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('foo': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@5['foo'] } // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@20) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@21) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@4['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('multipleParameters': Name@23) = ArrayList@24[1] { JavaMethodDescriptor@6['multipleParameters'] } // through LazyJavaClassMemberScope@7
-    functions('notify': Name@25) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@26) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@30) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@7
-    nestedClasses('foo': Name@33) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('multipleParameters': Name@34) = null // through LazyJavaClassMemberScope@7
-    properties('foo': Name@35) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['JavaSuperClass']
-}
-
-LazyJavaClassTypeConstructor@37['JavaSuperClass'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { JetTypeImpl@40['Any'] }
-}
-
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@44['String'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['String']
-    nullable = 'false': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@49['String'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@46['String']
-    nullable = 'true': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('Int': FqName@55) = null
-    packageFragments('JavaSuperClass': FqName@56) = null
-    packageFragments('KotlinSubClass': FqName@57) = null
-    packageFragments('KotlinSubSubClass': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Int': FqName@63) = null
-    packageFragments('java.lang.JavaSuperClass': FqName@64) = null
-    packageFragments('java.lang.KotlinSubClass': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Int': FqName@67) = null
-    packageFragments('kotlin.JavaSuperClass': FqName@68) = null
-    packageFragments('kotlin.KotlinSubClass': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@72['JavaSuperClass']) = LazyJavaClassDescriptor@2['JavaSuperClass']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('JavaSuperClass': Name@75) = LazyJavaClassDescriptor@2['JavaSuperClass'] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('KotlinSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('KotlinSubSubClass': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('JavaSuperClass': Name@79) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('KotlinSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('KotlinSubSubClass': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('foo': Name@35) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('JavaSuperClass': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KotlinSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('KotlinSubSubClass': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('JavaSuperClass': Name@79) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KotlinSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KotlinSubSubClass': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@35) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
deleted file mode 100644
index 7452fb72479..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
+++ /dev/null
@@ -1,118 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[2] { JavaConstructorDescriptor@2['<init>'], SamAdapterConstructorDescriptor@3['<init>'] } // through LazyJavaClassMemberScope@4
-    defaultType = JetTypeImpl@5['J']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@6['J']
-}
-
-LazyJavaClassDescriptor@7['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@8['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['Runnable']
-}
-
-LazyJavaClassTypeConstructor@6['J'] {
-    parameters = ArrayList@11[empty]
-}
-
-LazyJavaClassTypeConstructor@10['Runnable'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
-}
-
-LazyJavaClassifierType@15['Boolean'] {
-    arguments = ArrayList@16[empty]
-    classifier = JavaClassImpl@17['Boolean']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['Boolean'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@17['Boolean']
-    nullable = 'true': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@23['Object'] {
-    classifier = JavaClassImpl@24['Object']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@26['Runnable'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['Runnable']
-    nullable = 'false': Boolean@18
-    typeConstructor = LazyJavaClassTypeConstructor@10['Runnable']
-}
-
-LazyJavaClassifierType@29['Runnable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@28['Runnable']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@10['Runnable']
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@18
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('test': FqName@47) = LazyJavaPackageFragment@48['test']
-    topLevelClasses(JavaClassImpl@49['J']) = LazyJavaClassDescriptor@0['J']
-    topLevelClasses(JavaClassImpl@28['Runnable']) = LazyJavaClassDescriptor@7['Runnable']
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@53) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@43['lang'] {
-    classes('J': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('J': Name@56) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@48['test'] {
-    classes('J': Name@56) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('J': Name@56) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@63, ResolutionCandidate@65 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
deleted file mode 100644
index 760c4aacc7b..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('foo': Name@3) = ArrayList@4[2] { JavaMethodDescriptor@5['foo'], SamAdapterFunctionDescriptor@6['foo'] } // through LazyJavaStaticClassScope@7
-    functions('foo': Name@3) = EmptyList@8[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@2
-    nestedClasses('foo': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('foo': Name@3) = EmptyList@8[empty] // through LazyJavaClassMemberScope@2
-    properties('foo': Name@3) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassDescriptor@13['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@14['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Runnable']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    supertypes = ArrayList@17[1] { JetTypeImpl@18['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Runnable'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { JetTypeImpl@18['Any'] }
-}
-
-LazyJavaClassifierType@21['Boolean'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['Boolean']
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@26['Boolean'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@23['Boolean']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@29['Object'] {
-    classifier = JavaClassImpl@30['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@34['Runnable'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['Runnable']
-    nullable = 'false': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@16['Runnable']
-}
-
-LazyJavaClassifierType@37['Runnable'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@36['Runnable']
-    nullable = 'true': Boolean@28
-    typeConstructor = LazyJavaClassTypeConstructor@16['Runnable']
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['String']
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@41['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaPackageFragmentProvider@45 {
-    packageFragments('<root>': FqName@46) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('J': FqName@48) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.J': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.J': FqName@55) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    packageFragments('test': FqName@58) = LazyJavaPackageFragment@59['test']
-    packageFragments('test.J': FqName@60) = null
-    topLevelClasses(JavaClassImpl@61['J']) = LazyJavaClassDescriptor@0['J']
-    topLevelClasses(JavaClassImpl@36['Runnable']) = LazyJavaClassDescriptor@13['Runnable']
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@65) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@59['test'] {
-    classes('J': Name@68) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@72, ResolutionCandidate@74 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
deleted file mode 100644
index cf9d9b6d4f7..00000000000
--- a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
+++ /dev/null
@@ -1,320 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('java.lang.zz': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('kotlin.zz': FqName@17) = null
-    packageFragments('zz': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('zz': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('zz': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('zz': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('zz': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
deleted file mode 100644
index 48182e82173..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
+++ /dev/null
@@ -1,260 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@48, ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[8] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[8] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-}
-
-null {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@210[2] { ResolutionCandidate@48, ResolutionCandidate@49 }
-    <name not found> = ArrayList@211[8] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = ArrayList@212[8] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = ArrayList@213[8] { ResolutionCandidate@156, ResolutionCandidate@157, ResolutionCandidate@158, ... }
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@161, ResolutionCandidate@162, ResolutionCandidate@163, ... }
-    <name not found> = ArrayList@215[8] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
deleted file mode 100644
index 0e87667e95e..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
+++ /dev/null
@@ -1,791 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('contains': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('div': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('times': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('contains': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('div': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('times': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('contains': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('div': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('times': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('contains': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('div': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('times': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-}
-
-null {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@273[8] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@274[8] { ResolutionCandidate@219, ResolutionCandidate@220, ResolutionCandidate@221, ... }
-    <name not found> = ArrayList@275[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
-    <name not found> = ArrayList@276[8] { ResolutionCandidate@73, ResolutionCandidate@74, ResolutionCandidate@75, ... }
-    <name not found> = ArrayList@277[8] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@214, ResolutionCandidate@215, ResolutionCandidate@216, ... }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
deleted file mode 100644
index 05c67e988a4..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Nothing': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.Nothing': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.Nothing': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Nothing': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@70[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
deleted file mode 100644
index 10648571645..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Foo': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
deleted file mode 100644
index e13f24a8e52..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
+++ /dev/null
@@ -1,609 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Foo': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Foo': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[2] { ResolutionCandidate@238, ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[2] { ResolutionCandidate@246, ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[2] { ResolutionCandidate@254, ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
-}
-
-null {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@328[2] { ResolutionCandidate@250, ResolutionCandidate@251 }
-    <name not found> = ArrayList@329[2] { ResolutionCandidate@258, ResolutionCandidate@259 }
-    <name not found> = ArrayList@330[2] { ResolutionCandidate@242, ResolutionCandidate@243 }
-    <name not found> = ArrayList@331[2] { ResolutionCandidate@246, ResolutionCandidate@247 }
-    <name not found> = ArrayList@332[2] { ResolutionCandidate@238, ResolutionCandidate@239 }
-    <name not found> = ArrayList@333[2] { ResolutionCandidate@254, ResolutionCandidate@255 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
deleted file mode 100644
index 7b2feebadd2..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
+++ /dev/null
@@ -1,529 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('bar': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('buzz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('bar': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('buzz': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('bar': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('buzz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('bar': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('buzz': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
deleted file mode 100644
index 3937a13d17b..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt2457': FqName@13) = null
-    packageFragments('kt2457.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
deleted file mode 100644
index 2fa27ed839b..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
+++ /dev/null
@@ -1,78 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('doString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('doString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('doString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('doString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
deleted file mode 100644
index e6768f06e13..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[3] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@38[3] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
deleted file mode 100644
index c17ba0695d0..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
+++ /dev/null
@@ -1,93 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('d': FqName@7) = null
-    packageFragments('d.Int': FqName@8) = null
-    packageFragments('d.Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Unit': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.Unit': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('doSmth1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doSmth1': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@67[16] { ResolutionCandidate@38, ResolutionCandidate@39, ResolutionCandidate@40, ... }
-    <name not found> = ArrayList@68[16] { ResolutionCandidate@43, ResolutionCandidate@44, ResolutionCandidate@45, ... }
-    <name not found> = ArrayList@69[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@76[2] { ResolutionCandidate@65, ResolutionCandidate@66 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
deleted file mode 100644
index 848daf734e4..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('a.Int': FqName@7) = null
-    packageFragments('a.doSmth': FqName@8) = null
-    packageFragments('doSmth': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.doSmth': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.doSmth': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('doSmth': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doSmth': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@49[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
deleted file mode 100644
index 3a311d4bc1d..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
+++ /dev/null
@@ -1,448 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['AbstractMap'] {
-    defaultType = JetTypeImpl@3['AbstractMap<2>']
-    functions('get': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['get'] } // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
-}
-
-LazyJavaClassDescriptor@11['HashMap'] {
-    constructors = ArrayList@12[4] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], ... } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
-    functionTypeForSamInterface = null
-    functions('get': Name@19) = ArrayList@20[1] { JavaMethodDescriptor@21['get'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@16
-    nestedClasses('get': Name@19) = null // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@25['HashMap']
-}
-
-LazyJavaClassDescriptor@26['Serializable'] {
-    functions('get': Name@4) = EmptyList@27[empty] // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@30['Serializable']
-}
-
-LazyJavaClassTypeConstructor@10['AbstractMap'] {
-    parameters = ArrayList@31[2] { LazyJavaTypeParameterDescriptor@32['K'], LazyJavaTypeParameterDescriptor@33['V'] }
-    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@25['HashMap'] {
-    parameters = ArrayList@36[2] { LazyJavaTypeParameterDescriptor@37['K'], LazyJavaTypeParameterDescriptor@38['V'] }
-    supertypes = ArrayList@39[4] { LazyJavaClassifierType@40['AbstractMap<K, V>'], LazyJavaClassifierType@41['Map<K, V>'], LazyJavaClassifierType@42['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@30['Serializable'] {
-    parameters = ArrayList@43[empty]
-    supertypes = ArrayList@44[1] { JetTypeImpl@45['Any'] }
-}
-
-LazyJavaClassifierType@40['AbstractMap<K, V>'] {
-    arguments = ArrayList@46[2] { TypeProjectionImpl@47, TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@49['AbstractMap']
-    memberScope = SubstitutingScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
-}
-
-LazyJavaClassifierType@42['Cloneable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@52['Cloneable']
-    memberScope = DeserializedClassMemberScope@53
-    typeConstructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaClassifierType@55['K'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['K']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@63['K'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['K']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@66['K'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['K']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['K']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@73['K'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@76['K'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@68['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@78['K'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@72['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@80['K'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@65['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@82['K'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@57['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-}
-
-LazyJavaClassifierType@84['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@85[2] { TypeProjectionImpl@86, TypeProjectionImpl@87 }
-    classifier = JavaClassImpl@88['Map']
-    memberScope = SubstitutingScope@89
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@91['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@88['Map']
-    memberScope = SubstitutingScope@95
-    nullable = 'true': Boolean@75
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@35['Map<K, V>'] {
-    arguments = ArrayList@97[2] { TypeProjectionImpl@98, TypeProjectionImpl@99 }
-    classifier = JavaClassImpl@100['Map']
-    memberScope = SubstitutingScope@101
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@41['Map<K, V>'] {
-    arguments = ArrayList@102[2] { TypeProjectionImpl@103, TypeProjectionImpl@104 }
-    classifier = JavaClassImpl@105['Map']
-    memberScope = SubstitutingScope@106
-    typeConstructor = DeserializedClassTypeConstructor@90
-}
-
-LazyJavaClassifierType@107['Object'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['Object']
-    memberScope = DeserializedClassMemberScope@110
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@112['Object'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@114['Object']
-    memberScope = DeserializedClassMemberScope@110
-    nullable = 'false': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@115['Object'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@114['Object']
-    memberScope = DeserializedClassMemberScope@110
-    nullable = 'true': Boolean@75
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@117['Object'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@109['Object']
-    memberScope = DeserializedClassMemberScope@110
-    nullable = 'true': Boolean@75
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@119['Object'] {
-    classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@121['Object'] {
-    classifier = JavaClassImpl@122['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
-}
-
-LazyJavaClassifierType@123['Serializable'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['Serializable']
-    memberScope = LazyJavaClassMemberScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@30['Serializable']
-}
-
-LazyJavaClassifierType@126['V'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@128['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@130['V'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@133['V'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@135['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@136['V'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@138['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
-}
-
-LazyJavaClassifierType@140['V'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@142['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@143['V'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@145['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
-}
-
-LazyJavaClassifierType@146['V'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@148['V']
-    nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@149['V'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@142['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@151['V'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@132['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@153['V'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@128['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@155['V'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@148['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@157['V'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@135['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-}
-
-LazyJavaClassifierType@159['V'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@145['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
-}
-
-LazyJavaClassifierType@161['V'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaTypeParameterImpl@138['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
-}
-
-LazyJavaPackageFragmentProvider@163 {
-    packageFragments('<root>': FqName@164) = LazyJavaPackageFragment@165['<root>']
-    packageFragments('Int': FqName@166) = null
-    packageFragments('SomeClass': FqName@167) = null
-    packageFragments('String': FqName@168) = null
-    packageFragments('java': FqName@169) = LazyJavaPackageFragment@170['java']
-    packageFragments('java.io': FqName@171) = LazyJavaPackageFragment@172['io']
-    packageFragments('java.lang': FqName@173) = LazyJavaPackageFragment@174['lang']
-    packageFragments('java.lang.Int': FqName@175) = null
-    packageFragments('java.lang.SomeClass': FqName@176) = null
-    packageFragments('java.lang.String': FqName@177) = null
-    packageFragments('java.util': FqName@178) = LazyJavaPackageFragment@179['util']
-    packageFragments('kotlin': FqName@180) = null
-    packageFragments('kotlin.Int': FqName@181) = null
-    packageFragments('kotlin.SomeClass': FqName@182) = null
-    packageFragments('kotlin.String': FqName@183) = null
-    packageFragments('kotlin.io': FqName@184) = null
-    packageFragments('kotlin.jvm': FqName@185) = null
-    packageFragments('kt1270': FqName@186) = null
-    packageFragments('kt1270.Int': FqName@187) = null
-    packageFragments('kt1270.SomeClass': FqName@188) = null
-    packageFragments('kt1270.String': FqName@189) = null
-    packageFragments('kt1270.java': FqName@190) = null
-    topLevelClasses(JavaClassImpl@49['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
-    topLevelClasses(JavaClassImpl@191['HashMap']) = LazyJavaClassDescriptor@11['HashMap']
-    topLevelClasses(JavaClassImpl@125['Serializable']) = LazyJavaClassDescriptor@26['Serializable']
-}
-
-LazyJavaPackageFragment@170['java'] {
-    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('util': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('lang': Name@196) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@174['lang'] {
-    classes('java': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@199
-}
-
-LazyJavaPackageFragment@179['util'] {
-    classes('HashMap': Name@200) = LazyJavaClassDescriptor@11['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@201
-    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('HashMap': Name@200) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
-}
-
-LazyJavaTypeParameterDescriptor@37['K'] {
-    defaultType = JetTypeImpl@203['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
-    upperBounds = LinkedHashSet@204[1] { NullableType@205 }
-}
-
-LazyJavaTypeParameterDescriptor@32['K'] {
-    defaultType = JetTypeImpl@206['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaTypeParameterDescriptor@33['V'] {
-    defaultType = JetTypeImpl@207['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@139
-    upperBounds = LinkedHashSet@208[1] { NullableType@209 }
-}
-
-LazyJavaTypeParameterDescriptor@38['V'] {
-    defaultType = JetTypeImpl@210['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-    upperBounds = LinkedHashSet@211[1] { NullableType@212 }
-}
-
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['K']) = LazyJavaTypeParameterDescriptor@32['K']
-    resolve(JavaTypeParameterImpl@215['V']) = LazyJavaTypeParameterDescriptor@33['V']
-}
-
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@217['K']) = LazyJavaTypeParameterDescriptor@37['K']
-    resolve(JavaTypeParameterImpl@218['V']) = LazyJavaTypeParameterDescriptor@38['V']
-}
-
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@138['V']) = null
-}
-
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@135['V']) = null
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@240[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
deleted file mode 100644
index 08a4099e014..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1680': FqName@16) = null
-    packageFragments('kt1680.Int': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
deleted file mode 100644
index 8a8199f5b34..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
+++ /dev/null
@@ -1,204 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['CharSequence'] {
-    defaultType = JetTypeImpl@2['CharSequence']
-    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    functions('length': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['length'] } // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@4
-    nestedClassIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@4
-    nestedClasses('length': Name@5) = null // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['CharSequence']
-}
-
-LazyJavaClassTypeConstructor@11['CharSequence'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
-}
-
-LazyJavaClassifierType@15['Object'] {
-    classifier = JavaClassImpl@16['Object']
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaPackageFragmentProvider@18 {
-    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('Any': FqName@21) = null
-    packageFragments('Array': FqName@22) = null
-    packageFragments('String': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.Any': FqName@28) = null
-    packageFragments('java.lang.Array': FqName@29) = null
-    packageFragments('java.lang.CharSequence': FqName@30) = null
-    packageFragments('java.lang.String': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.Any': FqName@33) = null
-    packageFragments('kotlin.Array': FqName@34) = null
-    packageFragments('kotlin.String': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-    packageFragments('kt1778': FqName@38) = null
-    packageFragments('kt1778.Any': FqName@39) = null
-    packageFragments('kt1778.Array': FqName@40) = null
-    packageFragments('kt1778.String': FqName@41) = null
-    packageFragments('kt1778.java': FqName@42) = null
-    topLevelClasses(JavaClassImpl@43['CharSequence']) = LazyJavaClassDescriptor@1['CharSequence']
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@27['lang'] {
-    classes('CharSequence': Name@50) = LazyJavaClassDescriptor@1['CharSequence'] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('java': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-null {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@124 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
deleted file mode 100644
index 740b97c35da..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.A': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt2109': FqName@13) = null
-    packageFragments('kt2109.A': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
deleted file mode 100644
index 63138ff665e..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
+++ /dev/null
@@ -1,174 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('String': FqName@5) = null
-    packageFragments('e': FqName@6) = null
-    packageFragments('e.String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('bar': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('compareTo': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
deleted file mode 100644
index c8100c41d6c..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
+++ /dev/null
@@ -1,183 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt2146': FqName@13) = null
-    packageFragments('kt2146.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-null {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
deleted file mode 100644
index 4908bc36c1a..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
+++ /dev/null
@@ -1,398 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Array': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt2164': FqName@21) = null
-    packageFragments('kt2164.Array': FqName@22) = null
-    packageFragments('kt2164.Int': FqName@23) = null
-    packageFragments('kt2164.String': FqName@24) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@234[8] { ResolutionCandidate@182, ResolutionCandidate@183, ResolutionCandidate@184, ... }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
deleted file mode 100644
index cb27e4e753f..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
+++ /dev/null
@@ -1,87 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt2176': FqName@16) = null
-    packageFragments('kt2176.Any': FqName@17) = null
-    packageFragments('kt2176.String': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
deleted file mode 100644
index 7d95126f345..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Unit': FqName@3) = null
-    packageFragments('foo': FqName@4) = null
-    packageFragments('foo.Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Unit': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('errorCallback': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('errorCallback': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
deleted file mode 100644
index c0087c95314..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
+++ /dev/null
@@ -1,310 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Appendable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassDescriptor@8['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@12['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassDescriptor@16['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@20['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassDescriptor@24['PrintStream'] {
-    defaultType = JetTypeImpl@25['PrintStream']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
-    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
-    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassDescriptor@37['System'] {
-    enumEntryIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaStaticClassScope@42
-    nestedClassIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@39
-    nestedClasses('out': Name@44) = null // through LazyJavaClassMemberScope@39
-    properties('out': Name@44) = ArrayList@45[1] { JavaPropertyDescriptor@46['out'] } // through LazyJavaStaticClassScope@42
-    properties('out': Name@44) = EmptyList@4[empty] // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@47['System']
-}
-
-LazyJavaClassTypeConstructor@7['Appendable'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@11['AutoCloseable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Closeable'] {
-    parameters = ArrayList@53[empty]
-    supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@23['OutputStream'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@36['PrintStream'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[3] { LazyJavaClassifierType@64['FilterOutputStream'], LazyJavaClassifierType@65['Appendable'], LazyJavaClassifierType@66['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@47['System'] {
-    supertypes = ArrayList@67[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassifierType@65['Appendable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['Appendable']
-    memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassifierType@55['AutoCloseable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassifierType@61['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@66['Closeable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@64['FilterOutputStream'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassifierType@78['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@79
-}
-
-LazyJavaClassifierType@80['Object'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@85['Object'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@58['OutputStream'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassifierType@98['PrintStream'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@101['PrintStream'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    nullable = 'true': Boolean@87
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@103['String'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@107['String'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaPackageFragmentProvider@109 {
-    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    packageFragments('Array': FqName@112) = null
-    packageFragments('Int': FqName@113) = null
-    packageFragments('String': FqName@114) = null
-    packageFragments('System': FqName@115) = null
-    packageFragments('java': FqName@116) = LazyJavaPackageFragment@117['java']
-    packageFragments('java.io': FqName@118) = LazyJavaPackageFragment@119['io']
-    packageFragments('java.lang': FqName@120) = LazyJavaPackageFragment@121['lang']
-    packageFragments('java.lang.Array': FqName@122) = null
-    packageFragments('java.lang.Int': FqName@123) = null
-    packageFragments('java.lang.String': FqName@124) = null
-    packageFragments('java.lang.System': FqName@125) = null
-    packageFragments('kotlin': FqName@126) = null
-    packageFragments('kotlin.Array': FqName@127) = null
-    packageFragments('kotlin.Int': FqName@128) = null
-    packageFragments('kotlin.String': FqName@129) = null
-    packageFragments('kotlin.System': FqName@130) = null
-    packageFragments('kotlin.io': FqName@131) = null
-    packageFragments('kotlin.jvm': FqName@132) = null
-    packageFragments('kt2212': FqName@133) = null
-    packageFragments('kt2212.Array': FqName@134) = null
-    packageFragments('kt2212.Int': FqName@135) = null
-    packageFragments('kt2212.String': FqName@136) = null
-    packageFragments('kt2212.System': FqName@137) = null
-    topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
-    topLevelClasses(JavaClassImpl@138['System']) = LazyJavaClassDescriptor@37['System']
-}
-
-LazyJavaPackageFragment@117['java'] {
-    classes('lang': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('lang': Name@142) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    memberIndex = computeMemberIndex$1@143 // through LazyPackageFragmentScopeForJavaPackage@140
-}
-
-LazyJavaPackageFragment@121['lang'] {
-    classes('System': Name@144) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('equals': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('equals': Name@146) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@145
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[10] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[16] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@179[10] { ResolutionCandidate@150, ResolutionCandidate@151, ResolutionCandidate@152, ... }
-    <name not found> = ArrayList@180[16] { ResolutionCandidate@155, ResolutionCandidate@156, ResolutionCandidate@157, ... }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
deleted file mode 100644
index d60b0c56b35..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
+++ /dev/null
@@ -1,356 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-    packageFragments('kt2216': FqName@17) = null
-    packageFragments('kt2216.Int': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('baz': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('baz': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-}
-
-null {
-    <name not found> = ArrayList@186[16] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@230[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@231[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@232[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@233[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = ArrayList@234[8] { ResolutionCandidate@55, ResolutionCandidate@56, ResolutionCandidate@57, ... }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
deleted file mode 100644
index c92c402cf7d..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('kt2223': FqName@15) = null
-    packageFragments('kt2223.Int': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
deleted file mode 100644
index 8f08c7c637c..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
+++ /dev/null
@@ -1,201 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Array': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('Long': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('a': FqName@12) = null
-    packageFragments('a.A': FqName@13) = null
-    packageFragments('a.Array': FqName@14) = null
-    packageFragments('a.B': FqName@15) = null
-    packageFragments('a.Int': FqName@16) = null
-    packageFragments('a.Long': FqName@17) = null
-    packageFragments('a.Pair': FqName@18) = null
-    packageFragments('a.String': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.A': FqName@24) = null
-    packageFragments('java.lang.Array': FqName@25) = null
-    packageFragments('java.lang.B': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.Long': FqName@28) = null
-    packageFragments('java.lang.String': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.Array': FqName@32) = null
-    packageFragments('kotlin.B': FqName@33) = null
-    packageFragments('kotlin.Int': FqName@34) = null
-    packageFragments('kotlin.Long': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('Pair': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('Pair': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('equals': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-null {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
deleted file mode 100644
index ad8aa9f29b3..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Array': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('equals': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@68, ResolutionCandidate@69 }
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@80[2] { ResolutionCandidate@68, ResolutionCandidate@69 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
deleted file mode 100644
index 43610786455..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
+++ /dev/null
@@ -1,410 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Appendable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassDescriptor@8['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@12['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassDescriptor@16['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@20['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassDescriptor@24['PrintStream'] {
-    defaultType = JetTypeImpl@25['PrintStream']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
-    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
-    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassDescriptor@37['System'] {
-    enumEntryIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaStaticClassScope@42
-    nestedClassIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@39
-    nestedClasses('out': Name@44) = null // through LazyJavaClassMemberScope@39
-    properties('out': Name@44) = ArrayList@45[1] { JavaPropertyDescriptor@46['out'] } // through LazyJavaStaticClassScope@42
-    properties('out': Name@44) = EmptyList@4[empty] // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@47['System']
-}
-
-LazyJavaClassTypeConstructor@7['Appendable'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@11['AutoCloseable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Closeable'] {
-    parameters = ArrayList@53[empty]
-    supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@23['OutputStream'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@36['PrintStream'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[3] { LazyJavaClassifierType@64['FilterOutputStream'], LazyJavaClassifierType@65['Appendable'], LazyJavaClassifierType@66['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@47['System'] {
-    supertypes = ArrayList@67[1] { JetTypeImpl@50['Any'] }
-}
-
-LazyJavaClassifierType@65['Appendable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['Appendable']
-    memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
-}
-
-LazyJavaClassifierType@55['AutoCloseable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
-}
-
-LazyJavaClassifierType@66['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@61['Closeable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
-}
-
-LazyJavaClassifierType@64['FilterOutputStream'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
-}
-
-LazyJavaClassifierType@78['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@79
-}
-
-LazyJavaClassifierType@80['Object'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@85['Object'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@82['Object']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@84
-}
-
-LazyJavaClassifierType@58['OutputStream'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
-}
-
-LazyJavaClassifierType@98['PrintStream'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@83
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@101['PrintStream'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@100['PrintStream']
-    nullable = 'true': Boolean@87
-    typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
-}
-
-LazyJavaClassifierType@103['String'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'false': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaClassifierType@107['String'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@105['String']
-    nullable = 'true': Boolean@87
-    typeConstructor = DeserializedClassTypeConstructor@106
-}
-
-LazyJavaPackageFragmentProvider@109 {
-    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    packageFragments('Int': FqName@112) = null
-    packageFragments('String': FqName@113) = null
-    packageFragments('System': FqName@114) = null
-    packageFragments('java': FqName@115) = LazyJavaPackageFragment@116['java']
-    packageFragments('java.io': FqName@117) = LazyJavaPackageFragment@118['io']
-    packageFragments('java.lang': FqName@119) = LazyJavaPackageFragment@120['lang']
-    packageFragments('java.lang.Int': FqName@121) = null
-    packageFragments('java.lang.String': FqName@122) = null
-    packageFragments('java.lang.System': FqName@123) = null
-    packageFragments('kotlin': FqName@124) = null
-    packageFragments('kotlin.Int': FqName@125) = null
-    packageFragments('kotlin.String': FqName@126) = null
-    packageFragments('kotlin.System': FqName@127) = null
-    packageFragments('kotlin.io': FqName@128) = null
-    packageFragments('kotlin.jvm': FqName@129) = null
-    packageFragments('kt244': FqName@130) = null
-    packageFragments('kt244.A': FqName@131) = null
-    packageFragments('kt244.Int': FqName@132) = null
-    packageFragments('kt244.String': FqName@133) = null
-    packageFragments('kt244.System': FqName@134) = null
-    topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@12['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@16['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@20['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
-    topLevelClasses(JavaClassImpl@135['System']) = LazyJavaClassDescriptor@37['System']
-}
-
-LazyJavaPackageFragment@116['java'] {
-    classes('lang': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    deserializedPackageScope = Empty@138 // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('lang': Name@139) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@137
-}
-
-LazyJavaPackageFragment@120['lang'] {
-    classes('System': Name@141) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('equals': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('i': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@138 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('equals': Name@143) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[10] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[2] { ResolutionCandidate@221, ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@236[10] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@258[2] { ResolutionCandidate@233, ResolutionCandidate@234 }
-    <name not found> = ArrayList@259[2] { ResolutionCandidate@217, ResolutionCandidate@218 }
-    <name not found> = ArrayList@260[2] { ResolutionCandidate@221, ResolutionCandidate@222 }
-    <name not found> = ArrayList@261[2] { ResolutionCandidate@225, ResolutionCandidate@226 }
-    <name not found> = ArrayList@262[2] { ResolutionCandidate@213, ResolutionCandidate@214 }
-    <name not found> = ArrayList@263[2] { ResolutionCandidate@229, ResolutionCandidate@230 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
deleted file mode 100644
index 6dbd31764bf..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
+++ /dev/null
@@ -1,288 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Int': FqName@10) = null
-    packageFragments('example': FqName@11) = null
-    packageFragments('example.Int': FqName@12) = null
-    packageFragments('example.test': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('test': FqName@23) = null
-    packageFragments('test.Int': FqName@24) = null
-    packageFragments('test.Internal': FqName@25) = null
-    packageFragments('test.Public': FqName@26) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[16] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[16] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[16] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[16] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@145[16] { ResolutionCandidate@47, ResolutionCandidate@48, ResolutionCandidate@49, ... }
-    <name not found> = ArrayList@146[16] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@147[16] { ResolutionCandidate@37, ResolutionCandidate@38, ResolutionCandidate@39, ... }
-    <name not found> = ArrayList@148[16] { ResolutionCandidate@42, ResolutionCandidate@43, ResolutionCandidate@44, ... }
-    <name not found> = ArrayList@149[16] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = ArrayList@150[16] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
deleted file mode 100644
index 8c1c35b4acd..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaClassDescriptor@2['A'] {
-    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    functions('foo': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['foo'] } // through LazyJavaStaticClassScope@8
-    functions('foo': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@4
-    nestedClasses('Empty': Name@13) = LazyJavaClassDescriptor@14['Empty'] // through LazyJavaClassMemberScope@4
-    nestedClasses('foo': Name@5) = null // through LazyJavaClassMemberScope@4
-    properties('foo': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    properties('foo': Name@5) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@15['A']
-}
-
-LazyJavaClassDescriptor@14['Empty'] {
-    typeConstructor = LazyJavaClassTypeConstructor@16['Empty']
-}
-
-LazyJavaClassTypeConstructor@15['A'] {
-    supertypes = ArrayList@17[1] { JetTypeImpl@18['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Empty'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Enum<Empty>'] }
-}
-
-LazyJavaClassifierType@22['Empty'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['Empty']
-    nullable = 'false': Boolean@25
-    typeConstructor = LazyJavaClassTypeConstructor@16['Empty']
-}
-
-LazyJavaClassifierType@26['Empty'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@24['Empty']
-    nullable = 'true': Boolean@28
-    typeConstructor = LazyJavaClassTypeConstructor@16['Empty']
-}
-
-LazyJavaClassifierType@21['Enum<Empty>'] {
-    classifier = JavaClassImpl@29['Enum']
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@31['Object'] {
-    classifier = JavaClassImpl@32['Object']
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('A': FqName@37) = null
-    packageFragments('Int': FqName@38) = null
-    packageFragments('Long': FqName@39) = null
-    packageFragments('Number': FqName@40) = null
-    packageFragments('T': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.A': FqName@46) = null
-    packageFragments('java.lang.Int': FqName@47) = null
-    packageFragments('java.lang.Long': FqName@48) = null
-    packageFragments('java.lang.Number': FqName@49) = null
-    packageFragments('java.lang.T': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.A': FqName@52) = null
-    packageFragments('kotlin.Int': FqName@53) = null
-    packageFragments('kotlin.Long': FqName@54) = null
-    packageFragments('kotlin.Number': FqName@55) = null
-    packageFragments('kotlin.T': FqName@56) = null
-    packageFragments('kotlin.io': FqName@57) = null
-    packageFragments('kotlin.jvm': FqName@58) = null
-    topLevelClasses(JavaClassImpl@59['A']) = LazyJavaClassDescriptor@2['A']
-}
-
-LazyJavaPackageFragment@36['<root>'] {
-    classes('A': Name@60) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Int': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Long': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Number': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@45['lang'] {
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
deleted file mode 100644
index c6e75921e8c..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
+++ /dev/null
@@ -1,86 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.aa': FqName@6) = null
-    packageFragments('aa': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.aa': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.aa': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('aa': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('aa': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('bar': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
deleted file mode 100644
index c4baf1334e3..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('INDIRECT': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.INDIRECT': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.INDIRECT': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
deleted file mode 100644
index 34015fa6f3f..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
+++ /dev/null
@@ -1,80 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
deleted file mode 100644
index bdf4addbec9..00000000000
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
+++ /dev/null
@@ -1,108 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Boolean': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Boolean': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Boolean': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.lazy.log
deleted file mode 100644
index 85a8fd952bc..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/baseWithNullableUpperBound.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('FIRST_BOUND': FqName@4) = null
-    packageFragments('INDIRECT': FqName@5) = null
-    packageFragments('N': FqName@6) = null
-    packageFragments('NN': FqName@7) = null
-    packageFragments('NNN': FqName@8) = null
-    packageFragments('SECOND_BOUND': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('TWO_BOUNDS': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.FIRST_BOUND': FqName@17) = null
-    packageFragments('java.lang.INDIRECT': FqName@18) = null
-    packageFragments('java.lang.N': FqName@19) = null
-    packageFragments('java.lang.NN': FqName@20) = null
-    packageFragments('java.lang.NNN': FqName@21) = null
-    packageFragments('java.lang.SECOND_BOUND': FqName@22) = null
-    packageFragments('java.lang.T': FqName@23) = null
-    packageFragments('java.lang.TWO_BOUNDS': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.Any': FqName@26) = null
-    packageFragments('kotlin.FIRST_BOUND': FqName@27) = null
-    packageFragments('kotlin.INDIRECT': FqName@28) = null
-    packageFragments('kotlin.N': FqName@29) = null
-    packageFragments('kotlin.NN': FqName@30) = null
-    packageFragments('kotlin.NNN': FqName@31) = null
-    packageFragments('kotlin.SECOND_BOUND': FqName@32) = null
-    packageFragments('kotlin.T': FqName@33) = null
-    packageFragments('kotlin.TWO_BOUNDS': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
deleted file mode 100644
index c6fb79e7b80..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.String': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.String': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
deleted file mode 100644
index 18b7f1e1874..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
+++ /dev/null
@@ -1,79 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('contains': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('contains': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('contains': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('contains': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.lazy.log
deleted file mode 100644
index 3a0402183b7..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullable.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Generic': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Generic': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Generic': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
deleted file mode 100644
index ea201760805..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('X': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.T': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Any': FqName@13) = null
-    packageFragments('kotlin.T': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
deleted file mode 100644
index 577c1db1683..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.String': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.String': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@47 }
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
deleted file mode 100644
index 7286c57d9a1..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallWithInvoke.lazy.log
+++ /dev/null
@@ -1,148 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = MutableClassDescriptor$1@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('B': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('B': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('B': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('B': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
deleted file mode 100644
index bc520621bd2..00000000000
--- a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.T': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.T': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
deleted file mode 100644
index 862455ad058..00000000000
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
+++ /dev/null
@@ -1,133 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Number']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Char': FqName@5) = null
-    packageFragments('Number': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Char': FqName@11) = null
-    packageFragments('java.lang.Number': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Char': FqName@14) = null
-    packageFragments('kotlin.Number': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Char': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Number': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
deleted file mode 100644
index b31f9f287be..00000000000
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
+++ /dev/null
@@ -1,123 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Double': FqName@4) = null
-    packageFragments('Float': FqName@5) = null
-    packageFragments('Number': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('a': FqName@8) = null
-    packageFragments('a.Any': FqName@9) = null
-    packageFragments('a.Double': FqName@10) = null
-    packageFragments('a.Float': FqName@11) = null
-    packageFragments('a.Number': FqName@12) = null
-    packageFragments('a.T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Any': FqName@18) = null
-    packageFragments('java.lang.Double': FqName@19) = null
-    packageFragments('java.lang.Float': FqName@20) = null
-    packageFragments('java.lang.Number': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.Double': FqName@25) = null
-    packageFragments('kotlin.Float': FqName@26) = null
-    packageFragments('kotlin.Number': FqName@27) = null
-    packageFragments('kotlin.T': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('either': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('id': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('either': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('id': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
deleted file mode 100644
index f7368e07109..00000000000
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
+++ /dev/null
@@ -1,91 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['Long']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Long': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Array': FqName@11) = null
-    packageFragments('a.Int': FqName@12) = null
-    packageFragments('a.Long': FqName@13) = null
-    packageFragments('a.String': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.Array': FqName@19) = null
-    packageFragments('java.lang.Int': FqName@20) = null
-    packageFragments('java.lang.Long': FqName@21) = null
-    packageFragments('java.lang.String': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Array': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.Long': FqName@26) = null
-    packageFragments('kotlin.String': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('bar': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('bar': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
deleted file mode 100644
index 551d4d693e3..00000000000
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
+++ /dev/null
@@ -1,749 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['Function1<2>']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Any': FqName@53) = null
-    packageFragments('Byte': FqName@54) = null
-    packageFragments('Comparable': FqName@55) = null
-    packageFragments('Contr': FqName@56) = null
-    packageFragments('Cov': FqName@57) = null
-    packageFragments('Int': FqName@58) = null
-    packageFragments('Inv': FqName@59) = null
-    packageFragments('List': FqName@60) = null
-    packageFragments('Long': FqName@61) = null
-    packageFragments('Number': FqName@62) = null
-    packageFragments('String': FqName@63) = null
-    packageFragments('T': FqName@64) = null
-    packageFragments('Unit': FqName@65) = null
-    packageFragments('_': FqName@66) = null
-    packageFragments('a': FqName@67) = null
-    packageFragments('a.Any': FqName@68) = null
-    packageFragments('a.Byte': FqName@69) = null
-    packageFragments('a.Comparable': FqName@70) = null
-    packageFragments('a.Contr': FqName@71) = null
-    packageFragments('a.Cov': FqName@72) = null
-    packageFragments('a.Int': FqName@73) = null
-    packageFragments('a.Inv': FqName@74) = null
-    packageFragments('a.List': FqName@75) = null
-    packageFragments('a.Long': FqName@76) = null
-    packageFragments('a.Number': FqName@77) = null
-    packageFragments('a.String': FqName@78) = null
-    packageFragments('a.T': FqName@79) = null
-    packageFragments('a._': FqName@80) = null
-    packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
-    packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
-    packageFragments('java.lang.Any': FqName@85) = null
-    packageFragments('java.lang.Byte': FqName@86) = null
-    packageFragments('java.lang.Comparable': FqName@87) = null
-    packageFragments('java.lang.Contr': FqName@88) = null
-    packageFragments('java.lang.Cov': FqName@89) = null
-    packageFragments('java.lang.Int': FqName@90) = null
-    packageFragments('java.lang.Inv': FqName@91) = null
-    packageFragments('java.lang.List': FqName@92) = null
-    packageFragments('java.lang.Long': FqName@93) = null
-    packageFragments('java.lang.Number': FqName@94) = null
-    packageFragments('java.lang.String': FqName@95) = null
-    packageFragments('java.lang.T': FqName@96) = null
-    packageFragments('java.lang.Unit': FqName@97) = null
-    packageFragments('java.lang._': FqName@98) = null
-    packageFragments('kotlin': FqName@99) = null
-    packageFragments('kotlin.Any': FqName@100) = null
-    packageFragments('kotlin.Byte': FqName@101) = null
-    packageFragments('kotlin.Comparable': FqName@102) = null
-    packageFragments('kotlin.Contr': FqName@103) = null
-    packageFragments('kotlin.Cov': FqName@104) = null
-    packageFragments('kotlin.Int': FqName@105) = null
-    packageFragments('kotlin.Inv': FqName@106) = null
-    packageFragments('kotlin.List': FqName@107) = null
-    packageFragments('kotlin.Long': FqName@108) = null
-    packageFragments('kotlin.Number': FqName@109) = null
-    packageFragments('kotlin.String': FqName@110) = null
-    packageFragments('kotlin.T': FqName@111) = null
-    packageFragments('kotlin.Unit': FqName@112) = null
-    packageFragments('kotlin._': FqName@113) = null
-    packageFragments('kotlin.io': FqName@114) = null
-    packageFragments('kotlin.jvm': FqName@115) = null
-    packageFragments('tests': FqName@116) = null
-    packageFragments('tests._checkType': FqName@117) = null
-    packageFragments('tests._checkType.Any': FqName@118) = null
-    packageFragments('tests._checkType.Byte': FqName@119) = null
-    packageFragments('tests._checkType.Comparable': FqName@120) = null
-    packageFragments('tests._checkType.Contr': FqName@121) = null
-    packageFragments('tests._checkType.Cov': FqName@122) = null
-    packageFragments('tests._checkType.Int': FqName@123) = null
-    packageFragments('tests._checkType.Inv': FqName@124) = null
-    packageFragments('tests._checkType.List': FqName@125) = null
-    packageFragments('tests._checkType.Long': FqName@126) = null
-    packageFragments('tests._checkType.Number': FqName@127) = null
-    packageFragments('tests._checkType.String': FqName@128) = null
-    packageFragments('tests._checkType.T': FqName@129) = null
-    packageFragments('tests._checkType.Unit': FqName@130) = null
-    packageFragments('tests._checkType._': FqName@131) = null
-    topLevelClasses(JavaClassImpl@132['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@82['java'] {
-    classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('lang': Name@136) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaPackageFragment@84['lang'] {
-    classes('Exception': Name@139) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('checkType': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('either': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('exactBound': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('id': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('lowerBound': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('other': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('otherGeneric': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('upperBound': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('use': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('Exception': Name@139) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('checkType': Name@141) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('either': Name@142) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('exactBound': Name@143) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('id': Name@144) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('lowerBound': Name@145) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('other': Name@146) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('otherGeneric': Name@147) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('upperBound': Name@148) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('use': Name@149) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@140
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@285 }
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@288 }
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@294 }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[4] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[4] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = ArrayList@363[4] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
-
-null {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@291 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@288 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@285 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@294 }
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@419[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@422[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@425[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@192 }
-    <name not found> = ArrayList@428[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@434[5] { ResolutionCandidate@359, ResolutionCandidate@360, ResolutionCandidate@361, ... }
-    <name not found> = ArrayList@435[5] { ResolutionCandidate@354, ResolutionCandidate@355, ResolutionCandidate@356, ... }
-    <name not found> = ArrayList@436[5] { ResolutionCandidate@364, ResolutionCandidate@365, ResolutionCandidate@366, ... }
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-    <name not found> = EmptyList@137[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/Objects.lazy.log b/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
deleted file mode 100644
index f7eee427424..00000000000
--- a/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Foo']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Foo': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.Foo': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Foo': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('toplevelObjectDeclarations': FqName@25) = null
-    packageFragments('toplevelObjectDeclarations.A': FqName@26) = null
-    packageFragments('toplevelObjectDeclarations.B': FqName@27) = null
-    packageFragments('toplevelObjectDeclarations.Foo': FqName@28) = null
-    packageFragments('toplevelObjectDeclarations.Int': FqName@29) = null
-    packageFragments('toplevelObjectDeclarations.T': FqName@30) = null
-    packageFragments('toplevelObjectDeclarations.x': FqName@31) = null
-    packageFragments('toplevelObjectDeclarations.y': FqName@32) = null
-    packageFragments('toplevelObjectDeclarations.z': FqName@33) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('foo': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('x': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('y': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('foo': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-}
-
-null {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@95[8] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsInheritance.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsInheritance.lazy.log
deleted file mode 100644
index 6369618d8da..00000000000
--- a/compiler/testData/diagnostics/tests/objects/ObjectsInheritance.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('CObj': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.CObj': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.CObj': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('toplevelObjectDeclarations': FqName@13) = null
-    packageFragments('toplevelObjectDeclarations.CObj': FqName@14) = null
-    packageFragments('toplevelObjectDeclarations.DOjb': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
deleted file mode 100644
index cd2bf0a4b35..00000000000
--- a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = IntValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('B': FqName@9) = null
-    packageFragments('Foo': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.Foo': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.B': FqName@22) = null
-    packageFragments('kotlin.Foo': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('localObjects': FqName@27) = null
-    packageFragments('localObjects.A': FqName@28) = null
-    packageFragments('localObjects.B': FqName@29) = null
-    packageFragments('localObjects.Foo': FqName@30) = null
-    packageFragments('localObjects.Int': FqName@31) = null
-    packageFragments('localObjects.bb': FqName@32) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('B': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('B': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
deleted file mode 100644
index 8bf8182e477..00000000000
--- a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
+++ /dev/null
@@ -1,941 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@5['B']
-    <name not found> = JetTypeImpl@6['B']
-    <name not found> = JetTypeImpl@6['B']
-    <name not found> = JetTypeImpl@5['B']
-    <name not found> = JetTypeImpl@6['B']
-    <name not found> = JetTypeImpl@6['B']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('A': FqName@10) = null
-    packageFragments('B': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('nestedObejcts': FqName@23) = null
-    packageFragments('nestedObejcts.A': FqName@24) = null
-    packageFragments('nestedObejcts.B': FqName@25) = null
-    packageFragments('nestedObejcts.a': FqName@26) = null
-    packageFragments('nestedObejcts.b': FqName@27) = null
-    packageFragments('nestedObejcts.c': FqName@28) = null
-    packageFragments('nestedObejcts.d': FqName@29) = null
-    packageFragments('nestedObejcts.e': FqName@30) = null
-    packageFragments('nestedObejcts.nestedObejcts': FqName@31) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('A': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('nestedObejcts': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('A': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
deleted file mode 100644
index c755df68c4b..00000000000
--- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
+++ /dev/null
@@ -1,138 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('f': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('f': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('f': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log b/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
deleted file mode 100644
index e02c0ca6324..00000000000
--- a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Any']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.A': FqName@10) = null
-    packageFragments('a.T': FqName@11) = null
-    packageFragments('a.o': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('foo': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log b/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
deleted file mode 100644
index 65fc3ea96c5..00000000000
--- a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
+++ /dev/null
@@ -1,187 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Boo': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('useInt': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('useInt': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('useInt': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('useInt': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
deleted file mode 100644
index 631cc708ed5..00000000000
--- a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = DeferredType@5
-    <name not found> = null
-}
-
-DescriptorResolver@6 {
-    <name not found> = IntValue@7
-    <name not found> = JetTypeImpl@8['Int']
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Int': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
deleted file mode 100644
index b7156b52539..00000000000
--- a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@13
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@22 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.lazy.log
deleted file mode 100644
index 39d3481b7d6..00000000000
--- a/compiler/testData/diagnostics/tests/objects/objectLiteralExpressionTypeMismatch.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.lazy.log b/compiler/testData/diagnostics/tests/objects/upperBoundViolated.lazy.log
deleted file mode 100644
index a1db9e31817..00000000000
--- a/compiler/testData/diagnostics/tests/objects/upperBoundViolated.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('IntRange': FqName@5) = null
-    packageFragments('Number': FqName@6) = null
-    packageFragments('O1': FqName@7) = null
-    packageFragments('O2': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('Trait': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.IntRange': FqName@16) = null
-    packageFragments('java.lang.Number': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.Trait': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.IntRange': FqName@22) = null
-    packageFragments('kotlin.Number': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.Trait': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('IntRange': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Number': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
deleted file mode 100644
index 97cb7385fb0..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
+++ /dev/null
@@ -1,137 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('MyInt': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.MyInt': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.MyInt': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt1820': FqName@19) = null
-    packageFragments('kt1820.Any': FqName@20) = null
-    packageFragments('kt1820.Int': FqName@21) = null
-    packageFragments('kt1820.MyInt': FqName@22) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('MyInt': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('i': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plusAssign': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('MyInt': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plusAssign': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@93[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
deleted file mode 100644
index da053422337..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
+++ /dev/null
@@ -1,883 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('B': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('div': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('divAssign': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('minus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('minusAssign': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('mod': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('modAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plusAssign': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('timesAssign': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('B': Name@19) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('div': Name@21) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('divAssign': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('minus': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('minusAssign': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('mod': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('modAssign': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plusAssign': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('times': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('timesAssign': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('div': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('divAssign': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minusAssign': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('mod': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('modAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plusAssign': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('timesAssign': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@17) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@19) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('div': Name@21) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('divAssign': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minusAssign': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('mod': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('modAssign': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plusAssign': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('times': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('timesAssign': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
deleted file mode 100644
index fc9255b4540..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
+++ /dev/null
@@ -1,150 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = MutableClassDescriptor$1@2
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('MyAnotherCollectionInterface': FqName@6) = null
-    packageFragments('MyCollection': FqName@7) = null
-    packageFragments('MyCollectionInterface': FqName@8) = null
-    packageFragments('MyElement': FqName@9) = null
-    packageFragments('MyIterator': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.MyAnotherCollectionInterface': FqName@15) = null
-    packageFragments('java.lang.MyCollection': FqName@16) = null
-    packageFragments('java.lang.MyCollectionInterface': FqName@17) = null
-    packageFragments('java.lang.MyElement': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.MyAnotherCollectionInterface': FqName@20) = null
-    packageFragments('kotlin.MyCollection': FqName@21) = null
-    packageFragments('kotlin.MyCollectionInterface': FqName@22) = null
-    packageFragments('kotlin.MyElement': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('MyElement': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('MyIterator': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('iterator': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('MyElement': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('MyIterator': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('iterator': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('MyElement': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('MyIterator': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('iterator': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('MyElement': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('MyIterator': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('iterator': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@67[2] { ResolutionCandidate@60, ResolutionCandidate@61 }
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
deleted file mode 100644
index 5e6d58d8ad8..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
+++ /dev/null
@@ -1,1308 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.A': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('B': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('plusAssign': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('timesAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('A': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('B': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('plusAssign': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('timesAssign': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('B': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plusAssign': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('timesAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('A': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('B': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plusAssign': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('timesAssign': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@189 }
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = ArrayList@191[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[7] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[7] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[7] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[7] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[7] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[7] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[8] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[8] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[8] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[8] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@189 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@390[7] { ResolutionCandidate@192, ResolutionCandidate@193, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@391[7] { ResolutionCandidate@202, ResolutionCandidate@203, ResolutionCandidate@204, ... }
-    <name not found> = ArrayList@392[7] { ResolutionCandidate@222, ResolutionCandidate@223, ResolutionCandidate@224, ... }
-    <name not found> = ArrayList@393[7] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244, ... }
-    <name not found> = ArrayList@394[7] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249, ... }
-    <name not found> = ArrayList@395[7] { ResolutionCandidate@237, ResolutionCandidate@238, ResolutionCandidate@239, ... }
-    <name not found> = ArrayList@396[7] { ResolutionCandidate@212, ResolutionCandidate@213, ResolutionCandidate@214, ... }
-    <name not found> = ArrayList@397[7] { ResolutionCandidate@207, ResolutionCandidate@208, ResolutionCandidate@209, ... }
-    <name not found> = ArrayList@398[7] { ResolutionCandidate@217, ResolutionCandidate@218, ResolutionCandidate@219, ... }
-    <name not found> = ArrayList@399[7] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = ArrayList@400[7] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@401[7] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = ArrayList@402[8] { ResolutionCandidate@272, ResolutionCandidate@273, ResolutionCandidate@274, ... }
-    <name not found> = ArrayList@403[8] { ResolutionCandidate@277, ResolutionCandidate@278, ResolutionCandidate@279, ... }
-    <name not found> = ArrayList@404[8] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-    <name not found> = ArrayList@405[8] { ResolutionCandidate@307, ResolutionCandidate@308, ResolutionCandidate@309, ... }
-    <name not found> = ArrayList@406[8] { ResolutionCandidate@262, ResolutionCandidate@263, ResolutionCandidate@264, ... }
-    <name not found> = ArrayList@407[8] { ResolutionCandidate@282, ResolutionCandidate@283, ResolutionCandidate@284, ... }
-    <name not found> = ArrayList@408[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = ArrayList@409[8] { ResolutionCandidate@302, ResolutionCandidate@303, ResolutionCandidate@304, ... }
-    <name not found> = ArrayList@410[8] { ResolutionCandidate@267, ResolutionCandidate@268, ResolutionCandidate@269, ... }
-    <name not found> = ArrayList@411[8] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = ArrayList@412[8] { ResolutionCandidate@297, ResolutionCandidate@298, ResolutionCandidate@299, ... }
-    <name not found> = ArrayList@413[8] { ResolutionCandidate@257, ResolutionCandidate@258, ResolutionCandidate@259, ... }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
deleted file mode 100644
index 8177a8e0669..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
+++ /dev/null
@@ -1,1182 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['ArrayList<1>']
-    <name not found> = JetTypeImpl@3['Boolean']
-    <name not found> = JetTypeImpl@4['Boolean']
-    <name not found> = JetTypeImpl@5['Unit']
-}
-
-LazyJavaClassDescriptor@6['AbstractCollection'] {
-    defaultType = JetTypeImpl@7['AbstractCollection<1>']
-    functions('add': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['add'] } // through LazyJavaClassMemberScope@11
-    functions('iterator': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['iterator'] } // through LazyJavaClassMemberScope@11
-    functions('remove': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['remove'] } // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@11
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@21['AbstractList'] {
-    defaultType = JetTypeImpl@22['AbstractList<1>']
-    functions('add': Name@23) = ArrayList@24[2] { JavaMethodDescriptor@25['add'], JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@27
-    functions('iterator': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['iterator'] } // through LazyJavaClassMemberScope@27
-    functions('remove': Name@31) = ArrayList@32[2] { JavaMethodDescriptor@33['remove'], DeserializedSimpleFunctionDescriptor@34['remove'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['AbstractList']
-}
-
-LazyJavaClassDescriptor@38['ArrayList'] {
-    constructors = ArrayList@39[3] { JavaConstructorDescriptor@40['<init>'], JavaConstructorDescriptor@41['<init>'], JavaConstructorDescriptor@42['<init>'] } // through LazyJavaClassMemberScope@43
-    defaultType = JetTypeImpl@44['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@43
-    functionTypeForSamInterface = null
-    functions('add': Name@46) = ArrayList@47[2] { JavaMethodDescriptor@48['add'], JavaMethodDescriptor@49['add'] } // through LazyJavaClassMemberScope@43
-    functions('iterator': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['iterator'] } // through LazyJavaClassMemberScope@43
-    functions('remove': Name@53) = ArrayList@54[2] { JavaMethodDescriptor@55['remove'], JavaMethodDescriptor@56['remove'] } // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@43
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@43
-    nestedClasses('add': Name@46) = null // through LazyJavaClassMemberScope@43
-    nestedClasses('iterator': Name@50) = null // through LazyJavaClassMemberScope@43
-    nestedClasses('remove': Name@53) = null // through LazyJavaClassMemberScope@43
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@60['ArrayList']
-}
-
-LazyJavaClassDescriptor@61['RandomAccess'] {
-    functions('add': Name@23) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
-    functions('iterator': Name@28) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
-    functions('remove': Name@31) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
-    memberIndex = computeMemberIndex$1@64 // through LazyJavaClassMemberScope@63
-    typeConstructor = LazyJavaClassTypeConstructor@65['RandomAccess']
-}
-
-LazyJavaClassDescriptor@66['Serializable'] {
-    functions('add': Name@23) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
-    functions('iterator': Name@28) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
-    functions('remove': Name@31) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
-    memberIndex = computeMemberIndex$1@68 // through LazyJavaClassMemberScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@69['Serializable']
-}
-
-LazyJavaClassTypeConstructor@20['AbstractCollection'] {
-    parameters = ArrayList@70[1] { LazyJavaTypeParameterDescriptor@71['E'] }
-    supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@37['AbstractList'] {
-    parameters = ArrayList@74[1] { LazyJavaTypeParameterDescriptor@75['E'] }
-    supertypes = ArrayList@76[2] { LazyJavaClassifierType@77['AbstractCollection<E>'], LazyJavaClassifierType@78['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@60['ArrayList'] {
-    parameters = ArrayList@79[1] { LazyJavaTypeParameterDescriptor@80['E'] }
-    supertypes = ArrayList@81[5] { LazyJavaClassifierType@82['AbstractList<E>'], LazyJavaClassifierType@83['List<E>'], LazyJavaClassifierType@84['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@65['RandomAccess'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { JetTypeImpl@87['Any'] }
-}
-
-LazyJavaClassTypeConstructor@69['Serializable'] {
-    parameters = ArrayList@88[empty]
-    supertypes = ArrayList@89[1] { JetTypeImpl@87['Any'] }
-}
-
-LazyJavaClassifierType@77['AbstractCollection<E>'] {
-    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    classifier = JavaClassImpl@92['AbstractCollection']
-    memberScope = SubstitutingScope@93
-    nullable = 'false': Boolean@94
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
-}
-
-LazyJavaClassifierType@82['AbstractList<E>'] {
-    arguments = ArrayList@95[1] { TypeProjectionImpl@96 }
-    classifier = JavaClassImpl@97['AbstractList']
-    memberScope = SubstitutingScope@98
-    typeConstructor = LazyJavaClassTypeConstructor@37['AbstractList']
-}
-
-LazyJavaClassifierType@99['Cloneable'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['Cloneable']
-    memberScope = DeserializedClassMemberScope@102
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@104['Collection<? extends E>'] {
-    arguments = ArrayList@105[1] { TypeProjectionImpl@106 }
-    classifier = JavaClassImpl@107['Collection']
-    memberScope = SubstitutingScope@108
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@110['Collection<? extends E>'] {
-    arguments = ArrayList@111[1] { TypeProjectionImpl@112 }
-    classifier = JavaClassImpl@107['Collection']
-    memberScope = SubstitutingScope@113
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@115
-}
-
-LazyJavaClassifierType@73['Collection<E>'] {
-    arguments = ArrayList@116[1] { TypeProjectionImpl@117 }
-    classifier = JavaClassImpl@118['Collection']
-    memberScope = SubstitutingScope@119
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@120['E'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@131['E'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@138['E'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@149['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@152['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@153['E'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@155['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@158['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@159['E'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@161['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@162['E'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@164['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@165['E'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaTypeParameterImpl@167['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@168['E'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@170['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@171['E'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaTypeParameterImpl@173['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@176['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@177['E'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@179['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@180['E'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@182['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@183['E'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@167['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@185['E'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@187['E'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@182['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@189['E'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@191['E'] {
-    arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@164['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@193['E'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@149['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@195['E'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@152['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@197['E'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@199['E'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@158['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@201['E'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaTypeParameterImpl@170['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@203['E'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaTypeParameterImpl@179['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@205['E'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@155['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@207['E'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@176['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@209['E'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@211['E'] {
-    arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@173['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@213['E'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@215['E'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@217['E'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@219['E'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@221['E'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@161['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@223['Iterator<E>'] {
-    arguments = ArrayList@224[1] { TypeProjectionImpl@225 }
-    classifier = JavaClassImpl@226['Iterator']
-    memberScope = SubstitutingScope@227
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@228
-}
-
-LazyJavaClassifierType@229['Iterator<E>'] {
-    arguments = ArrayList@230[1] { TypeProjectionImpl@231 }
-    classifier = JavaClassImpl@232['Iterator']
-    memberScope = SubstitutingScope@233
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@228
-}
-
-LazyJavaClassifierType@234['Iterator<E>'] {
-    arguments = ArrayList@235[1] { TypeProjectionImpl@236 }
-    classifier = JavaClassImpl@237['Iterator']
-    memberScope = SubstitutingScope@238
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@228
-}
-
-LazyJavaClassifierType@239['Iterator<E>'] {
-    arguments = ArrayList@240[1] { TypeProjectionImpl@241 }
-    classifier = JavaClassImpl@232['Iterator']
-    memberScope = SubstitutingScope@242
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@244['Iterator<E>'] {
-    arguments = ArrayList@245[1] { TypeProjectionImpl@246 }
-    classifier = JavaClassImpl@237['Iterator']
-    memberScope = SubstitutingScope@247
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@248['Iterator<E>'] {
-    arguments = ArrayList@249[1] { TypeProjectionImpl@250 }
-    classifier = JavaClassImpl@226['Iterator']
-    memberScope = SubstitutingScope@251
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@78['List<E>'] {
-    arguments = ArrayList@252[1] { TypeProjectionImpl@253 }
-    classifier = JavaClassImpl@254['List']
-    memberScope = SubstitutingScope@255
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@256
-}
-
-LazyJavaClassifierType@83['List<E>'] {
-    arguments = ArrayList@257[1] { TypeProjectionImpl@258 }
-    classifier = JavaClassImpl@259['List']
-    memberScope = SubstitutingScope@260
-    typeConstructor = DeserializedClassTypeConstructor@256
-}
-
-LazyJavaClassifierType@261['Object'] {
-    arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@263['Object']
-    memberScope = DeserializedClassMemberScope@264
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@266['Object'] {
-    arguments = ArrayList@267[empty]
-    classifier = JavaClassImpl@268['Object']
-    memberScope = DeserializedClassMemberScope@264
-    nullable = 'false': Boolean@94
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@269['Object'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@263['Object']
-    memberScope = DeserializedClassMemberScope@264
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@271['Object'] {
-    arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@268['Object']
-    memberScope = DeserializedClassMemberScope@264
-    nullable = 'true': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@273['Object'] {
-    classifier = JavaClassImpl@274['Object']
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@275['Object'] {
-    classifier = JavaClassImpl@276['Object']
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@277['Object'] {
-    classifier = JavaClassImpl@278['Object']
-    typeConstructor = DeserializedClassTypeConstructor@265
-}
-
-LazyJavaClassifierType@84['RandomAccess'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@63
-    typeConstructor = LazyJavaClassTypeConstructor@65['RandomAccess']
-}
-
-LazyJavaClassifierType@281['Serializable'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['Serializable']
-    memberScope = LazyJavaClassMemberScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@69['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@284 {
-    packageFragments('<root>': FqName@285) = LazyJavaPackageFragment@286['<root>']
-    packageFragments('Function1': FqName@287) = null
-    packageFragments('Int': FqName@288) = null
-    packageFragments('MouseMovedEventArgs': FqName@289) = null
-    packageFragments('T': FqName@290) = null
-    packageFragments('Unit': FqName@291) = null
-    packageFragments('event': FqName@292) = null
-    packageFragments('it': FqName@293) = null
-    packageFragments('java': FqName@294) = LazyJavaPackageFragment@295['java']
-    packageFragments('java.io': FqName@296) = LazyJavaPackageFragment@297['io']
-    packageFragments('java.lang': FqName@298) = LazyJavaPackageFragment@299['lang']
-    packageFragments('java.lang.Function1': FqName@300) = null
-    packageFragments('java.lang.Int': FqName@301) = null
-    packageFragments('java.lang.MouseMovedEventArgs': FqName@302) = null
-    packageFragments('java.lang.T': FqName@303) = null
-    packageFragments('java.lang.Unit': FqName@304) = null
-    packageFragments('java.lang.event': FqName@305) = null
-    packageFragments('java.lang.it': FqName@306) = null
-    packageFragments('java.util': FqName@307) = LazyJavaPackageFragment@308['util']
-    packageFragments('java.util.Function1': FqName@309) = null
-    packageFragments('java.util.Int': FqName@310) = null
-    packageFragments('java.util.MouseMovedEventArgs': FqName@311) = null
-    packageFragments('java.util.T': FqName@312) = null
-    packageFragments('java.util.Unit': FqName@313) = null
-    packageFragments('java.util.event': FqName@314) = null
-    packageFragments('java.util.it': FqName@315) = null
-    packageFragments('kotlin': FqName@316) = null
-    packageFragments('kotlin.Function1': FqName@317) = null
-    packageFragments('kotlin.Int': FqName@318) = null
-    packageFragments('kotlin.MouseMovedEventArgs': FqName@319) = null
-    packageFragments('kotlin.T': FqName@320) = null
-    packageFragments('kotlin.Unit': FqName@321) = null
-    packageFragments('kotlin.event': FqName@322) = null
-    packageFragments('kotlin.io': FqName@323) = null
-    packageFragments('kotlin.it': FqName@324) = null
-    packageFragments('kotlin.jvm': FqName@325) = null
-    packageFragments('kt1028': FqName@326) = null
-    packageFragments('kt1028.Control': FqName@327) = null
-    packageFragments('kt1028.Function1': FqName@328) = null
-    packageFragments('kt1028.Int': FqName@329) = null
-    packageFragments('kt1028.MouseMovedEventArgs': FqName@330) = null
-    packageFragments('kt1028.T': FqName@331) = null
-    packageFragments('kt1028.Test': FqName@332) = null
-    packageFragments('kt1028.Unit': FqName@333) = null
-    packageFragments('kt1028.event': FqName@334) = null
-    packageFragments('kt1028.it': FqName@335) = null
-    topLevelClasses(JavaClassImpl@92['AbstractCollection']) = LazyJavaClassDescriptor@6['AbstractCollection']
-    topLevelClasses(JavaClassImpl@97['AbstractList']) = LazyJavaClassDescriptor@21['AbstractList']
-    topLevelClasses(JavaClassImpl@336['ArrayList']) = LazyJavaClassDescriptor@38['ArrayList']
-    topLevelClasses(JavaClassImpl@280['RandomAccess']) = LazyJavaClassDescriptor@61['RandomAccess']
-    topLevelClasses(JavaClassImpl@283['Serializable']) = LazyJavaClassDescriptor@66['Serializable']
-}
-
-LazyJavaPackageFragment@295['java'] {
-    classes('lang': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@338
-    classes('util': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@338
-    deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@338
-    functions('lang': Name@341) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@338
-    functions('util': Name@342) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@338
-    memberIndex = computeMemberIndex$1@343 // through LazyPackageFragmentScopeForJavaPackage@338
-}
-
-LazyJavaPackageFragment@299['lang'] {
-    classes('ArrayList': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('Control': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('MouseMoved': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('MouseMovedEventArgs': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('c': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('callbacks': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('event': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('it': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('plus': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('ArrayList': Name@344) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('Control': Name@346) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('MouseMovedEventArgs': Name@348) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('c': Name@349) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('event': Name@351) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('it': Name@354) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('plus': Name@353) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    memberIndex = computeMemberIndex$1@355 // through LazyPackageFragmentScopeForJavaPackage@345
-}
-
-LazyJavaPackageFragment@308['util'] {
-    classes('ArrayList': Name@344) = LazyJavaClassDescriptor@38['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('Control': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('Function1': Name@357) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('Int': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('MouseMoved': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('MouseMovedEventArgs': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('Unit': Name@359) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('c': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('callbacks': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('event': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('it': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    classes('plus': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@356
-    deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('ArrayList': Name@344) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('Control': Name@346) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('MouseMovedEventArgs': Name@348) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('c': Name@349) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('event': Name@351) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('it': Name@354) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    functions('plus': Name@353) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
-    memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@356
-}
-
-LazyJavaTypeParameterDescriptor@75['E'] {
-    defaultType = JetTypeImpl@361['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@362[1] { NullableType@363 }
-    upperBoundsAsType = NullableType@363
-}
-
-LazyJavaTypeParameterDescriptor@71['E'] {
-    defaultType = JetTypeImpl@364['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-    upperBounds = LinkedHashSet@365[1] { NullableType@366 }
-    upperBoundsAsType = NullableType@366
-}
-
-LazyJavaTypeParameterDescriptor@80['E'] {
-    defaultType = JetTypeImpl@367['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-    upperBounds = LinkedHashSet@368[1] { NullableType@369 }
-    upperBoundsAsType = NullableType@369
-}
-
-LazyJavaTypeParameterResolver@370 {
-    resolve(JavaTypeParameterImpl@371['E']) = LazyJavaTypeParameterDescriptor@80['E']
-}
-
-LazyJavaTypeParameterResolver@372 {
-    resolve(JavaTypeParameterImpl@373['E']) = LazyJavaTypeParameterDescriptor@75['E']
-}
-
-LazyJavaTypeParameterResolver@374 {
-    resolve(JavaTypeParameterImpl@375['E']) = LazyJavaTypeParameterDescriptor@71['E']
-}
-
-LazyJavaTypeParameterResolver@376 {
-    resolve(JavaTypeParameterImpl@164['E']) = null
-}
-
-LazyJavaTypeParameterResolver@377 {
-    resolve(JavaTypeParameterImpl@182['E']) = null
-}
-
-LazyJavaTypeParameterResolver@378 {
-    resolve(JavaTypeParameterImpl@161['E']) = null
-}
-
-LazyJavaTypeParameterResolver@379 {
-    resolve(JavaTypeParameterImpl@155['E']) = null
-}
-
-LazyJavaTypeParameterResolver@380 {
-    resolve(JavaTypeParameterImpl@122['E']) = null
-}
-
-LazyJavaTypeParameterResolver@381 {
-    resolve(JavaTypeParameterImpl@170['E']) = null
-}
-
-LazyJavaTypeParameterResolver@382 {
-    resolve(JavaTypeParameterImpl@130['E']) = null
-}
-
-LazyJavaTypeParameterResolver@383 {
-    resolve(JavaTypeParameterImpl@152['E']) = null
-}
-
-LazyJavaTypeParameterResolver@384 {
-    resolve(JavaTypeParameterImpl@173['E']) = null
-}
-
-LazyJavaTypeParameterResolver@385 {
-    resolve(JavaTypeParameterImpl@143['E']) = null
-}
-
-ResolutionTaskHolder@386 {
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@388 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@389 {
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@391 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@392 {
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@394 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@397 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@400 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@401 {
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@403 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@404 {
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[1] { ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[1] { ResolutionCandidate@424 }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[1] { ResolutionCandidate@427 }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
-}
-
-ResolutionTaskHolder@431 {
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@433 }
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@436 }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@439 }
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@448 }
-}
-
-ResolutionTaskHolder@449 {
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@451 }
-}
-
-ResolutionTaskHolder@452 {
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@454 }
-}
-
-ResolutionTaskHolder@455 {
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@457 }
-}
-
-ResolutionTaskHolder@458 {
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@460 }
-}
-
-ResolutionTaskHolder@461 {
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@463 }
-}
-
-ResolutionTaskHolder@464 {
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@466 }
-}
-
-ResolutionTaskHolder@467 {
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@469 }
-}
-
-ResolutionTaskHolder@470 {
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@472 }
-}
-
-ResolutionTaskHolder@473 {
-    <name not found> = ArrayList@474[2] { ResolutionCandidate@475, ResolutionCandidate@476 }
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[2] { ResolutionCandidate@479, ResolutionCandidate@480 }
-}
-
-ResolutionTaskHolder@481 {
-    <name not found> = ArrayList@482[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@487 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@488 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-null {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@391 }
-    <name not found> = ArrayList@491[1] { ResolutionCandidate@403 }
-    <name not found> = ArrayList@492[1] { ResolutionCandidate@445 }
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@400 }
-    <name not found> = ArrayList@494[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@495[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@430 }
-    <name not found> = ArrayList@497[1] { ResolutionCandidate@454 }
-    <name not found> = ArrayList@498[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@439 }
-    <name not found> = ArrayList@500[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@501[1] { ResolutionCandidate@433 }
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@503[1] { ResolutionCandidate@397 }
-    <name not found> = ArrayList@504[1] { ResolutionCandidate@451 }
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@394 }
-    <name not found> = ArrayList@506[1] { ResolutionCandidate@469 }
-    <name not found> = ArrayList@507[1] { ResolutionCandidate@436 }
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@472 }
-    <name not found> = ArrayList@509[1] { ResolutionCandidate@442 }
-    <name not found> = ArrayList@510[1] { ResolutionCandidate@448 }
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@388 }
-    <name not found> = ArrayList@512[1] { ResolutionCandidate@460 }
-    <name not found> = ArrayList@513[1] { ResolutionCandidate@463 }
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@466 }
-    <name not found> = ArrayList@515[1] { ResolutionCandidate@424 }
-    <name not found> = ArrayList@516[1] { ResolutionCandidate@457 }
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@421 }
-    <name not found> = ArrayList@518[1] { ResolutionCandidate@427 }
-    <name not found> = ArrayList@519[2] { ResolutionCandidate@475, ResolutionCandidate@476 }
-    <name not found> = ArrayList@520[2] { ResolutionCandidate@479, ResolutionCandidate@480 }
-    <name not found> = ArrayList@521[3] { ResolutionCandidate@483, ResolutionCandidate@484, ResolutionCandidate@485 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
deleted file mode 100644
index 550a45dd635..00000000000
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
+++ /dev/null
@@ -1,254 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-    <name not found> = JetTypeImpl@2['Pair<2>']
-}
-
-LazyAnnotationDescriptor@3 {
-    resolutionResults = OverloadResolutionResultsImpl@4
-    type = JetTypeImpl@5['data']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('B': FqName@10) = null
-    packageFragments('Pair': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('Unit': FqName@13) = null
-    packageFragments('data': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.A': FqName@19) = null
-    packageFragments('java.lang.B': FqName@20) = null
-    packageFragments('java.lang.Pair': FqName@21) = null
-    packageFragments('java.lang.String': FqName@22) = null
-    packageFragments('java.lang.Unit': FqName@23) = null
-    packageFragments('java.lang.data': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.B': FqName@27) = null
-    packageFragments('kotlin.Pair': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.Unit': FqName@30) = null
-    packageFragments('kotlin.data': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-    packageFragments('x': FqName@34) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Pair': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Unit': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('data': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('div': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('to': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@35) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('B': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Pair': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('div': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('to': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Pair': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('div': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('plus': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('to': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('A': Name@35) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('B': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('Pair': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('div': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('plus': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('to': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[2] { ResolutionCandidate@104, ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[2] { ResolutionCandidate@108, ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@129[2] { ResolutionCandidate@112, ResolutionCandidate@113 }
-    <name not found> = ArrayList@130[2] { ResolutionCandidate@108, ResolutionCandidate@109 }
-    <name not found> = ArrayList@131[2] { ResolutionCandidate@104, ResolutionCandidate@105 }
-    <name not found> = ArrayList@132[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.lazy.log
deleted file mode 100644
index 59f07d450bb..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInClass.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.lazy.log
deleted file mode 100644
index 33cc2a565e2..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsFunsDifferentReturnInPackage.lazy.log
+++ /dev/null
@@ -1,20 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('qwertyuiop': FqName@13) = null
-    packageFragments('qwertyuiop.String': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.lazy.log
deleted file mode 100644
index 018622adceb..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalExtFunsInPackage.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Float': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('extensionFunctions': FqName@7) = null
-    packageFragments('extensionFunctions.Float': FqName@8) = null
-    packageFragments('extensionFunctions.Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Float': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Float': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.lazy.log
deleted file mode 100644
index b15726043f5..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsInClass.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.lazy.log
deleted file mode 100644
index ec4ee5dfb6e..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalFunsTPInClass.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Aaa': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.lazy.log
deleted file mode 100644
index cba0d8b0994..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsIdenticalValsInClass.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Aaa': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.lazy.log
deleted file mode 100644
index 49bd710028d..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConflictingOverloadsValsDifferentTypeInClass.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['String']
-    <name not found> = StringValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Aaa': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.lazy.log b/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.lazy.log
deleted file mode 100644
index 390d386517d..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ConstructorVsFunOverload.lazy.log
+++ /dev/null
@@ -1,24 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('constructorVsFun': FqName@5) = null
-    packageFragments('constructorVsFun.Rtyu': FqName@6) = null
-    packageFragments('constructorVsFun.Tram': FqName@7) = null
-    packageFragments('constructorVsFun.Yvayva': FqName@8) = null
-    packageFragments('constructorVsFun.a': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.lazy.log b/compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.lazy.log
deleted file mode 100644
index 785191b4125..00000000000
--- a/compiler/testData/diagnostics/tests/overload/ExtFunDifferentReceiver.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.lazy.log b/compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.lazy.log
deleted file mode 100644
index bfaf6475701..00000000000
--- a/compiler/testData/diagnostics/tests/overload/FunNoConflictInDifferentPackages.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('pkg1': FqName@12) = null
-    packageFragments('pkg2': FqName@13) = null
-    packageFragments('pkg3': FqName@14) = null
-    packageFragments('pkg3.pkg1': FqName@15) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.lazy.log b/compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.lazy.log
deleted file mode 100644
index ac36cc65b26..00000000000
--- a/compiler/testData/diagnostics/tests/overload/OverloadFunRegularAndExt.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('extensionAndRegular': FqName@6) = null
-    packageFragments('extensionAndRegular.Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.lazy.log b/compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.lazy.log
deleted file mode 100644
index f616a9daf23..00000000000
--- a/compiler/testData/diagnostics/tests/overload/OverloadVarAndFunInClass.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Aaaa': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log b/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
deleted file mode 100644
index c384230ab03..00000000000
--- a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = JetTypeImpl@3['Runnable']
-}
-
-LazyJavaClassDescriptor@4['Runnable'] {
-    allDescriptors = ArrayList@5[4] { DeserializedSimpleFunctionDescriptor@6['hashCode'], DeserializedSimpleFunctionDescriptor@7['toString'], JavaMethodDescriptor@8['run'], ... } // through LazyJavaClassMemberScope@9
-    annotations = LazyJavaAnnotations@10
-    constructors = stdlib_emptyListClass@11[empty] // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@12['Runnable']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@9
-    functionTypeForSamInterface = JetTypeImpl@14['Function0<1>']
-    functions('clone': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    functions('equals': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['equals'] } // through LazyJavaClassMemberScope@9
-    functions('finalize': Name@20) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    functions('getClass': Name@21) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    functions('hashCode': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@9
-    functions('notify': Name@24) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    functions('notifyAll': Name@25) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    functions('run': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@8['run'] } // through LazyJavaClassMemberScope@9
-    functions('toString': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@7['toString'] } // through LazyJavaClassMemberScope@9
-    functions('wait': Name@30) = EmptyList@16[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['Runnable']
-}
-
-LazyJavaClassTypeConstructor@34['Runnable'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@37['Any'] }
-}
-
-LazyJavaClassifierType@38['Object'] {
-    classifier = JavaClassImpl@39['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('Runnable': FqName@44) = null
-    packageFragments('Unit': FqName@45) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.Runnable': FqName@50) = null
-    packageFragments('java.lang.Unit': FqName@51) = null
-    packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.Runnable': FqName@53) = null
-    packageFragments('kotlin.Unit': FqName@54) = null
-    packageFragments('kotlin.io': FqName@55) = null
-    packageFragments('kotlin.jvm': FqName@56) = null
-    packageFragments('x': FqName@57) = null
-    topLevelClasses(JavaClassImpl@58['Runnable']) = LazyJavaClassDescriptor@4['Runnable']
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('Runnable': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Unit': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('f': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('Runnable': Name@64) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('f': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@49['lang'] {
-    classes('Runnable': Name@59) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('f': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Runnable': Name@64) = ArrayList@71[1] { SamConstructorDescriptor@72['Runnable'] } // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('f': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@16[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-null {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@85[2] { ResolutionCandidate@76, ResolutionCandidate@86 }
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log b/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
deleted file mode 100644
index d72f8728ff8..00000000000
--- a/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('c': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@44[3] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
deleted file mode 100644
index 4b859b9725e..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
deleted file mode 100644
index a4fac0eac67..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
deleted file mode 100644
index 36b2b48a9c1..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
deleted file mode 100644
index a4fac0eac67..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
deleted file mode 100644
index 4b859b9725e..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
deleted file mode 100644
index a4fac0eac67..00000000000
--- a/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
deleted file mode 100644
index 825008b4259..00000000000
--- a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
+++ /dev/null
@@ -1,81 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = StringValue@2
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('test': FqName@22) = null
-    packageFragments('test.A': FqName@23) = null
-    packageFragments('test.C': FqName@24) = null
-    packageFragments('test.String': FqName@25) = null
-    packageFragments('test.Subject': FqName@26) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('a': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
deleted file mode 100644
index aa4be6c039c..00000000000
--- a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = StringValue@2
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('test': FqName@22) = null
-    packageFragments('test.A': FqName@23) = null
-    packageFragments('test.C': FqName@24) = null
-    packageFragments('test.String': FqName@25) = null
-    packageFragments('test.Subject': FqName@26) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('a': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.lazy.log b/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.lazy.log
deleted file mode 100644
index b27bfd33cb6..00000000000
--- a/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Long': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('U': FqName@5) = null
-    packageFragments('V': FqName@6) = null
-    packageFragments('W': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Long': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.U': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Long': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.U': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Long': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.lazy.log b/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.lazy.log
deleted file mode 100644
index 796cc165e3c..00000000000
--- a/compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Short': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('U': FqName@5) = null
-    packageFragments('V': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Short': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('java.lang.U': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Short': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.U': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Short': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
deleted file mode 100644
index 80bc37b7972..00000000000
--- a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('MyAbstractClass': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.MyAbstractClass': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.MyAbstractClass': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('override': FqName@19) = null
-    packageFragments('override.generics': FqName@20) = null
-    packageFragments('override.generics.Int': FqName@21) = null
-    packageFragments('override.generics.MyAbstractClass': FqName@22) = null
-    packageFragments('override.generics.MyLegalAbstractClass2': FqName@23) = null
-    packageFragments('override.generics.T': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log b/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
deleted file mode 100644
index 340b674c6e9..00000000000
--- a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Aaa': FqName@5) = null
-    packageFragments('Bbb': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Aaa': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Aaa': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
deleted file mode 100644
index 88bdff3191d..00000000000
--- a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['String']
-    <name not found> = StringValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Aaa': FqName@8) = null
-    packageFragments('Bbb': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Aaa': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Aaa': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log b/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
deleted file mode 100644
index deb9144c62f..00000000000
--- a/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('D': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.lazy.log b/compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.lazy.log
deleted file mode 100644
index 7dd99072ec1..00000000000
--- a/compiler/testData/diagnostics/tests/override/DefaultParameterValues-NoErrorsWhenInheritingFromOneTypeTwice.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Y': FqName@4) = null
-    packageFragments('YSub': FqName@5) = null
-    packageFragments('Z2': FqName@6) = null
-    packageFragments('Z2O': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.Y': FqName@13) = null
-    packageFragments('java.lang.YSub': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.Y': FqName@17) = null
-    packageFragments('kotlin.YSub': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log b/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
deleted file mode 100644
index be14958dc06..00000000000
--- a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Incompatible': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('X': FqName@6) = null
-    packageFragments('Y': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Incompatible': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.X': FqName@15) = null
-    packageFragments('java.lang.Y': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Incompatible': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.X': FqName@21) = null
-    packageFragments('kotlin.Y': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('test': FqName@25) = null
-    packageFragments('test.Incompatible': FqName@26) = null
-    packageFragments('test.Int': FqName@27) = null
-    packageFragments('test.String': FqName@28) = null
-    packageFragments('test.Test1': FqName@29) = null
-    packageFragments('test.Test2': FqName@30) = null
-    packageFragments('test.Test3': FqName@31) = null
-    packageFragments('test.Test4': FqName@32) = null
-    packageFragments('test.Test5': FqName@33) = null
-    packageFragments('test.X': FqName@34) = null
-    packageFragments('test.Y': FqName@35) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@50 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
deleted file mode 100644
index 82610b8238e..00000000000
--- a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Aaa': FqName@3) = null
-    packageFragments('delegation': FqName@4) = null
-    packageFragments('delegation.Aaa': FqName@5) = null
-    packageFragments('delegation.Bbb': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Aaa': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Aaa': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
deleted file mode 100644
index 25800f96074..00000000000
--- a/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Aaa': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('delegation': FqName@5) = null
-    packageFragments('delegation.Aaa': FqName@6) = null
-    packageFragments('delegation.Bbb': FqName@7) = null
-    packageFragments('delegation.Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Aaa': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Aaa': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
deleted file mode 100644
index 25800f96074..00000000000
--- a/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Aaa': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('delegation': FqName@5) = null
-    packageFragments('delegation.Aaa': FqName@6) = null
-    packageFragments('delegation.Bbb': FqName@7) = null
-    packageFragments('delegation.Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Aaa': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Aaa': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/DuplicateMethod.lazy.log b/compiler/testData/diagnostics/tests/override/DuplicateMethod.lazy.log
deleted file mode 100644
index 1f19c2e03d0..00000000000
--- a/compiler/testData/diagnostics/tests/override/DuplicateMethod.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Some': FqName@3) = null
-    packageFragments('SomeImpl': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Some': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Some': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log b/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
deleted file mode 100644
index 893bbda3ee3..00000000000
--- a/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Bar': FqName@7) = null
-    packageFragments('Foo': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Bar': FqName@14) = null
-    packageFragments('java.lang.Foo': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.A': FqName@17) = null
-    packageFragments('kotlin.Bar': FqName@18) = null
-    packageFragments('kotlin.Foo': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Unit': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log b/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
deleted file mode 100644
index 445a798ba95..00000000000
--- a/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Function1': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('extendFunctionClass': FqName@7) = null
-    packageFragments('extendFunctionClass.A': FqName@8) = null
-    packageFragments('extendFunctionClass.B': FqName@9) = null
-    packageFragments('extendFunctionClass.Function1': FqName@10) = null
-    packageFragments('extendFunctionClass.Int': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Function1': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Function1': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log b/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
deleted file mode 100644
index 7b035eaf6d8..00000000000
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Ccc': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Ttt': FqName@7) = null
-    packageFragments('Zzz': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Ccc': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Ttt': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Ccc': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Ttt': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log b/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
deleted file mode 100644
index a8a9177db60..00000000000
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('CharSequence': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.CharSequence': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.CharSequence': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('obj': FqName@25) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/Generics.lazy.log b/compiler/testData/diagnostics/tests/override/Generics.lazy.log
deleted file mode 100644
index 2dcc068b6c4..00000000000
--- a/compiler/testData/diagnostics/tests/override/Generics.lazy.log
+++ /dev/null
@@ -1,250 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['R']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = JetTypeImpl@5['String']
-    <name not found> = JetTypeImpl@6['T']
-    <name not found> = JetTypeImpl@7['T']
-    <name not found> = JetTypeImpl@8['T']
-    <name not found> = JetTypeImpl@9['T']
-    <name not found> = JetTypeImpl@10['T']
-    <name not found> = JetTypeImpl@11['T']
-    <name not found> = JetTypeImpl@12['T']
-    <name not found> = JetTypeImpl@13['T']
-    <name not found> = StringValue@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('Int': FqName@18) = null
-    packageFragments('MyAbstractClass': FqName@19) = null
-    packageFragments('MyGenericClass': FqName@20) = null
-    packageFragments('MyProps': FqName@21) = null
-    packageFragments('MyTrait': FqName@22) = null
-    packageFragments('R': FqName@23) = null
-    packageFragments('String': FqName@24) = null
-    packageFragments('T': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.Int': FqName@30) = null
-    packageFragments('java.lang.MyAbstractClass': FqName@31) = null
-    packageFragments('java.lang.MyGenericClass': FqName@32) = null
-    packageFragments('java.lang.MyProps': FqName@33) = null
-    packageFragments('java.lang.MyTrait': FqName@34) = null
-    packageFragments('java.lang.R': FqName@35) = null
-    packageFragments('java.lang.String': FqName@36) = null
-    packageFragments('java.lang.T': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.Int': FqName@39) = null
-    packageFragments('kotlin.MyAbstractClass': FqName@40) = null
-    packageFragments('kotlin.MyGenericClass': FqName@41) = null
-    packageFragments('kotlin.MyProps': FqName@42) = null
-    packageFragments('kotlin.MyTrait': FqName@43) = null
-    packageFragments('kotlin.R': FqName@44) = null
-    packageFragments('kotlin.String': FqName@45) = null
-    packageFragments('kotlin.T': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('override': FqName@49) = null
-    packageFragments('override.generics': FqName@50) = null
-    packageFragments('override.generics.Int': FqName@51) = null
-    packageFragments('override.generics.MyAbstractClass': FqName@52) = null
-    packageFragments('override.generics.MyAbstractClass1': FqName@53) = null
-    packageFragments('override.generics.MyChildClass': FqName@54) = null
-    packageFragments('override.generics.MyChildClass1': FqName@55) = null
-    packageFragments('override.generics.MyChildClass2': FqName@56) = null
-    packageFragments('override.generics.MyClass': FqName@57) = null
-    packageFragments('override.generics.MyGenericClass': FqName@58) = null
-    packageFragments('override.generics.MyIllegalClass1': FqName@59) = null
-    packageFragments('override.generics.MyIllegalClass2': FqName@60) = null
-    packageFragments('override.generics.MyIllegalGenericClass1': FqName@61) = null
-    packageFragments('override.generics.MyIllegalGenericClass2': FqName@62) = null
-    packageFragments('override.generics.MyLegalAbstractClass1': FqName@63) = null
-    packageFragments('override.generics.MyLegalAbstractClass2': FqName@64) = null
-    packageFragments('override.generics.MyProps': FqName@65) = null
-    packageFragments('override.generics.MyTrait': FqName@66) = null
-    packageFragments('override.generics.R': FqName@67) = null
-    packageFragments('override.generics.String': FqName@68) = null
-    packageFragments('override.generics.T': FqName@69) = null
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-null {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@138 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log b/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
deleted file mode 100644
index 01401efdc6e..00000000000
--- a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log b/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
deleted file mode 100644
index 1d173e75a7d..00000000000
--- a/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Base1': FqName@3) = null
-    packageFragments('Base2': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Base1': FqName@10) = null
-    packageFragments('java.lang.Base2': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Base1': FqName@13) = null
-    packageFragments('kotlin.Base2': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Base1': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Base2': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Base2': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('Base1': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Base2': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Base2': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.lazy.log
deleted file mode 100644
index 2ad92103f90..00000000000
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypes.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('X': FqName@4) = null
-    packageFragments('Y': FqName@5) = null
-    packageFragments('Z': FqName@6) = null
-    packageFragments('ZO': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.X': FqName@13) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.X': FqName@17) = null
-    packageFragments('kotlin.Y': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.lazy.log b/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.lazy.log
deleted file mode 100644
index 2ad92103f90..00000000000
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultParametersInSupertypesNoOverride.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('X': FqName@4) = null
-    packageFragments('Y': FqName@5) = null
-    packageFragments('Z': FqName@6) = null
-    packageFragments('ZO': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.X': FqName@13) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.X': FqName@17) = null
-    packageFragments('kotlin.Y': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
deleted file mode 100644
index f4c3b0e8925..00000000000
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Z': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.lazy.log b/compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.lazy.log
deleted file mode 100644
index 499c85297f0..00000000000
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultsInSupertypesNoExplicitOverride.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('X': FqName@4) = null
-    packageFragments('Y': FqName@5) = null
-    packageFragments('Z1': FqName@6) = null
-    packageFragments('Z1O': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.X': FqName@13) = null
-    packageFragments('java.lang.Y': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.X': FqName@17) = null
-    packageFragments('kotlin.Y': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log b/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
deleted file mode 100644
index 921514e3a71..00000000000
--- a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
+++ /dev/null
@@ -1,193 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('MyAbstractClass': FqName@6) = null
-    packageFragments('MyClass': FqName@7) = null
-    packageFragments('MyTrait': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.MyAbstractClass': FqName@15) = null
-    packageFragments('java.lang.MyClass': FqName@16) = null
-    packageFragments('java.lang.MyTrait': FqName@17) = null
-    packageFragments('java.lang.Unit': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.MyAbstractClass': FqName@21) = null
-    packageFragments('kotlin.MyClass': FqName@22) = null
-    packageFragments('kotlin.MyTrait': FqName@23) = null
-    packageFragments('kotlin.Unit': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('override': FqName@27) = null
-    packageFragments('override.normal': FqName@28) = null
-    packageFragments('override.normal.Int': FqName@29) = null
-    packageFragments('override.normal.MyAbstractClass': FqName@30) = null
-    packageFragments('override.normal.MyChildClass': FqName@31) = null
-    packageFragments('override.normal.MyChildClass1': FqName@32) = null
-    packageFragments('override.normal.MyClass': FqName@33) = null
-    packageFragments('override.normal.MyIllegalClass': FqName@34) = null
-    packageFragments('override.normal.MyIllegalClass2': FqName@35) = null
-    packageFragments('override.normal.MyIllegalClass3': FqName@36) = null
-    packageFragments('override.normal.MyIllegalClass4': FqName@37) = null
-    packageFragments('override.normal.MyTrait': FqName@38) = null
-    packageFragments('override.normal.Unit': FqName@39) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-null {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log b/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
deleted file mode 100644
index 41d494e389f..00000000000
--- a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('D': FqName@5) = null
-    packageFragments('E': FqName@6) = null
-    packageFragments('Impl': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('java.lang.E': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.D': FqName@15) = null
-    packageFragments('kotlin.E': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('obj': FqName@19) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log b/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
deleted file mode 100644
index 9038322a171..00000000000
--- a/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.A': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-null {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.lazy.log b/compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.lazy.log
deleted file mode 100644
index ecdb6afa7be..00000000000
--- a/compiler/testData/diagnostics/tests/override/ParameterDefaultValues-DefaultValueFromOnlyOneSupertype.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('X': FqName@4) = null
-    packageFragments('Y': FqName@5) = null
-    packageFragments('Z': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.X': FqName@12) = null
-    packageFragments('java.lang.Y': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.X': FqName@16) = null
-    packageFragments('kotlin.Y': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log b/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
deleted file mode 100644
index 9a139f52c72..00000000000
--- a/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('d': FqName@9) = null
-    packageFragments('d.A': FqName@10) = null
-    packageFragments('d.B': FqName@11) = null
-    packageFragments('d.C': FqName@12) = null
-    packageFragments('d.D': FqName@13) = null
-    packageFragments('d.E': FqName@14) = null
-    packageFragments('d.Int': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.B': FqName@21) = null
-    packageFragments('java.lang.C': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = null
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.B': FqName@26) = null
-    packageFragments('kotlin.C': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log b/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
deleted file mode 100644
index a7882308f71..00000000000
--- a/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Base': FqName@7) = null
-    packageFragments('Child': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Base': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Base': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
deleted file mode 100644
index 6e5958eb8f5..00000000000
--- a/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = StringValue@2
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.C': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('test': FqName@25) = null
-    packageFragments('test.A': FqName@26) = null
-    packageFragments('test.B': FqName@27) = null
-    packageFragments('test.C': FqName@28) = null
-    packageFragments('test.String': FqName@29) = null
-    packageFragments('test.Subject': FqName@30) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log b/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
deleted file mode 100644
index 236c7cd8f4f..00000000000
--- a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Bar': FqName@5) = null
-    packageFragments('Baz': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('P': FqName@9) = null
-    packageFragments('Q': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Bar': FqName@16) = null
-    packageFragments('java.lang.Baz': FqName@17) = null
-    packageFragments('java.lang.Foo': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.P': FqName@20) = null
-    packageFragments('java.lang.Q': FqName@21) = null
-    packageFragments('java.lang.String': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.Bar': FqName@24) = null
-    packageFragments('kotlin.Baz': FqName@25) = null
-    packageFragments('kotlin.Foo': FqName@26) = null
-    packageFragments('kotlin.Int': FqName@27) = null
-    packageFragments('kotlin.P': FqName@28) = null
-    packageFragments('kotlin.Q': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@47 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.lazy.log b/compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.lazy.log
deleted file mode 100644
index dd67dcce29b..00000000000
--- a/compiler/testData/diagnostics/tests/override/ToAbstractMembersFromSuper-kt1996.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Baz': FqName@4) = null
-    packageFragments('Foo': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Bar': FqName@11) = null
-    packageFragments('java.lang.Foo': FqName@12) = null
-    packageFragments('java.lang.Unit': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Bar': FqName@15) = null
-    packageFragments('kotlin.Foo': FqName@16) = null
-    packageFragments('kotlin.Unit': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log b/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
deleted file mode 100644
index f014579751b..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Aaa': FqName@5) = null
-    packageFragments('Bbb': FqName@6) = null
-    packageFragments('Ccc': FqName@7) = null
-    packageFragments('Ddd': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Aaa': FqName@13) = null
-    packageFragments('java.lang.Bbb': FqName@14) = null
-    packageFragments('java.lang.Ccc': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Aaa': FqName@17) = null
-    packageFragments('kotlin.Bbb': FqName@18) = null
-    packageFragments('kotlin.Ccc': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt2052.lazy.log b/compiler/testData/diagnostics/tests/override/kt2052.lazy.log
deleted file mode 100644
index 26a8d886f17..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt2052.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Runnable': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Runnable': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Runnable': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log b/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
deleted file mode 100644
index 4133fc7eb07..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('obj': FqName@19) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
deleted file mode 100644
index 142202e7c58..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('CharSequence': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('d': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.CharSequence': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.CharSequence': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
deleted file mode 100644
index 557669db2e1..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = IntValue@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Number': FqName@8) = null
-    packageFragments('P': FqName@9) = null
-    packageFragments('Q': FqName@10) = null
-    packageFragments('R': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Number': FqName@17) = null
-    packageFragments('java.lang.P': FqName@18) = null
-    packageFragments('java.lang.Q': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.Number': FqName@22) = null
-    packageFragments('kotlin.P': FqName@23) = null
-    packageFragments('kotlin.Q': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-    packageFragments('s': FqName@27) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Number': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
deleted file mode 100644
index 40ae70e2b58..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('E': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.C': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('z': FqName@19) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt4785classObject.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785classObject.lazy.log
deleted file mode 100644
index 5ca0cbc0513..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt4785classObject.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
deleted file mode 100644
index 9b0f9f49011..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('E': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-}
diff --git a/compiler/testData/diagnostics/tests/override/kt880.lazy.log b/compiler/testData/diagnostics/tests/override/kt880.lazy.log
deleted file mode 100644
index ac3981a8955..00000000000
--- a/compiler/testData/diagnostics/tests/override/kt880.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('I': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.I': FqName@12) = null
-    packageFragments('java.lang.Unit': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.I': FqName@16) = null
-    packageFragments('kotlin.Unit': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('test': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('test': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('test': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('test': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.lazy.log
deleted file mode 100644
index 315b632f73a..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/changeOnOverrideDiagnostic.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C1': FqName@5) = null
-    packageFragments('C2': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
deleted file mode 100644
index 48ad4ab99b4..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassDescriptor@4['UnsupportedOperationException'] {
-    constructors = ArrayList@5[4] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { LazyJavaClassifierType@14['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@3['RuntimeException'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@11['UnsupportedOperationException'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['RuntimeException'] }
-}
-
-LazyJavaClassifierType@17['Exception'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@20['RuntimeException'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@3['RuntimeException']
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@14['Throwable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('C': FqName@54) = null
-    packageFragments('D': FqName@55) = null
-    packageFragments('E': FqName@56) = null
-    packageFragments('F': FqName@57) = null
-    packageFragments('Int': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.C': FqName@63) = null
-    packageFragments('java.lang.D': FqName@64) = null
-    packageFragments('java.lang.Int': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.C': FqName@67) = null
-    packageFragments('kotlin.D': FqName@68) = null
-    packageFragments('kotlin.Int': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@22['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@24['RuntimeException']) = LazyJavaClassDescriptor@2['RuntimeException']
-    topLevelClasses(JavaClassImpl@72['UnsupportedOperationException']) = LazyJavaClassDescriptor@4['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@53['<root>'] {
-    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('UnsupportedOperationException': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('UnsupportedOperationException': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('UnsupportedOperationException': Name@75) = LazyJavaClassDescriptor@4['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('UnsupportedOperationException': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[4] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@90[4] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.lazy.log
deleted file mode 100644
index 911178c4f37..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/jjkHierarchy.lazy.log
+++ /dev/null
@@ -1,89 +0,0 @@
-LazyJavaClassDescriptor@0['Sub'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['foo'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['Sub']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@3['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@27['Sub']
-}
-
-LazyJavaClassDescriptor@28['Super'] {
-    defaultType = JetTypeImpl@29['Super']
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    functions('equals': Name@11) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@32['equals'] } // through LazyJavaClassMemberScope@30
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    functions('foo': Name@15) = ArrayList@33[1] { JavaMethodDescriptor@34['foo'] } // through LazyJavaClassMemberScope@30
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    functions('hashCode': Name@18) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['hashCode'] } // through LazyJavaClassMemberScope@30
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    functions('toString': Name@22) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['toString'] } // through LazyJavaClassMemberScope@30
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@40['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@41['Super']
-}
-
-LazyJavaClassTypeConstructor@27['Sub'] {
-    parameters = ArrayList@42[empty]
-    supertypes = ArrayList@43[1] { LazyJavaClassifierType@44['Super'] }
-}
-
-LazyJavaClassTypeConstructor@41['Super'] {
-    parameters = ArrayList@45[empty]
-    supertypes = ArrayList@46[1] { JetTypeImpl@47['Any'] }
-}
-
-LazyJavaClassifierType@48['Object'] {
-    classifier = JavaClassImpl@49['Object']
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@44['Super'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@52['Super']
-    memberScope = LazyJavaClassMemberScope@30
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@41['Super']
-}
-
-LazyJavaPackageFragmentProvider@54 {
-    packageFragments('<root>': FqName@55) = LazyJavaPackageFragment@56['<root>']
-    packageFragments('Long': FqName@57) = null
-    packageFragments('Sub': FqName@58) = null
-    packageFragments('SubSub': FqName@59) = null
-    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
-    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.Long': FqName@64) = null
-    packageFragments('java.lang.Sub': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Long': FqName@67) = null
-    packageFragments('kotlin.Sub': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Sub']) = LazyJavaClassDescriptor@0['Sub']
-    topLevelClasses(JavaClassImpl@52['Super']) = LazyJavaClassDescriptor@28['Super']
-}
-
-LazyJavaPackageFragment@56['<root>'] {
-    classes('Long': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Sub': Name@74) = LazyJavaClassDescriptor@0['Sub'] // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@78) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@76
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.lazy.log
deleted file mode 100644
index 2a6b3e39fa4..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkHierarchy.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-LazyJavaClassDescriptor@0['Sub'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], SimpleFunctionDescriptorImpl@3['foo'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['Sub']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@15) = ArrayList@16[1] { SimpleFunctionDescriptorImpl@3['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@27['Sub']
-}
-
-LazyJavaClassTypeConstructor@27['Sub'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Super'] }
-}
-
-LazyJavaClassifierType@30['Super'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['Super']
-    memberScope = WritableScopeImpl@33
-    nullable = 'false': Boolean@34
-    typeConstructor = TypeConstructorImpl$1@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('Int': FqName@39) = null
-    packageFragments('Sub': FqName@40) = null
-    packageFragments('SubSub': FqName@41) = null
-    packageFragments('Super': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.Int': FqName@47) = null
-    packageFragments('java.lang.Sub': FqName@48) = null
-    packageFragments('kotlin': FqName@49) = null
-    packageFragments('kotlin.Int': FqName@50) = null
-    packageFragments('kotlin.Sub': FqName@51) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    topLevelClasses(JavaClassImpl@54['Sub']) = LazyJavaClassDescriptor@0['Sub']
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Sub': Name@57) = LazyJavaClassDescriptor@0['Sub'] // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@61) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@59
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
deleted file mode 100644
index 1ae8653c7fd..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
+++ /dev/null
@@ -1,247 +0,0 @@
-LazyJavaClassDescriptor@0['JSuper1'] {
-    defaultType = JetTypeImpl@1['JSuper1']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@5) = ArrayList@6[1] { DeserializedSimpleFunctionDescriptor@7['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('foo': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['foo'] } // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toString': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['toString'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
-}
-
-LazyJavaClassDescriptor@25['JSuper2'] {
-    defaultType = JetTypeImpl@26['JSuper2']
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('equals': Name@5) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['equals'] } // through LazyJavaClassMemberScope@27
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('foo': Name@9) = ArrayList@30[1] { JavaMethodDescriptor@31['foo'] } // through LazyJavaClassMemberScope@27
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('hashCode': Name@13) = ArrayList@32[1] { DeserializedSimpleFunctionDescriptor@33['hashCode'] } // through LazyJavaClassMemberScope@27
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    functions('toString': Name@18) = ArrayList@34[1] { DeserializedSimpleFunctionDescriptor@35['toString'] } // through LazyJavaClassMemberScope@27
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
-}
-
-LazyJavaClassDescriptor@39['Sub1'] {
-    allDescriptors = ArrayList@40[4] { DeserializedSimpleFunctionDescriptor@41['hashCode'], JavaMethodDescriptor@42['foo'], DeserializedSimpleFunctionDescriptor@43['toString'], ... } // through LazyJavaClassMemberScope@44
-    constructors = stdlib_emptyListClass@45[empty] // through LazyJavaClassMemberScope@44
-    defaultType = JetTypeImpl@46['Sub1']
-    enumEntryIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@44
-    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    functions('equals': Name@5) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['equals'] } // through LazyJavaClassMemberScope@44
-    functions('finalize': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    functions('foo': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@42['foo'] } // through LazyJavaClassMemberScope@44
-    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    functions('hashCode': Name@13) = ArrayList@52[1] { DeserializedSimpleFunctionDescriptor@41['hashCode'] } // through LazyJavaClassMemberScope@44
-    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    functions('toString': Name@18) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@43['toString'] } // through LazyJavaClassMemberScope@44
-    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@44
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@44
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@56['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@57['Sub1']
-}
-
-LazyJavaClassDescriptor@58['Sub2'] {
-    allDescriptors = ArrayList@59[4] { DeserializedSimpleFunctionDescriptor@60['hashCode'], JavaMethodDescriptor@61['foo'], DeserializedSimpleFunctionDescriptor@62['toString'], ... } // through LazyJavaClassMemberScope@63
-    constructors = stdlib_emptyListClass@45[empty] // through LazyJavaClassMemberScope@63
-    defaultType = JetTypeImpl@64['Sub2']
-    enumEntryIndex = LinkedHashMap@65 // through LazyJavaClassMemberScope@63
-    functions('clone': Name@66) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    functions('equals': Name@67) = ArrayList@68[1] { DeserializedSimpleFunctionDescriptor@69['equals'] } // through LazyJavaClassMemberScope@63
-    functions('finalize': Name@70) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    functions('foo': Name@71) = ArrayList@72[1] { JavaMethodDescriptor@61['foo'] } // through LazyJavaClassMemberScope@63
-    functions('getClass': Name@73) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    functions('hashCode': Name@74) = ArrayList@75[1] { DeserializedSimpleFunctionDescriptor@60['hashCode'] } // through LazyJavaClassMemberScope@63
-    functions('notify': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    functions('notifyAll': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    functions('toString': Name@78) = ArrayList@79[1] { DeserializedSimpleFunctionDescriptor@62['toString'] } // through LazyJavaClassMemberScope@63
-    functions('wait': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@63
-    memberIndex = computeMemberIndex$1@81 // through LazyJavaClassMemberScope@63
-    nestedClassIndex = LinkedHashMap@82 // through LazyJavaClassMemberScope@63
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@83['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@84['Sub2']
-}
-
-LazyJavaClassDescriptor@85['Sub3'] {
-    allDescriptors = ArrayList@86[4] { DeserializedSimpleFunctionDescriptor@87['hashCode'], JavaMethodDescriptor@88['foo'], DeserializedSimpleFunctionDescriptor@89['toString'], ... } // through LazyJavaClassMemberScope@90
-    constructors = stdlib_emptyListClass@45[empty] // through LazyJavaClassMemberScope@90
-    defaultType = JetTypeImpl@91['Sub3']
-    enumEntryIndex = LinkedHashMap@92 // through LazyJavaClassMemberScope@90
-    functions('clone': Name@93) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    functions('equals': Name@94) = ArrayList@95[1] { DeserializedSimpleFunctionDescriptor@96['equals'] } // through LazyJavaClassMemberScope@90
-    functions('finalize': Name@97) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    functions('foo': Name@98) = ArrayList@99[1] { JavaMethodDescriptor@88['foo'] } // through LazyJavaClassMemberScope@90
-    functions('getClass': Name@100) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    functions('hashCode': Name@101) = ArrayList@102[1] { DeserializedSimpleFunctionDescriptor@87['hashCode'] } // through LazyJavaClassMemberScope@90
-    functions('notify': Name@103) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    functions('notifyAll': Name@104) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    functions('toString': Name@105) = ArrayList@106[1] { DeserializedSimpleFunctionDescriptor@89['toString'] } // through LazyJavaClassMemberScope@90
-    functions('wait': Name@107) = EmptyList@3[empty] // through LazyJavaClassMemberScope@90
-    memberIndex = computeMemberIndex$1@108 // through LazyJavaClassMemberScope@90
-    nestedClassIndex = LinkedHashMap@109 // through LazyJavaClassMemberScope@90
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@110['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@111['Sub3']
-}
-
-LazyJavaClassTypeConstructor@24['JSuper1'] {
-    parameters = ArrayList@112[empty]
-    supertypes = ArrayList@113[1] { JetTypeImpl@114['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['JSuper2'] {
-    parameters = ArrayList@115[empty]
-    supertypes = ArrayList@116[1] { JetTypeImpl@114['Any'] }
-}
-
-LazyJavaClassTypeConstructor@57['Sub1'] {
-    parameters = ArrayList@117[empty]
-    supertypes = ArrayList@118[3] { LazyJavaClassifierType@119['KSuper'], LazyJavaClassifierType@120['JSuper1'], LazyJavaClassifierType@121['JSuper2'] }
-}
-
-LazyJavaClassTypeConstructor@84['Sub2'] {
-    parameters = ArrayList@122[empty]
-    supertypes = ArrayList@123[3] { LazyJavaClassifierType@124['JSuper1'], LazyJavaClassifierType@125['KSuper'], LazyJavaClassifierType@126['JSuper2'] }
-}
-
-LazyJavaClassTypeConstructor@111['Sub3'] {
-    parameters = ArrayList@127[empty]
-    supertypes = ArrayList@128[3] { LazyJavaClassifierType@129['JSuper1'], LazyJavaClassifierType@130['JSuper2'], LazyJavaClassifierType@131['KSuper'] }
-}
-
-LazyJavaClassifierType@124['JSuper1'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@133['JSuper1']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
-}
-
-LazyJavaClassifierType@129['JSuper1'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@136['JSuper1']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
-}
-
-LazyJavaClassifierType@120['JSuper1'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@138['JSuper1']
-    memberScope = LazyJavaClassMemberScope@4
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
-}
-
-LazyJavaClassifierType@130['JSuper2'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@140['JSuper2']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
-}
-
-LazyJavaClassifierType@121['JSuper2'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@142['JSuper2']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
-}
-
-LazyJavaClassifierType@126['JSuper2'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['JSuper2']
-    memberScope = LazyJavaClassMemberScope@27
-    nullable = 'false': Boolean@134
-    typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
-}
-
-LazyJavaClassifierType@119['KSuper'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['KSuper']
-    memberScope = WritableScopeImpl@147
-    nullable = 'false': Boolean@134
-    typeConstructor = TypeConstructorImpl$1@148
-}
-
-LazyJavaClassifierType@125['KSuper'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@150['KSuper']
-    memberScope = WritableScopeImpl@147
-    nullable = 'false': Boolean@134
-    typeConstructor = TypeConstructorImpl$1@148
-}
-
-LazyJavaClassifierType@131['KSuper'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@152['KSuper']
-    memberScope = WritableScopeImpl@147
-    nullable = 'false': Boolean@134
-    typeConstructor = TypeConstructorImpl$1@148
-}
-
-LazyJavaClassifierType@153['Object'] {
-    classifier = JavaClassImpl@154['Object']
-    typeConstructor = DeserializedClassTypeConstructor@155
-}
-
-LazyJavaClassifierType@156['Object'] {
-    classifier = JavaClassImpl@157['Object']
-    typeConstructor = DeserializedClassTypeConstructor@155
-}
-
-LazyJavaPackageFragmentProvider@158 {
-    packageFragments('<root>': FqName@159) = LazyJavaPackageFragment@160['<root>']
-    packageFragments('Int': FqName@161) = null
-    packageFragments('KSuper': FqName@162) = null
-    packageFragments('Sub1': FqName@163) = null
-    packageFragments('Sub2': FqName@164) = null
-    packageFragments('Sub3': FqName@165) = null
-    packageFragments('SubSub1': FqName@166) = null
-    packageFragments('SubSub2': FqName@167) = null
-    packageFragments('SubSub3': FqName@168) = null
-    packageFragments('java': FqName@169) = LazyJavaPackageFragment@170['java']
-    packageFragments('java.lang': FqName@171) = LazyJavaPackageFragment@172['lang']
-    packageFragments('java.lang.Int': FqName@173) = null
-    packageFragments('java.lang.Sub1': FqName@174) = null
-    packageFragments('java.lang.Sub2': FqName@175) = null
-    packageFragments('java.lang.Sub3': FqName@176) = null
-    packageFragments('kotlin': FqName@177) = null
-    packageFragments('kotlin.Int': FqName@178) = null
-    packageFragments('kotlin.Sub1': FqName@179) = null
-    packageFragments('kotlin.Sub2': FqName@180) = null
-    packageFragments('kotlin.Sub3': FqName@181) = null
-    packageFragments('kotlin.io': FqName@182) = null
-    packageFragments('kotlin.jvm': FqName@183) = null
-    topLevelClasses(JavaClassImpl@138['JSuper1']) = LazyJavaClassDescriptor@0['JSuper1']
-    topLevelClasses(JavaClassImpl@142['JSuper2']) = LazyJavaClassDescriptor@25['JSuper2']
-    topLevelClasses(JavaClassImpl@184['Sub1']) = LazyJavaClassDescriptor@39['Sub1']
-    topLevelClasses(JavaClassImpl@185['Sub2']) = LazyJavaClassDescriptor@58['Sub2']
-    topLevelClasses(JavaClassImpl@186['Sub3']) = LazyJavaClassDescriptor@85['Sub3']
-}
-
-LazyJavaPackageFragment@160['<root>'] {
-    classes('Int': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Sub1': Name@189) = LazyJavaClassDescriptor@39['Sub1'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Sub2': Name@190) = LazyJavaClassDescriptor@58['Sub2'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('Sub3': Name@191) = LazyJavaClassDescriptor@85['Sub3'] // through LazyPackageFragmentScopeForJavaPackage@188
-}
-
-LazyJavaPackageFragment@170['java'] {
-    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('lang': Name@195) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@193
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.lazy.log
deleted file mode 100644
index 6eb8ec02c8f..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsBothJavaAndKotlin.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-LazyJavaClassDescriptor@0['JavaInterface'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['foo'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['JavaInterface']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@3['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['JavaInterface']
-}
-
-LazyJavaClassTypeConstructor@28['JavaInterface'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@35 {
-    packageFragments('<root>': FqName@36) = LazyJavaPackageFragment@37['<root>']
-    packageFragments('BothTraitsSubclass': FqName@38) = null
-    packageFragments('Int': FqName@39) = null
-    packageFragments('JavaInterface': FqName@40) = null
-    packageFragments('KotlinTrait': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.Int': FqName@46) = null
-    packageFragments('java.lang.JavaInterface': FqName@47) = null
-    packageFragments('java.lang.KotlinTrait': FqName@48) = null
-    packageFragments('kotlin': FqName@49) = null
-    packageFragments('kotlin.Int': FqName@50) = null
-    packageFragments('kotlin.JavaInterface': FqName@51) = null
-    packageFragments('kotlin.KotlinTrait': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    topLevelClasses(JavaClassImpl@55['JavaInterface']) = LazyJavaClassDescriptor@0['JavaInterface']
-}
-
-LazyJavaPackageFragment@37['<root>'] {
-    classes('Int': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('JavaInterface': Name@58) = LazyJavaClassDescriptor@0['JavaInterface'] // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@62) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@60
-}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.lazy.log
deleted file mode 100644
index cafea296d74..00000000000
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kotlinInheritsJava.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-LazyJavaClassDescriptor@0['JavaInterface'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['foo'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['JavaInterface']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@3['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['JavaInterface']
-}
-
-LazyJavaClassTypeConstructor@28['JavaInterface'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@35 {
-    packageFragments('<root>': FqName@36) = LazyJavaPackageFragment@37['<root>']
-    packageFragments('Int': FqName@38) = null
-    packageFragments('JavaInterface': FqName@39) = null
-    packageFragments('SimpleSubclass': FqName@40) = null
-    packageFragments('Subclass': FqName@41) = null
-    packageFragments('SubtraitWithFakeOverride': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.Int': FqName@47) = null
-    packageFragments('java.lang.JavaInterface': FqName@48) = null
-    packageFragments('java.lang.SubtraitWithFakeOverride': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Int': FqName@51) = null
-    packageFragments('kotlin.JavaInterface': FqName@52) = null
-    packageFragments('kotlin.SubtraitWithFakeOverride': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    topLevelClasses(JavaClassImpl@56['JavaInterface']) = LazyJavaClassDescriptor@0['JavaInterface']
-}
-
-LazyJavaPackageFragment@37['<root>'] {
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('JavaInterface': Name@59) = LazyJavaClassDescriptor@0['JavaInterface'] // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@63) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@61
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
deleted file mode 100644
index 383c31eda0d..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaClassDescriptor@0['Utils'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('c': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['c'] } // through LazyJavaStaticClassScope@6
-    functions('c': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('c': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('c': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('c': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Utils']
-}
-
-LazyJavaClassTypeConstructor@11['Utils'] {
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['Collection<String>'] {
-    arguments = ArrayList@15[1] { TypeProjectionImpl@16 }
-    classifier = JavaClassImpl@17['Collection']
-    memberScope = SubstitutingScope@18
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['Collection<String>'] {
-    arguments = ArrayList@22[1] { TypeProjectionImpl@23 }
-    classifier = JavaClassImpl@17['Collection']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaClassifierType@26['Object'] {
-    classifier = JavaClassImpl@27['Object']
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@31['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@40 {
-    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    packageFragments('Any': FqName@43) = null
-    packageFragments('Boolean': FqName@44) = null
-    packageFragments('T': FqName@45) = null
-    packageFragments('Utils': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.Any': FqName@51) = null
-    packageFragments('java.lang.Boolean': FqName@52) = null
-    packageFragments('java.lang.T': FqName@53) = null
-    packageFragments('java.lang.Utils': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = null
-    packageFragments('kotlin.Any': FqName@56) = null
-    packageFragments('kotlin.Boolean': FqName@57) = null
-    packageFragments('kotlin.T': FqName@58) = null
-    packageFragments('kotlin.Utils': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = null
-    packageFragments('kotlin.jvm': FqName@61) = null
-    packageFragments('p': FqName@62) = LazyJavaPackageFragment@63['p']
-    packageFragments('p.Any': FqName@64) = null
-    packageFragments('p.Boolean': FqName@65) = null
-    packageFragments('p.T': FqName@66) = null
-    packageFragments('p.Utils': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['Utils']) = LazyJavaClassDescriptor@0['Utils']
-}
-
-LazyJavaPackageFragment@42['<root>'] {
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Boolean': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('Utils': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@73) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('p': Name@76) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    classes('foo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@73) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@63['p'] {
-    classes('Any': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Boolean': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Utils': Name@72) = LazyJavaClassDescriptor@0['Utils'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@73) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
deleted file mode 100644
index 940643236f7..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
+++ /dev/null
@@ -1,284 +0,0 @@
-LazyJavaClassDescriptor@0['Other'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@3 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaStaticClassScope@5
-    nestedClassIndex = LinkedHashMap@6 // through LazyJavaClassMemberScope@2
-    nestedClasses('subs': Name@7) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('supers': Name@8) = null // through LazyJavaClassMemberScope@2
-    properties('subs': Name@7) = ArrayList@9[1] { JavaPropertyDescriptor@10['subs'] } // through LazyJavaStaticClassScope@5
-    properties('subs': Name@7) = EmptyList@11[empty] // through LazyJavaClassMemberScope@2
-    properties('supers': Name@8) = ArrayList@12[1] { JavaPropertyDescriptor@13['supers'] } // through LazyJavaStaticClassScope@5
-    properties('supers': Name@8) = EmptyList@11[empty] // through LazyJavaClassMemberScope@2
-    typeConstructor = LazyJavaClassTypeConstructor@14['Other']
-}
-
-LazyJavaClassDescriptor@15['Sub'] {
-    typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
-}
-
-LazyJavaClassDescriptor@17['Super'] {
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaClassTypeConstructor@14['Other'] {
-    supertypes = ArrayList@19[1] { JetTypeImpl@20['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Sub'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Super'] }
-}
-
-LazyJavaClassTypeConstructor@18['Super'] {
-    parameters = ArrayList@24[empty]
-    supertypes = ArrayList@25[1] { JetTypeImpl@20['Any'] }
-}
-
-LazyJavaClassifierType@26['Collection<Sub>'] {
-    arguments = ArrayList@27[1] { TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['Collection']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['Collection<Sub>'] {
-    arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
-    classifier = JavaClassImpl@29['Collection']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['Collection<Super>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['Collection']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@41['Collection<Super>'] {
-    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    classifier = JavaClassImpl@40['Collection']
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@44['Object'] {
-    classifier = JavaClassImpl@45['Object']
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@47['Object'] {
-    classifier = JavaClassImpl@48['Object']
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@49['Sub'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@51['Sub']
-    nullable = 'false': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
-}
-
-LazyJavaClassifierType@52['Sub'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['Sub']
-    nullable = 'false': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
-}
-
-LazyJavaClassifierType@55['Sub'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@51['Sub']
-    nullable = 'true': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
-}
-
-LazyJavaClassifierType@57['Sub'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@54['Sub']
-    nullable = 'true': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
-}
-
-LazyJavaClassifierType@23['Super'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaClassImpl@60['Super']
-    nullable = 'false': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaClassifierType@61['Super'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@63['Super']
-    nullable = 'false': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaClassifierType@64['Super'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaClassImpl@66['Super']
-    nullable = 'false': Boolean@30
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaClassifierType@67['Super'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@66['Super']
-    nullable = 'true': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaClassifierType@69['Super'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@63['Super']
-    nullable = 'true': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@18['Super']
-}
-
-LazyJavaPackageFragmentProvider@71 {
-    packageFragments('<root>': FqName@72) = LazyJavaPackageFragment@73['<root>']
-    packageFragments('Collection': FqName@74) = null
-    packageFragments('List': FqName@75) = null
-    packageFragments('Other': FqName@76) = null
-    packageFragments('Super': FqName@77) = null
-    packageFragments('T': FqName@78) = null
-    packageFragments('java': FqName@79) = LazyJavaPackageFragment@80['java']
-    packageFragments('java.lang': FqName@81) = LazyJavaPackageFragment@82['lang']
-    packageFragments('java.lang.Collection': FqName@83) = null
-    packageFragments('java.lang.List': FqName@84) = null
-    packageFragments('java.lang.Other': FqName@85) = null
-    packageFragments('java.lang.Super': FqName@86) = null
-    packageFragments('java.lang.T': FqName@87) = null
-    packageFragments('kotlin': FqName@88) = null
-    packageFragments('kotlin.Collection': FqName@89) = null
-    packageFragments('kotlin.List': FqName@90) = null
-    packageFragments('kotlin.Other': FqName@91) = null
-    packageFragments('kotlin.Super': FqName@92) = null
-    packageFragments('kotlin.T': FqName@93) = null
-    packageFragments('kotlin.io': FqName@94) = null
-    packageFragments('kotlin.jvm': FqName@95) = null
-    packageFragments('p': FqName@96) = LazyJavaPackageFragment@97['p']
-    packageFragments('p.Collection': FqName@98) = null
-    packageFragments('p.List': FqName@99) = null
-    packageFragments('p.Other': FqName@100) = null
-    packageFragments('p.Super': FqName@101) = null
-    packageFragments('p.T': FqName@102) = null
-    topLevelClasses(JavaClassImpl@103['Other']) = LazyJavaClassDescriptor@0['Other']
-    topLevelClasses(JavaClassImpl@51['Sub']) = LazyJavaClassDescriptor@15['Sub']
-    topLevelClasses(JavaClassImpl@104['Super']) = LazyJavaClassDescriptor@17['Super']
-}
-
-LazyJavaPackageFragment@73['<root>'] {
-    classes('Collection': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('List': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Other': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Super': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('p': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('p': Name@113) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@80['java'] {
-    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('lang': Name@117) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@82['lang'] {
-    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
-}
-
-LazyJavaPackageFragment@97['p'] {
-    classes('Collection': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('List': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Other': Name@108) = LazyJavaClassDescriptor@0['Other'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Super': Name@109) = LazyJavaClassDescriptor@17['Super'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-null {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@158[7] { ResolutionCandidate@146, ResolutionCandidate@147, ResolutionCandidate@148, ... }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
deleted file mode 100644
index 58b14693275..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
+++ /dev/null
@@ -1,402 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@4['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassDescriptor@6['ArrayList'] {
-    constructors = ArrayList@7[3] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'] } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['ArrayList']
-}
-
-LazyJavaClassDescriptor@14['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassDescriptor@16['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['AbstractList'] {
-    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
-    supertypes = ArrayList@24[2] { LazyJavaClassifierType@25['AbstractCollection<E>'], LazyJavaClassifierType@26['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@13['ArrayList'] {
-    parameters = ArrayList@27[1] { LazyJavaTypeParameterDescriptor@28['E'] }
-    supertypes = ArrayList@29[5] { LazyJavaClassifierType@30['AbstractList<E>'], LazyJavaClassifierType@31['List<E>'], LazyJavaClassifierType@32['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@15['RandomAccess'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Serializable'] {
-    parameters = ArrayList@36[empty]
-    supertypes = ArrayList@37[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassifierType@25['AbstractCollection<E>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['AbstractCollection']
-    memberScope = SubstitutingScope@41
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassifierType@30['AbstractList<E>'] {
-    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    classifier = JavaClassImpl@45['AbstractList']
-    memberScope = SubstitutingScope@46
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassifierType@47['Cloneable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Cloneable']
-    memberScope = DeserializedClassMemberScope@50
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@52['Collection<? extends E>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@55['Collection']
-    memberScope = SubstitutingScope@56
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@58['Collection<? extends E>'] {
-    arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
-    classifier = JavaClassImpl@55['Collection']
-    memberScope = SubstitutingScope@61
-    nullable = 'true': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@63
-}
-
-LazyJavaClassifierType@21['Collection<E>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@66['Collection']
-    memberScope = SubstitutingScope@67
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-}
-
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@89['E'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['E']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@88['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@85['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-}
-
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@78['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@91['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@31['List<E>'] {
-    arguments = ArrayList@106[1] { TypeProjectionImpl@107 }
-    classifier = JavaClassImpl@108['List']
-    memberScope = SubstitutingScope@109
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@110
-}
-
-LazyJavaClassifierType@26['List<E>'] {
-    arguments = ArrayList@111[1] { TypeProjectionImpl@112 }
-    classifier = JavaClassImpl@113['List']
-    memberScope = SubstitutingScope@114
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@110
-}
-
-LazyJavaClassifierType@115['Object'] {
-    classifier = JavaClassImpl@116['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@118['Object'] {
-    classifier = JavaClassImpl@119['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@120['Object'] {
-    classifier = JavaClassImpl@121['Object']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@32['RandomAccess'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@124
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassifierType@125['Serializable'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['Serializable']
-    memberScope = LazyJavaClassMemberScope@128
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@129 {
-    packageFragments('<root>': FqName@130) = LazyJavaPackageFragment@131['<root>']
-    packageFragments('Array': FqName@132) = null
-    packageFragments('MutableList': FqName@133) = null
-    packageFragments('String': FqName@134) = null
-    packageFragments('T': FqName@135) = null
-    packageFragments('Unit': FqName@136) = null
-    packageFragments('_': FqName@137) = null
-    packageFragments('java': FqName@138) = LazyJavaPackageFragment@139['java']
-    packageFragments('java.io': FqName@140) = LazyJavaPackageFragment@141['io']
-    packageFragments('java.lang': FqName@142) = LazyJavaPackageFragment@143['lang']
-    packageFragments('java.lang.Array': FqName@144) = null
-    packageFragments('java.lang.MutableList': FqName@145) = null
-    packageFragments('java.lang.String': FqName@146) = null
-    packageFragments('java.lang.T': FqName@147) = null
-    packageFragments('java.lang.Unit': FqName@148) = null
-    packageFragments('java.lang._': FqName@149) = null
-    packageFragments('java.util': FqName@150) = LazyJavaPackageFragment@151['util']
-    packageFragments('java.util.ArrayList': FqName@152) = null
-    packageFragments('kotlin': FqName@153) = null
-    packageFragments('kotlin.Array': FqName@154) = null
-    packageFragments('kotlin.MutableList': FqName@155) = null
-    packageFragments('kotlin.String': FqName@156) = null
-    packageFragments('kotlin.T': FqName@157) = null
-    packageFragments('kotlin.Unit': FqName@158) = null
-    packageFragments('kotlin._': FqName@159) = null
-    packageFragments('kotlin.io': FqName@160) = null
-    packageFragments('kotlin.jvm': FqName@161) = null
-    packageFragments('tests': FqName@162) = null
-    packageFragments('tests._checkType': FqName@163) = null
-    packageFragments('tests._checkType.Array': FqName@164) = null
-    packageFragments('tests._checkType.MutableList': FqName@165) = null
-    packageFragments('tests._checkType.String': FqName@166) = null
-    packageFragments('tests._checkType.T': FqName@167) = null
-    packageFragments('tests._checkType.Unit': FqName@168) = null
-    packageFragments('tests._checkType._': FqName@169) = null
-    topLevelClasses(JavaClassImpl@40['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@45['AbstractList']) = LazyJavaClassDescriptor@4['AbstractList']
-    topLevelClasses(JavaClassImpl@170['ArrayList']) = LazyJavaClassDescriptor@6['ArrayList']
-    topLevelClasses(JavaClassImpl@123['RandomAccess']) = LazyJavaClassDescriptor@14['RandomAccess']
-    topLevelClasses(JavaClassImpl@127['Serializable']) = LazyJavaClassDescriptor@16['Serializable']
-}
-
-LazyJavaPackageFragment@131['<root>'] {
-    classes('Array': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('ArrayList': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('MutableList': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('String': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('java': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('tests': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('ArrayList': Name@179) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('java': Name@181) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('tests': Name@182) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@172
-}
-
-LazyJavaPackageFragment@139['java'] {
-    classes('lang': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('util': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('lang': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('util': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-LazyJavaPackageFragment@143['lang'] {
-    classes('ArrayList': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('ArrayList': Name@179) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@190
-}
-
-LazyJavaPackageFragment@151['util'] {
-    classes('ArrayList': Name@192) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('ArrayList': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaTypeParameterDescriptor@28['E'] {
-    defaultType = JetTypeImpl@196['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-    upperBounds = LinkedHashSet@197[1] { NullableType@198 }
-}
-
-LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@200['E']) = LazyJavaTypeParameterDescriptor@28['E']
-}
-
-LazyJavaTypeParameterResolver@201 {
-    resolve(JavaTypeParameterImpl@202['E']) = LazyJavaTypeParameterDescriptor@23['E']
-}
-
-LazyJavaTypeParameterResolver@203 {
-    resolve(JavaTypeParameterImpl@204['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[3] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
-
-null {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@242[3] { ResolutionCandidate@231, ResolutionCandidate@232, ResolutionCandidate@233 }
-    <name not found> = EmptyList@180[empty]
-    <name not found> = EmptyList@180[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
deleted file mode 100644
index e02cfbeca76..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
+++ /dev/null
@@ -1,185 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaClassDescriptor@2['J'] {
-    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    functions('j': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['j'] } // through LazyJavaStaticClassScope@8
-    functions('j': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@4
-    nestedClasses('j': Name@5) = null // through LazyJavaClassMemberScope@4
-    properties('j': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    properties('j': Name@5) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[1] { LazyJavaTypeParameterDescriptor@15['G'] }
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@18['J<String>'] {
-    arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
-    classifier = JavaClassImpl@21['J']
-    nullable = 'false': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@23['J<String>'] {
-    arguments = ArrayList@24[1] { TypeProjectionImpl@25 }
-    classifier = JavaClassImpl@21['J']
-    nullable = 'true': Boolean@26
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@27['Object'] {
-    classifier = JavaClassImpl@28['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('J': FqName@44) = null
-    packageFragments('String': FqName@45) = null
-    packageFragments('T': FqName@46) = null
-    packageFragments('Unit': FqName@47) = null
-    packageFragments('_': FqName@48) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.J': FqName@53) = null
-    packageFragments('java.lang.String': FqName@54) = null
-    packageFragments('java.lang.T': FqName@55) = null
-    packageFragments('java.lang.Unit': FqName@56) = null
-    packageFragments('java.lang._': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.J': FqName@59) = null
-    packageFragments('kotlin.String': FqName@60) = null
-    packageFragments('kotlin.T': FqName@61) = null
-    packageFragments('kotlin.Unit': FqName@62) = null
-    packageFragments('kotlin._': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    packageFragments('p': FqName@66) = LazyJavaPackageFragment@67['p']
-    packageFragments('p.J': FqName@68) = null
-    packageFragments('p.String': FqName@69) = null
-    packageFragments('tests': FqName@70) = null
-    packageFragments('tests._checkType': FqName@71) = null
-    packageFragments('tests._checkType.J': FqName@72) = null
-    packageFragments('tests._checkType.String': FqName@73) = null
-    packageFragments('tests._checkType.T': FqName@74) = null
-    packageFragments('tests._checkType.Unit': FqName@75) = null
-    packageFragments('tests._checkType._': FqName@76) = null
-    topLevelClasses(JavaClassImpl@77['J']) = LazyJavaClassDescriptor@2['J']
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('J': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('String': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('tests': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@84) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('tests': Name@85) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@67['p'] {
-    classes('J': Name@78) = LazyJavaClassDescriptor@2['J'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('String': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaTypeParameterDescriptor@15['G'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
-    upperBounds = LinkedHashSet@94[1] { NullableType@95 }
-}
-
-LazyJavaTypeParameterResolver@96 {
-    resolve(JavaTypeParameterImpl@97['G']) = LazyJavaTypeParameterDescriptor@15['G']
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
deleted file mode 100644
index 9a9380d3ca4..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassDescriptor@2['B'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassDescriptor@4['Rec'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['Rec']
-}
-
-LazyJavaClassTypeConstructor@1['A'] {
-    parameters = ArrayList@6[empty]
-    supertypes = ArrayList@7[1] { LazyJavaClassifierType@8['Rec<A>'] }
-}
-
-LazyJavaClassTypeConstructor@3['B'] {
-    parameters = ArrayList@9[empty]
-    supertypes = ArrayList@10[1] { LazyJavaClassifierType@11['Rec<B>'] }
-}
-
-LazyJavaClassTypeConstructor@5['Rec'] {
-    parameters = ArrayList@12[1] { LazyJavaTypeParameterDescriptor@13['T'] }
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['A'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@20['A'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@18['A']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@23['B'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['B']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassifierType@26['B'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@25['B']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassifierType@28['Object'] {
-    classifier = JavaClassImpl@29['Object']
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@8['Rec<A>'] {
-    arguments = ArrayList@31[1] { TypeProjectionImpl@32 }
-    classifier = JavaClassImpl@33['Rec']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@5['Rec']
-}
-
-LazyJavaClassifierType@11['Rec<B>'] {
-    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
-    classifier = JavaClassImpl@36['Rec']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@5['Rec']
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('A': FqName@40) = null
-    packageFragments('B': FqName@41) = null
-    packageFragments('Boolean': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.A': FqName@47) = null
-    packageFragments('java.lang.B': FqName@48) = null
-    packageFragments('java.lang.Boolean': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.A': FqName@51) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.Boolean': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    packageFragments('p': FqName@56) = LazyJavaPackageFragment@57['p']
-    packageFragments('p.A': FqName@58) = null
-    packageFragments('p.B': FqName@59) = null
-    packageFragments('p.Boolean': FqName@60) = null
-    topLevelClasses(JavaClassImpl@61['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@62['B']) = LazyJavaClassDescriptor@2['B']
-    topLevelClasses(JavaClassImpl@33['Rec']) = LazyJavaClassDescriptor@4['Rec']
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('A': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Boolean': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['p'] {
-    classes('A': Name@63) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('B': Name@65) = LazyJavaClassDescriptor@2['B'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('Boolean': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaTypeParameterResolver@78 {
-    resolve(JavaTypeParameterImpl@79['T']) = LazyJavaTypeParameterDescriptor@13['T']
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-null {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
deleted file mode 100644
index 04991b14708..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
+++ /dev/null
@@ -1,152 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['Utils'] {
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('str': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['str'] } // through LazyJavaStaticClassScope@7
-    functions('str': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaStaticClassScope@7
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
-    nestedClasses('str': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('str': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
-    properties('str': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['Utils']
-}
-
-LazyJavaClassTypeConstructor@12['Utils'] {
-    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
-}
-
-LazyJavaClassifierType@15['Object'] {
-    classifier = JavaClassImpl@16['Object']
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    memberScope = DeserializedClassMemberScope@21
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('Any': FqName@30) = null
-    packageFragments('Boolean': FqName@31) = null
-    packageFragments('T': FqName@32) = null
-    packageFragments('Utils': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.Any': FqName@38) = null
-    packageFragments('java.lang.Boolean': FqName@39) = null
-    packageFragments('java.lang.T': FqName@40) = null
-    packageFragments('java.lang.Utils': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Any': FqName@43) = null
-    packageFragments('kotlin.Boolean': FqName@44) = null
-    packageFragments('kotlin.T': FqName@45) = null
-    packageFragments('kotlin.Utils': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('p': FqName@49) = LazyJavaPackageFragment@50['p']
-    packageFragments('p.Any': FqName@51) = null
-    packageFragments('p.Boolean': FqName@52) = null
-    packageFragments('p.T': FqName@53) = null
-    packageFragments('p.Utils': FqName@54) = null
-    topLevelClasses(JavaClassImpl@55['Utils']) = LazyJavaClassDescriptor@1['Utils']
-}
-
-LazyJavaPackageFragment@29['<root>'] {
-    classes('Any': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Boolean': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Utils': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('p': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('foo': Name@60) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('p': Name@63) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('lang': Name@67) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@60) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@50['p'] {
-    classes('Any': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Boolean': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Utils': Name@59) = LazyJavaClassDescriptor@1['Utils'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@60) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
deleted file mode 100644
index 46d999a4471..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
+++ /dev/null
@@ -1,146 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('equals': Name@3) = ArrayList@4[1] { DeserializedSimpleFunctionDescriptor@5['equals'] } // through LazyJavaClassMemberScope@2
-    functions('j': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['j'] } // through LazyJavaStaticClassScope@9
-    functions('j': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaStaticClassScope@9
-    nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@2
-    nestedClasses('equals': Name@3) = null // through LazyJavaClassMemberScope@2
-    nestedClasses('j': Name@6) = null // through LazyJavaClassMemberScope@2
-    properties('j': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@2
-    properties('j': Name@6) = EmptyList@10[empty] // through LazyJavaStaticClassScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
-}
-
-LazyJavaClassTypeConstructor@14['J'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@18['J'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['J']
-    nullable = 'false': Boolean@21
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
-}
-
-LazyJavaClassifierType@22['J'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@20['J']
-    nullable = 'true': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
-}
-
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Array': FqName@31) = null
-    packageFragments('J': FqName@32) = null
-    packageFragments('String': FqName@33) = null
-    packageFragments('java': FqName@34) = LazyJavaPackageFragment@35['java']
-    packageFragments('java.lang': FqName@36) = LazyJavaPackageFragment@37['lang']
-    packageFragments('java.lang.Array': FqName@38) = null
-    packageFragments('java.lang.J': FqName@39) = null
-    packageFragments('java.lang.String': FqName@40) = null
-    packageFragments('kotlin': FqName@41) = null
-    packageFragments('kotlin.Array': FqName@42) = null
-    packageFragments('kotlin.J': FqName@43) = null
-    packageFragments('kotlin.String': FqName@44) = null
-    packageFragments('kotlin.io': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = null
-    packageFragments('p': FqName@47) = LazyJavaPackageFragment@48['p']
-    packageFragments('p.Array': FqName@49) = null
-    packageFragments('p.J': FqName@50) = null
-    packageFragments('p.String': FqName@51) = null
-    topLevelClasses(JavaClassImpl@52['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('J': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('p': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('p': Name@60) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@37['lang'] {
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@48['p'] {
-    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('J': Name@55) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
-
-null {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-    <name not found> = EmptyList@10[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
deleted file mode 100644
index c82796f0b3c..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
+++ /dev/null
@@ -1,245 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaClassDescriptor@2['J'] {
-    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    functions('j': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['j'] } // through LazyJavaStaticClassScope@8
-    functions('j': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@4
-    nestedClasses('j': Name@5) = null // through LazyJavaClassMemberScope@4
-    properties('j': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    properties('j': Name@5) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
-}
-
-LazyJavaClassifierType@17['J'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'false': Boolean@20
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@21['J'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'true': Boolean@23
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('J': FqName@30) = null
-    packageFragments('MutableList': FqName@31) = null
-    packageFragments('Nothing': FqName@32) = null
-    packageFragments('Out': FqName@33) = null
-    packageFragments('T': FqName@34) = null
-    packageFragments('Unit': FqName@35) = null
-    packageFragments('_': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.J': FqName@41) = null
-    packageFragments('java.lang.MutableList': FqName@42) = null
-    packageFragments('java.lang.Nothing': FqName@43) = null
-    packageFragments('java.lang.Out': FqName@44) = null
-    packageFragments('java.lang.T': FqName@45) = null
-    packageFragments('java.lang.Unit': FqName@46) = null
-    packageFragments('java.lang._': FqName@47) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.J': FqName@49) = null
-    packageFragments('kotlin.MutableList': FqName@50) = null
-    packageFragments('kotlin.Nothing': FqName@51) = null
-    packageFragments('kotlin.Out': FqName@52) = null
-    packageFragments('kotlin.T': FqName@53) = null
-    packageFragments('kotlin.Unit': FqName@54) = null
-    packageFragments('kotlin._': FqName@55) = null
-    packageFragments('kotlin.io': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = null
-    packageFragments('p': FqName@58) = LazyJavaPackageFragment@59['p']
-    packageFragments('p.J': FqName@60) = null
-    packageFragments('p.MutableList': FqName@61) = null
-    packageFragments('p.Nothing': FqName@62) = null
-    packageFragments('p.Out': FqName@63) = null
-    packageFragments('p.T': FqName@64) = null
-    packageFragments('p._': FqName@65) = null
-    packageFragments('tests': FqName@66) = null
-    packageFragments('tests._checkType': FqName@67) = null
-    packageFragments('tests._checkType.J': FqName@68) = null
-    packageFragments('tests._checkType.MutableList': FqName@69) = null
-    packageFragments('tests._checkType.Nothing': FqName@70) = null
-    packageFragments('tests._checkType.Out': FqName@71) = null
-    packageFragments('tests._checkType.T': FqName@72) = null
-    packageFragments('tests._checkType.Unit': FqName@73) = null
-    packageFragments('tests._checkType._': FqName@74) = null
-    topLevelClasses(JavaClassImpl@75['J']) = LazyJavaClassDescriptor@2['J']
-}
-
-LazyJavaPackageFragment@29['<root>'] {
-    classes('J': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('MutableList': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Nothing': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('_': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('checkType': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('f': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('out': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('tests': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('checkType': Name@81) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('f': Name@82) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('out': Name@83) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@87) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('tests': Name@88) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@40['lang'] {
-    classes('checkType': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('f': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('out': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('checkType': Name@81) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('f': Name@82) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('out': Name@83) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@59['p'] {
-    classes('J': Name@76) = LazyJavaClassDescriptor@2['J'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('MutableList': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Nothing': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('_': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('checkType': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('f': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('out': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('checkType': Name@81) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('f': Name@82) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('out': Name@83) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
deleted file mode 100644
index 8fb150f3575..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
+++ /dev/null
@@ -1,218 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    defaultType = JetTypeImpl@1['J']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('foo': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['foo'] } // through LazyJavaClassMemberScope@3
-    functions('j': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['j'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
-    nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    nestedClasses('j': Name@7) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
-}
-
-LazyJavaClassifierType@17['J'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['J']
-    memberScope = LazyJavaClassMemberScope@3
-    nullable = 'false': Boolean@20
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@21['J'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'true': Boolean@23
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
-}
-
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaClassifierType@27['T'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaTypeParameterImpl@29['T']
-    nullable = 'false': Boolean@20
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-}
-
-LazyJavaClassifierType@31['T'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaTypeParameterImpl@29['T']
-    nullable = 'true': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('J': FqName@36) = null
-    packageFragments('String': FqName@37) = null
-    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    packageFragments('java.lang.J': FqName@42) = null
-    packageFragments('java.lang.String': FqName@43) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.J': FqName@45) = null
-    packageFragments('kotlin.String': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    packageFragments('p': FqName@49) = LazyJavaPackageFragment@50['p']
-    packageFragments('p.J': FqName@51) = null
-    packageFragments('p.String': FqName@52) = null
-    topLevelClasses(JavaClassImpl@53['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('p': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@39['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@50['p'] {
-    classes('J': Name@54) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaTypeParameterDescriptor@67['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-    upperBounds = LinkedHashSet@68[1] { NullableType@69 }
-}
-
-LazyJavaTypeParameterResolver@70 {
-    resolve(JavaTypeParameterImpl@71['T']) = LazyJavaTypeParameterDescriptor@67['T']
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@101 }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
deleted file mode 100644
index edd46e1cc96..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    defaultType = JetTypeImpl@1['J']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('s': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['s'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('s': Name@4) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['J']
-}
-
-LazyJavaClassTypeConstructor@10['J'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['Object'] {
-    classifier = JavaClassImpl@15['Object']
-    typeConstructor = DeserializedClassTypeConstructor@16
-}
-
-LazyJavaClassifierType@17['String'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['String']
-    memberScope = DeserializedClassMemberScope@20
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@23['String'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@19['String']
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('J': FqName@29) = null
-    packageFragments('java': FqName@30) = LazyJavaPackageFragment@31['java']
-    packageFragments('java.lang': FqName@32) = LazyJavaPackageFragment@33['lang']
-    packageFragments('java.lang.J': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = null
-    packageFragments('kotlin.J': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('p': FqName@39) = LazyJavaPackageFragment@40['p']
-    packageFragments('p.J': FqName@41) = null
-    topLevelClasses(JavaClassImpl@42['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('J': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@31['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@40['p'] {
-    classes('J': Name@43) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
deleted file mode 100644
index f54628f03c5..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('_': FqName@8) = null
-    packageFragments('ft': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('java.lang._': FqName@17) = null
-    packageFragments('java.lang.ft': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin._': FqName@23) = null
-    packageFragments('kotlin.ft': FqName@24) = null
-    packageFragments('kotlin.internal': FqName@25) = null
-    packageFragments('kotlin.internal.flexible': FqName@26) = null
-    packageFragments('kotlin.internal.flexible.ft': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('tests': FqName@30) = null
-    packageFragments('tests._checkType': FqName@31) = null
-    packageFragments('tests._checkType.Int': FqName@32) = null
-    packageFragments('tests._checkType.T': FqName@33) = null
-    packageFragments('tests._checkType.Unit': FqName@34) = null
-    packageFragments('tests._checkType._': FqName@35) = null
-    packageFragments('tests._checkType.ft': FqName@36) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('_': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('checkType': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('ft': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('kotlin': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tests': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('checkType': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('kotlin': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('tests': Name@47) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@51) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('checkType': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('checkType': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
deleted file mode 100644
index 6bd1a1eb645..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('_': FqName@8) = null
-    packageFragments('ft': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('java.lang._': FqName@17) = null
-    packageFragments('java.lang.ft': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin._': FqName@23) = null
-    packageFragments('kotlin.ft': FqName@24) = null
-    packageFragments('kotlin.internal': FqName@25) = null
-    packageFragments('kotlin.internal.flexible': FqName@26) = null
-    packageFragments('kotlin.internal.flexible.ft': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('ppp': FqName@30) = null
-    packageFragments('ppp.Int': FqName@31) = null
-    packageFragments('ppp._': FqName@32) = null
-    packageFragments('ppp.ft': FqName@33) = null
-    packageFragments('tests': FqName@34) = null
-    packageFragments('tests._checkType': FqName@35) = null
-    packageFragments('tests._checkType.Int': FqName@36) = null
-    packageFragments('tests._checkType.T': FqName@37) = null
-    packageFragments('tests._checkType.Unit': FqName@38) = null
-    packageFragments('tests._checkType._': FqName@39) = null
-    packageFragments('tests._checkType.ft': FqName@40) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('checkType': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('checkType': Name@47) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
deleted file mode 100644
index 61352db5b6e..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
+++ /dev/null
@@ -1,416 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassDescriptor@4['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@6['JetExpression'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['JetExpression']
-}
-
-LazyJavaClassDescriptor@8['PsiElement'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassDescriptor@10['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassDescriptor@12['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['Type']
-}
-
-LazyJavaClassDescriptor@14['Util'] {
-    enumEntryIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@16
-    functions('getParentOfType': Name@17) = ArrayList@18[1] { JavaMethodDescriptor@19['getParentOfType'] } // through LazyJavaStaticClassScope@20
-    functions('getParentOfType': Name@17) = EmptyList@21[empty] // through LazyJavaClassMemberScope@16
-    functions('on': Name@22) = ArrayList@23[1] { JavaMethodDescriptor@24['on'] } // through LazyJavaStaticClassScope@20
-    functions('on': Name@22) = EmptyList@21[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaStaticClassScope@20
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@16
-    nestedClasses('getParentOfType': Name@17) = null // through LazyJavaClassMemberScope@16
-    nestedClasses('on': Name@22) = null // through LazyJavaClassMemberScope@16
-    properties('getParentOfType': Name@17) = EmptyList@21[empty] // through LazyJavaClassMemberScope@16
-    properties('getParentOfType': Name@17) = EmptyList@21[empty] // through LazyJavaStaticClassScope@20
-    properties('on': Name@22) = EmptyList@21[empty] // through LazyJavaClassMemberScope@16
-    properties('on': Name@22) = EmptyList@21[empty] // through LazyJavaStaticClassScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@28['Util']
-}
-
-LazyJavaClassTypeConstructor@1['AnnotatedElement'] {
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3['Class'] {
-    parameters = ArrayList@31[1] { LazyJavaTypeParameterDescriptor@32['T'] }
-    supertypes = ArrayList@33[4] { LazyJavaClassifierType@34['Serializable'], LazyJavaClassifierType@35['GenericDeclaration'], LazyJavaClassifierType@36['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@5['GenericDeclaration'] {
-    supertypes = ArrayList@37[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@7['JetExpression'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { LazyJavaClassifierType@40['PsiElement'] }
-}
-
-LazyJavaClassTypeConstructor@9['PsiElement'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@11['Serializable'] {
-    supertypes = ArrayList@43[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Type'] {
-    supertypes = ArrayList@44[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassTypeConstructor@28['Util'] {
-    supertypes = ArrayList@45[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassifierType@46['AnnotatedElement'] {
-    classifier = JavaClassImpl@47['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassifierType@48['Class<T>'] {
-    arguments = ArrayList@49[1] { TypeProjectionImpl@50 }
-    classifier = JavaClassImpl@51['Class']
-    memberScope = SubstitutingScope@52
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassifierType@54['Class<T>'] {
-    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
-    classifier = JavaClassImpl@51['Class']
-    memberScope = SubstitutingScope@57
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassifierType@35['GenericDeclaration'] {
-    classifier = JavaClassImpl@59['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@5['GenericDeclaration']
-}
-
-LazyJavaClassifierType@60['JetExpression'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaClassImpl@62['JetExpression']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@7['JetExpression']
-}
-
-LazyJavaClassifierType@63['JetExpression'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@62['JetExpression']
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@7['JetExpression']
-}
-
-LazyJavaClassifierType@65['Object'] {
-    classifier = JavaClassImpl@66['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@68['Object'] {
-    classifier = JavaClassImpl@69['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@70['Object'] {
-    classifier = JavaClassImpl@71['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@72['Object'] {
-    classifier = JavaClassImpl@73['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@74['Object'] {
-    classifier = JavaClassImpl@75['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@76['Object'] {
-    classifier = JavaClassImpl@77['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@78['Object'] {
-    classifier = JavaClassImpl@79['Object']
-    typeConstructor = DeserializedClassTypeConstructor@67
-}
-
-LazyJavaClassifierType@80['PsiElement'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['PsiElement']
-    memberScope = LazyJavaClassMemberScope@83
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassifierType@84['PsiElement'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@86['PsiElement']
-    memberScope = LazyJavaClassMemberScope@83
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassifierType@87['PsiElement'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@86['PsiElement']
-    memberScope = LazyJavaClassMemberScope@83
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassifierType@89['PsiElement'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@82['PsiElement']
-    memberScope = LazyJavaClassMemberScope@83
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassifierType@40['PsiElement'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['PsiElement']
-    nullable = 'false': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@9['PsiElement']
-}
-
-LazyJavaClassifierType@34['Serializable'] {
-    classifier = JavaClassImpl@93['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassifierType@94['T'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'false': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@98['T'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['T']
-    nullable = 'false': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@101['T'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['T']
-    nullable = 'false': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@104['T'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@100['T']
-    nullable = 'true': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@106['T'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@96['T']
-    nullable = 'true': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@108['T'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@103['T']
-    nullable = 'true': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@36['Type'] {
-    classifier = JavaClassImpl@110['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@13['Type']
-}
-
-LazyJavaPackageFragmentProvider@111 {
-    packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
-    packageFragments('Class': FqName@114) = null
-    packageFragments('JetExpression': FqName@115) = null
-    packageFragments('T': FqName@116) = null
-    packageFragments('Util': FqName@117) = null
-    packageFragments('java': FqName@118) = LazyJavaPackageFragment@119['java']
-    packageFragments('java.io': FqName@120) = LazyJavaPackageFragment@121['io']
-    packageFragments('java.lang': FqName@122) = LazyJavaPackageFragment@123['lang']
-    packageFragments('java.lang.Class': FqName@124) = null
-    packageFragments('java.lang.JetExpression': FqName@125) = null
-    packageFragments('java.lang.T': FqName@126) = null
-    packageFragments('java.lang.Util': FqName@127) = null
-    packageFragments('java.lang.reflect': FqName@128) = LazyJavaPackageFragment@129['reflect']
-    packageFragments('kotlin': FqName@130) = null
-    packageFragments('kotlin.Class': FqName@131) = null
-    packageFragments('kotlin.JetExpression': FqName@132) = null
-    packageFragments('kotlin.T': FqName@133) = null
-    packageFragments('kotlin.Util': FqName@134) = null
-    packageFragments('kotlin.io': FqName@135) = null
-    packageFragments('kotlin.jvm': FqName@136) = null
-    packageFragments('p': FqName@137) = LazyJavaPackageFragment@138['p']
-    packageFragments('p.Class': FqName@139) = null
-    packageFragments('p.JetExpression': FqName@140) = null
-    packageFragments('p.T': FqName@141) = null
-    packageFragments('p.Util': FqName@142) = null
-    topLevelClasses(JavaClassImpl@47['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@143['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@59['GenericDeclaration']) = LazyJavaClassDescriptor@4['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@144['JetExpression']) = LazyJavaClassDescriptor@6['JetExpression']
-    topLevelClasses(JavaClassImpl@86['PsiElement']) = LazyJavaClassDescriptor@8['PsiElement']
-    topLevelClasses(JavaClassImpl@93['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
-    topLevelClasses(JavaClassImpl@110['Type']) = LazyJavaClassDescriptor@12['Type']
-    topLevelClasses(JavaClassImpl@145['Util']) = LazyJavaClassDescriptor@14['Util']
-}
-
-LazyJavaPackageFragment@113['<root>'] {
-    classes('Class': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('JetExpression': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Util': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('javaClass': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('p': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('javaClass': Name@150) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('p': Name@153) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@147
-}
-
-LazyJavaPackageFragment@119['java'] {
-    classes('lang': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('lang': Name@157) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
-}
-
-LazyJavaPackageFragment@123['lang'] {
-    classes('Class': Name@146) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('javaClass': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('javaClass': Name@150) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
-}
-
-LazyJavaPackageFragment@138['p'] {
-    classes('Class': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('JetExpression': Name@148) = LazyJavaClassDescriptor@6['JetExpression'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('Util': Name@149) = LazyJavaClassDescriptor@14['Util'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('javaClass': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('javaClass': Name@150) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@161
-}
-
-LazyJavaTypeParameterDescriptor@163['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@164[1] { DelegatingFlexibleType@165 }
-}
-
-LazyJavaTypeParameterDescriptor@32['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@166
-    upperBounds = LinkedHashSet@167[1] { NullableType@168 }
-}
-
-LazyJavaTypeParameterResolver@169 {
-    resolve(JavaTypeParameterImpl@170['T']) = LazyJavaTypeParameterDescriptor@163['T']
-}
-
-LazyJavaTypeParameterResolver@171 {
-    resolve(JavaTypeParameterImpl@172['T']) = LazyJavaTypeParameterDescriptor@32['T']
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
deleted file mode 100644
index 37d318afe7d..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
+++ /dev/null
@@ -1,329 +0,0 @@
-LazyJavaClassDescriptor@0['Base'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Base']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassDescriptor@10['HS'] {
-    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
-    defaultType = JetTypeImpl@14['HS<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@15['HS']
-}
-
-LazyJavaClassDescriptor@16['HashSet'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaClassTypeConstructor@1['Base'] {
-    parameters = ArrayList@17[1] { LazyJavaTypeParameterDescriptor@18['T'] }
-    supertypes = ArrayList@19[1] { JetTypeImpl@20['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@15['HS'] {
-    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['T'] }
-    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Base<T>'] }
-}
-
-LazyJavaClassifierType@27['Base<T>'] {
-    arguments = ArrayList@28[1] { TypeProjectionImpl@29 }
-    classifier = JavaClassImpl@30['Base']
-    memberScope = SubstitutingScope@31
-    nullable = 'false': Boolean@32
-    typeConstructor = LazyJavaClassTypeConstructor@1['Base']
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['String']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@46['String'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@49['String'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@42['String']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@51['String'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@53['T'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['T']
-    nullable = 'false': Boolean@32
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@57['T'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@55['T']
-    nullable = 'true': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-}
-
-LazyJavaClassifierType@59['Throwable'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@61['Throwable']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Throwable'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@65['Throwable']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@66['Throwable'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['Throwable']
-    nullable = 'false': Boolean@32
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@69['Throwable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@65['Throwable']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@71['Throwable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@68['Throwable']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@73['Throwable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@61['Throwable']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@23['Throwable'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaPackageFragmentProvider@77 {
-    packageFragments('<root>': FqName@78) = LazyJavaPackageFragment@79['<root>']
-    packageFragments('Base': FqName@80) = null
-    packageFragments('C': FqName@81) = null
-    packageFragments('HS': FqName@82) = null
-    packageFragments('Int': FqName@83) = null
-    packageFragments('T': FqName@84) = null
-    packageFragments('foo': FqName@85) = LazyJavaPackageFragment@86['foo']
-    packageFragments('foo.Base': FqName@87) = null
-    packageFragments('foo.C': FqName@88) = null
-    packageFragments('foo.HS': FqName@89) = null
-    packageFragments('foo.Int': FqName@90) = null
-    packageFragments('foo.T': FqName@91) = null
-    packageFragments('java': FqName@92) = LazyJavaPackageFragment@93['java']
-    packageFragments('java.lang': FqName@94) = LazyJavaPackageFragment@95['lang']
-    packageFragments('java.lang.Base': FqName@96) = null
-    packageFragments('java.lang.C': FqName@97) = null
-    packageFragments('java.lang.HS': FqName@98) = null
-    packageFragments('java.lang.Int': FqName@99) = null
-    packageFragments('java.lang.T': FqName@100) = null
-    packageFragments('java.util': FqName@101) = LazyJavaPackageFragment@102['util']
-    packageFragments('java.util.HashSet': FqName@103) = null
-    packageFragments('kotlin': FqName@104) = null
-    packageFragments('kotlin.Base': FqName@105) = null
-    packageFragments('kotlin.C': FqName@106) = null
-    packageFragments('kotlin.HS': FqName@107) = null
-    packageFragments('kotlin.Int': FqName@108) = null
-    packageFragments('kotlin.T': FqName@109) = null
-    packageFragments('kotlin.io': FqName@110) = null
-    packageFragments('kotlin.jvm': FqName@111) = null
-    topLevelClasses(JavaClassImpl@112['Base']) = LazyJavaClassDescriptor@0['Base']
-    topLevelClasses(JavaClassImpl@113['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@114['HS']) = LazyJavaClassDescriptor@10['HS']
-    topLevelClasses(JavaClassImpl@115['HashSet']) = LazyJavaClassDescriptor@16['HashSet']
-}
-
-LazyJavaPackageFragment@79['<root>'] {
-    classes('Base': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Exception': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('HS': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('HashSet': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Int': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('convert': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('foo': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('java': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('Exception': Name@118) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('HS': Name@127) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('convert': Name@122) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('foo': Name@128) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('java': Name@129) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@117
-}
-
-LazyJavaPackageFragment@86['foo'] {
-    classes('Base': Name@116) = LazyJavaClassDescriptor@0['Base'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Exception': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('HS': Name@119) = LazyJavaClassDescriptor@10['HS'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Int': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('convert': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('Exception': Name@118) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('HS': Name@127) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('convert': Name@122) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaPackageFragment@93['java'] {
-    classes('lang': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('util': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('lang': Name@136) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('util': Name@137) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaPackageFragment@95['lang'] {
-    classes('Exception': Name@118) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('HS': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('convert': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('Exception': Name@118) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('HS': Name@127) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('convert': Name@122) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@139
-}
-
-LazyJavaPackageFragment@102['util'] {
-    classes('HashSet': Name@141) = LazyJavaClassDescriptor@16['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('HashSet': Name@143) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaTypeParameterDescriptor@25['T'] {
-    defaultType = JetTypeImpl@145['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@146[1] { NullableType@147 }
-}
-
-LazyJavaTypeParameterDescriptor@18['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@148
-}
-
-LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@25['T']
-}
-
-LazyJavaTypeParameterResolver@151 {
-    resolve(JavaTypeParameterImpl@152['T']) = LazyJavaTypeParameterDescriptor@18['T']
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[4] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-}
-
-null {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@182[5] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-    <name not found> = EmptyList@126[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
deleted file mode 100644
index 1ca2f1cee84..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
+++ /dev/null
@@ -1,322 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassDescriptor@2['B'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassDescriptor@4['J'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functionTypeForSamInterface = null
-    functions('foo': Name@7) = ArrayList@8[2] { JavaMethodDescriptor@9['foo'], JavaMethodDescriptor@10['foo'] } // through LazyJavaStaticClassScope@11
-    functions('foo': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    functions('getInteger': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['getInteger'] } // through LazyJavaStaticClassScope@11
-    functions('getInteger': Name@13) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@6
-    nestedClasses('A': Name@19) = LazyJavaClassDescriptor@0['A'] // through LazyJavaClassMemberScope@6
-    nestedClasses('B': Name@20) = LazyJavaClassDescriptor@2['B'] // through LazyJavaClassMemberScope@6
-    nestedClasses('Int': Name@21) = null // through LazyJavaClassMemberScope@6
-    nestedClasses('J': Name@22) = null // through LazyJavaClassMemberScope@6
-    nestedClasses('foo': Name@7) = null // through LazyJavaClassMemberScope@6
-    nestedClasses('getInteger': Name@13) = null // through LazyJavaClassMemberScope@6
-    properties('J': Name@23) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    properties('J': Name@23) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
-    properties('foo': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    properties('foo': Name@7) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
-    properties('getInteger': Name@13) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    properties('getInteger': Name@13) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@24['J']
-}
-
-LazyJavaClassTypeConstructor@1['A'] {
-    parameters = ArrayList@25[empty]
-    supertypes = ArrayList@26[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3['B'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassTypeConstructor@24['J'] {
-    supertypes = ArrayList@30[1] { JetTypeImpl@27['Any'] }
-}
-
-LazyJavaClassifierType@31['A'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['A']
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@35['A'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@33['A']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@1['A']
-}
-
-LazyJavaClassifierType@38['B'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['B']
-    nullable = 'false': Boolean@34
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassifierType@41['B'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['B']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@3['B']
-}
-
-LazyJavaClassifierType@43['Integer'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['Integer']
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@47['Integer'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Integer']
-    nullable = 'false': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@50['Integer'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@49['Integer']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@52['Integer'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@45['Integer']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@46
-}
-
-LazyJavaClassifierType@54['Object'] {
-    classifier = JavaClassImpl@55['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@57['Object'] {
-    classifier = JavaClassImpl@58['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaClassifierType@59['Object'] {
-    classifier = JavaClassImpl@60['Object']
-    typeConstructor = DeserializedClassTypeConstructor@56
-}
-
-LazyJavaPackageFragmentProvider@61 {
-    packageFragments('<root>': FqName@62) = LazyJavaPackageFragment@63['<root>']
-    packageFragments('C': FqName@64) = null
-    packageFragments('Int': FqName@65) = null
-    packageFragments('J': FqName@66) = null
-    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
-    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
-    packageFragments('java.lang.C': FqName@71) = null
-    packageFragments('java.lang.Int': FqName@72) = null
-    packageFragments('java.lang.J': FqName@73) = null
-    packageFragments('kotlin': FqName@74) = null
-    packageFragments('kotlin.C': FqName@75) = null
-    packageFragments('kotlin.Int': FqName@76) = null
-    packageFragments('kotlin.J': FqName@77) = null
-    packageFragments('kotlin.io': FqName@78) = null
-    packageFragments('kotlin.jvm': FqName@79) = null
-    packageFragments('p': FqName@80) = LazyJavaPackageFragment@81['p']
-    packageFragments('p.C': FqName@82) = null
-    packageFragments('p.Int': FqName@83) = null
-    packageFragments('p.J': FqName@84) = null
-    topLevelClasses(JavaClassImpl@85['J']) = LazyJavaClassDescriptor@4['J']
-}
-
-LazyJavaPackageFragment@63['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('J': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('p': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('p': Name@89) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@68['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@70['lang'] {
-    classes('foo': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@81['p'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('J': Name@98) = LazyJavaClassDescriptor@4['J'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('J': Name@99) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[3] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[3] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-null {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@157[2] { ResolutionCandidate@121, ResolutionCandidate@122 }
-    <name not found> = ArrayList@158[2] { ResolutionCandidate@125, ResolutionCandidate@126 }
-    <name not found> = ArrayList@159[3] { ResolutionCandidate@139, ResolutionCandidate@140, ResolutionCandidate@141 }
-    <name not found> = ArrayList@160[3] { ResolutionCandidate@129, ResolutionCandidate@130, ResolutionCandidate@131 }
-    <name not found> = ArrayList@161[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
-    <name not found> = ArrayList@162[3] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
deleted file mode 100644
index 2729f19220e..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
+++ /dev/null
@@ -1,257 +0,0 @@
-LazyJavaClassDescriptor@0['MultiMap'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['MultiMap<2>']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('entrySet': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['entrySet'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('entrySet': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['MultiMap']
-}
-
-LazyJavaClassTypeConstructor@12['MultiMap'] {
-    parameters = ArrayList@13[2] { LazyJavaTypeParameterDescriptor@14['K'], LazyJavaTypeParameterDescriptor@15['V'] }
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@18['Collection<V>'] {
-    arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
-    classifier = JavaClassImpl@21['Collection']
-    memberScope = SubstitutingScope@22
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['Collection<V>'] {
-    arguments = ArrayList@26[1] { TypeProjectionImpl@27 }
-    classifier = JavaClassImpl@28['Collection']
-    memberScope = SubstitutingScope@29
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@30['Collection<V>'] {
-    arguments = ArrayList@31[1] { TypeProjectionImpl@32 }
-    classifier = JavaClassImpl@21['Collection']
-    memberScope = SubstitutingScope@33
-    nullable = 'true': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Collection<V>'] {
-    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@28['Collection']
-    memberScope = SubstitutingScope@39
-    nullable = 'true': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
-}
-
-LazyJavaClassifierType@43['Set<Collection<V>>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['Set']
-    memberScope = SubstitutingScope@47
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@48
-}
-
-LazyJavaClassifierType@49['Set<Collection<V>>'] {
-    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
-    classifier = JavaClassImpl@46['Set']
-    memberScope = SubstitutingScope@52
-    nullable = 'true': Boolean@34
-    typeConstructor = DeserializedClassTypeConstructor@53
-}
-
-LazyJavaClassifierType@54['V'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['V']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@58['V'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['V']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@61['V'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['V']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@64['V'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['V']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@67['V'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['V']
-    nullable = 'true': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@69['V'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@56['V']
-    nullable = 'true': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@71['V'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@60['V']
-    nullable = 'true': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@73['V'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@63['V']
-    nullable = 'true': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaPackageFragmentProvider@75 {
-    packageFragments('<root>': FqName@76) = LazyJavaPackageFragment@77['<root>']
-    packageFragments('Int': FqName@78) = null
-    packageFragments('String': FqName@79) = null
-    packageFragments('java': FqName@80) = LazyJavaPackageFragment@81['java']
-    packageFragments('java.lang': FqName@82) = LazyJavaPackageFragment@83['lang']
-    packageFragments('java.lang.Int': FqName@84) = null
-    packageFragments('java.lang.String': FqName@85) = null
-    packageFragments('kotlin': FqName@86) = null
-    packageFragments('kotlin.Int': FqName@87) = null
-    packageFragments('kotlin.String': FqName@88) = null
-    packageFragments('kotlin.io': FqName@89) = null
-    packageFragments('kotlin.jvm': FqName@90) = null
-    packageFragments('p': FqName@91) = LazyJavaPackageFragment@92['p']
-    packageFragments('p.Int': FqName@93) = null
-    packageFragments('p.String': FqName@94) = null
-    topLevelClasses(JavaClassImpl@95['MultiMap']) = LazyJavaClassDescriptor@0['MultiMap']
-}
-
-LazyJavaPackageFragment@77['<root>'] {
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('MultiMap': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('String': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('p': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('p': Name@103) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@81['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@83['lang'] {
-    classes('MultiMap': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaPackageFragment@92['p'] {
-    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('MultiMap': Name@98) = LazyJavaClassDescriptor@0['MultiMap'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
-}
-
-LazyJavaTypeParameterDescriptor@14['K'] {
-    defaultType = JetTypeImpl@113['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-    upperBounds = LinkedHashSet@115[1] { NullableType@116 }
-}
-
-LazyJavaTypeParameterDescriptor@15['V'] {
-    defaultType = JetTypeImpl@117['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
-}
-
-LazyJavaTypeParameterResolver@120 {
-    resolve(JavaTypeParameterImpl@121['K']) = LazyJavaTypeParameterDescriptor@14['K']
-    resolve(JavaTypeParameterImpl@122['V']) = LazyJavaTypeParameterDescriptor@15['V']
-}
-
-LazyJavaTypeParameterResolver@123 {
-    resolve(JavaTypeParameterImpl@60['V']) = null
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-null {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
deleted file mode 100644
index ea95425cc09..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
+++ /dev/null
@@ -1,261 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    defaultType = JetTypeImpl@1['J<1>']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('foo': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['foo'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['J']
-}
-
-LazyJavaClassDescriptor@11['Ref'] {
-    enumEntryIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@13
-    functionTypeForSamInterface = null
-    functions('create': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['create'] } // through LazyJavaStaticClassScope@17
-    functions('create': Name@14) = EmptyList@18[empty] // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaStaticClassScope@17
-    nestedClassIndex = LinkedHashMap@21 // through LazyJavaClassMemberScope@13
-    nestedClasses('create': Name@14) = null // through LazyJavaClassMemberScope@13
-    properties('create': Name@14) = EmptyList@18[empty] // through LazyJavaClassMemberScope@13
-    properties('create': Name@14) = EmptyList@18[empty] // through LazyJavaStaticClassScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
-}
-
-LazyJavaClassTypeConstructor@10['J'] {
-    parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['T'] }
-    supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
-}
-
-LazyJavaClassTypeConstructor@22['Ref'] {
-    parameters = ArrayList@27[1] { LazyJavaTypeParameterDescriptor@28['T'] }
-    supertypes = ArrayList@29[1] { JetTypeImpl@26['Any'] }
-}
-
-LazyJavaClassifierType@30['Object'] {
-    classifier = JavaClassImpl@31['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@35['Ref<T>'] {
-    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    classifier = JavaClassImpl@38['Ref']
-    memberScope = SubstitutingScope@39
-    nullable = 'false': Boolean@40
-    typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
-}
-
-LazyJavaClassifierType@41['Ref<T>'] {
-    arguments = ArrayList@42[1] { TypeProjectionImpl@43 }
-    classifier = JavaClassImpl@38['Ref']
-    memberScope = SubstitutingScope@44
-    nullable = 'true': Boolean@45
-    typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
-}
-
-LazyJavaClassifierType@46['Ref<T[]>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@49['Ref']
-    memberScope = SubstitutingScope@50
-    nullable = 'false': Boolean@40
-    typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
-}
-
-LazyJavaClassifierType@51['Ref<T[]>'] {
-    arguments = ArrayList@52[1] { TypeProjectionImpl@53 }
-    classifier = JavaClassImpl@49['Ref']
-    memberScope = SubstitutingScope@54
-    nullable = 'true': Boolean@45
-    typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
-}
-
-LazyJavaClassifierType@55['T'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@59['T'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@63['T'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@65['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@66['T'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@69['T'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@57['T']
-    nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaClassifierType@71['T'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@61['T']
-    nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@73['T'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@68['T']
-    nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-LazyJavaClassifierType@75['T'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@65['T']
-    nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-LazyJavaPackageFragmentProvider@77 {
-    packageFragments('<root>': FqName@78) = LazyJavaPackageFragment@79['<root>']
-    packageFragments('Array': FqName@80) = null
-    packageFragments('J': FqName@81) = null
-    packageFragments('Ref': FqName@82) = null
-    packageFragments('String': FqName@83) = null
-    packageFragments('java': FqName@84) = LazyJavaPackageFragment@85['java']
-    packageFragments('java.lang': FqName@86) = LazyJavaPackageFragment@87['lang']
-    packageFragments('java.lang.Array': FqName@88) = null
-    packageFragments('java.lang.J': FqName@89) = null
-    packageFragments('java.lang.Ref': FqName@90) = null
-    packageFragments('java.lang.String': FqName@91) = null
-    packageFragments('kotlin': FqName@92) = null
-    packageFragments('kotlin.Array': FqName@93) = null
-    packageFragments('kotlin.J': FqName@94) = null
-    packageFragments('kotlin.Ref': FqName@95) = null
-    packageFragments('kotlin.String': FqName@96) = null
-    packageFragments('kotlin.io': FqName@97) = null
-    packageFragments('kotlin.jvm': FqName@98) = null
-    packageFragments('p': FqName@99) = LazyJavaPackageFragment@100['p']
-    packageFragments('p.Array': FqName@101) = null
-    packageFragments('p.J': FqName@102) = null
-    packageFragments('p.Ref': FqName@103) = null
-    packageFragments('p.String': FqName@104) = null
-    topLevelClasses(JavaClassImpl@105['J']) = LazyJavaClassDescriptor@0['J']
-    topLevelClasses(JavaClassImpl@106['Ref']) = LazyJavaClassDescriptor@11['Ref']
-}
-
-LazyJavaPackageFragment@79['<root>'] {
-    classes('Array': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('J': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Ref': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('p': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('p': Name@114) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@108
-}
-
-LazyJavaPackageFragment@85['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@118) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@117
-}
-
-LazyJavaPackageFragment@87['lang'] {
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@120
-}
-
-LazyJavaPackageFragment@100['p'] {
-    classes('Array': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('J': Name@109) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Ref': Name@110) = LazyJavaClassDescriptor@11['Ref'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaTypeParameterDescriptor@24['T'] {
-    defaultType = JetTypeImpl@122['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-    upperBounds = LinkedHashSet@123[1] { NullableType@124 }
-}
-
-LazyJavaTypeParameterDescriptor@125['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-    upperBounds = LinkedHashSet@126[1] { NullableType@127 }
-}
-
-LazyJavaTypeParameterDescriptor@28['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@128
-}
-
-LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@28['T']
-}
-
-LazyJavaTypeParameterResolver@131 {
-    resolve(JavaTypeParameterImpl@132['T']) = LazyJavaTypeParameterDescriptor@125['T']
-}
-
-LazyJavaTypeParameterResolver@133 {
-    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@24['T']
-}
-
-LazyJavaTypeParameterResolver@135 {
-    resolve(JavaTypeParameterImpl@61['T']) = null
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
deleted file mode 100644
index 4f3f4e74a56..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('_int': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['_int'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('_int': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('_int': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
-}
-
-LazyJavaClassTypeConstructor@14['J'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@18['Object'] {
-    classifier = JavaClassImpl@19['Object']
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaPackageFragmentProvider@21 {
-    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-    packageFragments('p': FqName@31) = LazyJavaPackageFragment@32['p']
-    topLevelClasses(JavaClassImpl@33['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@23['<root>'] {
-    classes('J': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('p': Name@38) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@27['lang'] {
-    classes('J': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@32['p'] {
-    classes('J': Name@34) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
deleted file mode 100644
index adca4ccb6cb..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('intArr': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['intArr'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('intArr': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('IntArray': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.IntArray': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = null
-    packageFragments('kotlin.IntArray': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-    packageFragments('p': FqName@32) = LazyJavaPackageFragment@33['p']
-    packageFragments('p.IntArray': FqName@34) = null
-    topLevelClasses(JavaClassImpl@35['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@21['<root>'] {
-    classes('IntArray': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('J': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('p': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('J': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@33['p'] {
-    classes('IntArray': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('J': Name@38) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
deleted file mode 100644
index 6124dbab26f..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
+++ /dev/null
@@ -1,309 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassDescriptor@2['HashMap'] {
-    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['HashMap']
-}
-
-LazyJavaClassDescriptor@10['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractMap'] {
-    parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@9['HashMap'] {
-    parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
-    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['Serializable'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractMap<K, V>'] {
-    arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassifierType@23['Cloneable'] {
-    classifier = JavaClassImpl@30['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['K'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@37['K'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@41['K'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@43['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@44['K'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@47['K'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@46['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@52['K'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@43['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@67
-    nullable = 'true': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@16['Map<K, V>'] {
-    arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@22['Map<K, V>'] {
-    classifier = JavaClassImpl@73['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@74['Object'] {
-    classifier = JavaClassImpl@75['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    classifier = JavaClassImpl@80['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassifierType@81['V'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['V'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@88['V'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@91['V'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaClassifierType@95['V'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@97['V'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@93['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaClassifierType@99['V'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@101['V'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@90['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('Any': FqName@106) = null
-    packageFragments('Map': FqName@107) = null
-    packageFragments('java': FqName@108) = LazyJavaPackageFragment@109['java']
-    packageFragments('java.io': FqName@110) = LazyJavaPackageFragment@111['io']
-    packageFragments('java.lang': FqName@112) = LazyJavaPackageFragment@113['lang']
-    packageFragments('java.lang.Any': FqName@114) = null
-    packageFragments('java.lang.Map': FqName@115) = null
-    packageFragments('java.util': FqName@116) = LazyJavaPackageFragment@117['util']
-    packageFragments('java.util.Any': FqName@118) = null
-    packageFragments('java.util.Map': FqName@119) = null
-    packageFragments('kotlin': FqName@120) = null
-    packageFragments('kotlin.Any': FqName@121) = null
-    packageFragments('kotlin.Map': FqName@122) = null
-    packageFragments('kotlin.io': FqName@123) = null
-    packageFragments('kotlin.jvm': FqName@124) = null
-    topLevelClasses(JavaClassImpl@29['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@125['HashMap']) = LazyJavaClassDescriptor@2['HashMap']
-    topLevelClasses(JavaClassImpl@126['Map']) = LazyJavaClassDescriptor@127['Map']
-    topLevelClasses(JavaClassImpl@80['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
-}
-
-LazyJavaPackageFragment@105['<root>'] {
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('HashMap': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('Map': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('java': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    classes('takeJ': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@129
-    deserializedPackageScope = Empty@134 // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('HashMap': Name@130) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('java': Name@136) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    functions('takeJ': Name@133) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@129
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@129
-}
-
-LazyJavaPackageFragment@109['java'] {
-    classes('lang': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('util': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@134 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('lang': Name@141) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('util': Name@142) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@143 // through LazyPackageFragmentScopeForJavaPackage@139
-}
-
-LazyJavaPackageFragment@113['lang'] {
-    classes('HashMap': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('takeJ': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    deserializedPackageScope = Empty@134 // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('HashMap': Name@130) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('takeJ': Name@133) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@144
-}
-
-LazyJavaPackageFragment@117['util'] {
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('HashMap': Name@130) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('Map': Name@131) = LazyJavaClassDescriptor@127['Map'] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('takeJ': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@134 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('HashMap': Name@130) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('takeJ': Name@133) = EmptyList@135[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
-}
-
-LazyJavaTypeParameterDescriptor@18['K'] {
-    defaultType = JetTypeImpl@148['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@149[1] { NullableType@150 }
-}
-
-LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaTypeParameterDescriptor@19['V'] {
-    defaultType = JetTypeImpl@151['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@152[1] { NullableType@153 }
-}
-
-LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaTypeParameterResolver@154 {
-    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@93['V']) = LazyJavaTypeParameterDescriptor@14['V']
-}
-
-LazyJavaTypeParameterResolver@155 {
-    resolve(JavaTypeParameterImpl@156['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@157['V']) = LazyJavaTypeParameterDescriptor@19['V']
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
-}
-
-null {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
-    <name not found> = EmptyList@135[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
deleted file mode 100644
index d3ff3a48690..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
+++ /dev/null
@@ -1,363 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassDescriptor@6['J'] {
-    defaultType = JetTypeImpl@7['J']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@9
-    functions('list': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['list'] } // through LazyJavaClassMemberScope@9
-    functions('takeList': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['takeList'] } // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@9
-    nestedClasses('list': Name@10) = null // through LazyJavaClassMemberScope@9
-    nestedClasses('takeList': Name@13) = null // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['J']
-}
-
-LazyJavaClassDescriptor@20['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
-}
-
-LazyJavaClassDescriptor@22['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
-    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
-    supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['ArrayList'] {
-    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
-    supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@19['J'] {
-    parameters = ArrayList@39[empty]
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@21['RandomAccess'] {
-    supertypes = ArrayList@42[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@23['Serializable'] {
-    supertypes = ArrayList@43[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@31['AbstractCollection<E>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@46['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@36['AbstractList<E>'] {
-    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
-    classifier = JavaClassImpl@49['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@50['ArrayList<String>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@53['ArrayList']
-    nullable = 'false': Boolean@54
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassifierType@55['ArrayList<String>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@58['ArrayList']
-    nullable = 'false': Boolean@54
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassifierType@59['ArrayList<String>'] {
-    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@58['ArrayList']
-    nullable = 'true': Boolean@62
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassifierType@63['ArrayList<String>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@53['ArrayList']
-    nullable = 'true': Boolean@62
-    typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
-}
-
-LazyJavaClassifierType@66['Cloneable'] {
-    classifier = JavaClassImpl@67['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@27['Collection<E>'] {
-    arguments = ArrayList@69[1] { TypeProjectionImpl@70 }
-    classifier = JavaClassImpl@71['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@72
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'false': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@81['E'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'false': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@87['E'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaClassifierType@89['E'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@83['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@37['List<E>'] {
-    classifier = JavaClassImpl@91['List']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@32['List<E>'] {
-    classifier = JavaClassImpl@93['List']
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@97['Object'] {
-    classifier = JavaClassImpl@98['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@99['Object'] {
-    classifier = JavaClassImpl@100['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@101['Object'] {
-    classifier = JavaClassImpl@102['Object']
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@38['RandomAccess'] {
-    classifier = JavaClassImpl@103['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
-}
-
-LazyJavaClassifierType@104['Serializable'] {
-    classifier = JavaClassImpl@105['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
-}
-
-LazyJavaClassifierType@106['String'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['String']
-    nullable = 'false': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@110['String'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['String']
-    nullable = 'false': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@113['String'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['String']
-    nullable = 'false': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@116['String'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['String']
-    nullable = 'false': Boolean@54
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@119['String'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@115['String']
-    nullable = 'true': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@121['String'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@108['String']
-    nullable = 'true': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@123['String'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@118['String']
-    nullable = 'true': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@125['String'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@112['String']
-    nullable = 'true': Boolean@62
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaPackageFragmentProvider@127 {
-    packageFragments('<root>': FqName@128) = LazyJavaPackageFragment@129['<root>']
-    packageFragments('J': FqName@130) = null
-    packageFragments('java': FqName@131) = LazyJavaPackageFragment@132['java']
-    packageFragments('java.io': FqName@133) = LazyJavaPackageFragment@134['io']
-    packageFragments('java.lang': FqName@135) = LazyJavaPackageFragment@136['lang']
-    packageFragments('java.lang.J': FqName@137) = null
-    packageFragments('java.util': FqName@138) = LazyJavaPackageFragment@139['util']
-    packageFragments('kotlin': FqName@140) = null
-    packageFragments('kotlin.J': FqName@141) = null
-    packageFragments('kotlin.io': FqName@142) = null
-    packageFragments('kotlin.jvm': FqName@143) = null
-    packageFragments('p': FqName@144) = LazyJavaPackageFragment@145['p']
-    packageFragments('p.J': FqName@146) = null
-    topLevelClasses(JavaClassImpl@46['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@49['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@53['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@147['J']) = LazyJavaClassDescriptor@6['J']
-    topLevelClasses(JavaClassImpl@103['RandomAccess']) = LazyJavaClassDescriptor@20['RandomAccess']
-    topLevelClasses(JavaClassImpl@105['Serializable']) = LazyJavaClassDescriptor@22['Serializable']
-}
-
-LazyJavaPackageFragment@129['<root>'] {
-    classes('J': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('p': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('p': Name@152) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@149
-}
-
-LazyJavaPackageFragment@132['java'] {
-    classes('lang': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('lang': Name@157) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
-}
-
-LazyJavaPackageFragment@145['p'] {
-    classes('J': Name@148) = LazyJavaClassDescriptor@6['J'] // through LazyPackageFragmentScopeForJavaPackage@159
-}
-
-LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
-}
-
-LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaTypeParameterResolver@160 {
-    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@29['E']
-}
-
-LazyJavaTypeParameterResolver@161 {
-    resolve(JavaTypeParameterImpl@162['E']) = LazyJavaTypeParameterDescriptor@34['E']
-}
-
-LazyJavaTypeParameterResolver@163 {
-    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@25['E']
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-null {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@172 }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
deleted file mode 100644
index 830ccd3bf5c..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
+++ /dev/null
@@ -1,113 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('j': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['j'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('j': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['J'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['J']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassifierType@20['J'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@18['J']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassifierType@23['Object'] {
-    classifier = JavaClassImpl@24['Object']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('J': FqName@29) = null
-    packageFragments('java': FqName@30) = LazyJavaPackageFragment@31['java']
-    packageFragments('java.lang': FqName@32) = LazyJavaPackageFragment@33['lang']
-    packageFragments('java.lang.J': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = null
-    packageFragments('kotlin.J': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('p': FqName@39) = LazyJavaPackageFragment@40['p']
-    packageFragments('p.J': FqName@41) = null
-    topLevelClasses(JavaClassImpl@42['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('J': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@31['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@33['lang'] {
-    classes('J': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@40['p'] {
-    classes('J': Name@43) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
deleted file mode 100644
index 00089dbf658..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-LazyJavaClassDescriptor@0['HashMap'] {
-    constructors = ArrayList@1[4] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['HashMap']
-}
-
-LazyJavaClassTypeConstructor@7['HashMap'] {
-    parameters = ArrayList@8[2] { LazyJavaTypeParameterDescriptor@9['K'], LazyJavaTypeParameterDescriptor@10['V'] }
-}
-
-LazyJavaClassifierType@11['K'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaTypeParameterImpl@13['K']
-    nullable = 'false': Boolean@14
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-}
-
-LazyJavaClassifierType@16['K'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaTypeParameterImpl@18['K']
-    nullable = 'false': Boolean@14
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-}
-
-LazyJavaClassifierType@19['K'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaTypeParameterImpl@18['K']
-    nullable = 'true': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-}
-
-LazyJavaClassifierType@22['K'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaTypeParameterImpl@13['K']
-    nullable = 'true': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-}
-
-LazyJavaClassifierType@24['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@25[2] { TypeProjectionImpl@26, TypeProjectionImpl@27 }
-    classifier = JavaClassImpl@28['Map']
-    memberScope = SubstitutingScope@29
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@31['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@32[2] { TypeProjectionImpl@33, TypeProjectionImpl@34 }
-    classifier = JavaClassImpl@28['Map']
-    memberScope = SubstitutingScope@35
-    nullable = 'true': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['V'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['V']
-    nullable = 'false': Boolean@14
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@41['V'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@43['V']
-    nullable = 'false': Boolean@14
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@44['V'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@39['V']
-    nullable = 'true': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@46['V'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaTypeParameterImpl@43['V']
-    nullable = 'true': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaPackageFragmentProvider@48 {
-    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('Any': FqName@51) = null
-    packageFragments('Map': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Any': FqName@57) = null
-    packageFragments('java.lang.Map': FqName@58) = null
-    packageFragments('java.util': FqName@59) = LazyJavaPackageFragment@60['util']
-    packageFragments('java.util.Any': FqName@61) = null
-    packageFragments('java.util.Map': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = null
-    packageFragments('kotlin.Any': FqName@64) = null
-    packageFragments('kotlin.Map': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['HashMap']) = LazyJavaClassDescriptor@0['HashMap']
-    topLevelClasses(JavaClassImpl@69['Map']) = LazyJavaClassDescriptor@70['Map']
-}
-
-LazyJavaPackageFragment@50['<root>'] {
-    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('HashMap': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Map': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('java': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('HashMap': Name@73) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('java': Name@78) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('util': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@83) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('util': Name@84) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('HashMap': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('HashMap': Name@73) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@60['util'] {
-    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('HashMap': Name@73) = LazyJavaClassDescriptor@0['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Map': Name@74) = LazyJavaClassDescriptor@70['Map'] // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('HashMap': Name@73) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaTypeParameterDescriptor@9['K'] {
-    defaultType = JetTypeImpl@90['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-    upperBounds = LinkedHashSet@91[1] { NullableType@92 }
-}
-
-LazyJavaTypeParameterDescriptor@10['V'] {
-    defaultType = JetTypeImpl@93['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    upperBounds = LinkedHashSet@94[1] { NullableType@95 }
-}
-
-LazyJavaTypeParameterResolver@96 {
-    resolve(JavaTypeParameterImpl@97['K']) = LazyJavaTypeParameterDescriptor@9['K']
-    resolve(JavaTypeParameterImpl@98['V']) = LazyJavaTypeParameterDescriptor@10['V']
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@77[empty]
-    <name not found> = EmptyList@77[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
deleted file mode 100644
index b90e4a74030..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
+++ /dev/null
@@ -1,202 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('list': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['list'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('list': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['List<String>'] {
-    arguments = ArrayList@17[1] { TypeProjectionImpl@18 }
-    classifier = JavaClassImpl@19['List']
-    nullable = 'false': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@21
-}
-
-LazyJavaClassifierType@22['List<String>'] {
-    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
-    classifier = JavaClassImpl@19['List']
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaClassifierType@27['Object'] {
-    classifier = JavaClassImpl@28['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@25
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaPackageFragmentProvider@41 {
-    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('List': FqName@44) = null
-    packageFragments('MutableList': FqName@45) = null
-    packageFragments('String': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.List': FqName@51) = null
-    packageFragments('java.lang.MutableList': FqName@52) = null
-    packageFragments('java.lang.String': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = null
-    packageFragments('kotlin.List': FqName@55) = null
-    packageFragments('kotlin.MutableList': FqName@56) = null
-    packageFragments('kotlin.String': FqName@57) = null
-    packageFragments('kotlin.io': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = null
-    packageFragments('p': FqName@60) = LazyJavaPackageFragment@61['p']
-    packageFragments('p.List': FqName@62) = null
-    packageFragments('p.MutableList': FqName@63) = null
-    packageFragments('p.String': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@43['<root>'] {
-    classes('J': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('List': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('MutableList': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('String': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('p': Name@74) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    classes('J': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@61['p'] {
-    classes('J': Name@66) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('List': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('MutableList': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-null {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
deleted file mode 100644
index e7d6c73f575..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
+++ /dev/null
@@ -1,334 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassDescriptor@2['HashMap'] {
-    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['HashMap']
-}
-
-LazyJavaClassDescriptor@10['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractMap'] {
-    parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@9['HashMap'] {
-    parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
-    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['Serializable'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractMap<K, V>'] {
-    arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassifierType@23['Cloneable'] {
-    classifier = JavaClassImpl@30['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['K'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@37['K'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@40['K'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@42['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@43['K'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaTypeParameterImpl@45['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@47['K'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@42['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@52['K'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@45['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@67
-    nullable = 'true': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@16['Map<K, V>'] {
-    arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@22['Map<K, V>'] {
-    classifier = JavaClassImpl@73['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@74['Object'] {
-    classifier = JavaClassImpl@75['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    classifier = JavaClassImpl@80['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassifierType@81['V'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['V'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaClassifierType@89['V'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@92['V'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@95['V'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@91['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@97['V'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@99['V'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@94['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@101['V'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('A': FqName@106) = null
-    packageFragments('M': FqName@107) = null
-    packageFragments('M2': FqName@108) = null
-    packageFragments('Map': FqName@109) = null
-    packageFragments('ModuleDescriptorImpl': FqName@110) = null
-    packageFragments('ModuleInfo': FqName@111) = null
-    packageFragments('R': FqName@112) = null
-    packageFragments('ResolverForModule': FqName@113) = null
-    packageFragments('ResolverForProject': FqName@114) = null
-    packageFragments('ResolverForProjectImpl': FqName@115) = null
-    packageFragments('java': FqName@116) = LazyJavaPackageFragment@117['java']
-    packageFragments('java.io': FqName@118) = LazyJavaPackageFragment@119['io']
-    packageFragments('java.lang': FqName@120) = LazyJavaPackageFragment@121['lang']
-    packageFragments('java.lang.A': FqName@122) = null
-    packageFragments('java.lang.M': FqName@123) = null
-    packageFragments('java.lang.M2': FqName@124) = null
-    packageFragments('java.lang.Map': FqName@125) = null
-    packageFragments('java.lang.ModuleDescriptorImpl': FqName@126) = null
-    packageFragments('java.lang.ModuleInfo': FqName@127) = null
-    packageFragments('java.lang.R': FqName@128) = null
-    packageFragments('java.lang.ResolverForModule': FqName@129) = null
-    packageFragments('java.lang.ResolverForProject': FqName@130) = null
-    packageFragments('java.util': FqName@131) = LazyJavaPackageFragment@132['util']
-    packageFragments('java.util.HashMap': FqName@133) = null
-    packageFragments('kotlin': FqName@134) = null
-    packageFragments('kotlin.A': FqName@135) = null
-    packageFragments('kotlin.M': FqName@136) = null
-    packageFragments('kotlin.M2': FqName@137) = null
-    packageFragments('kotlin.Map': FqName@138) = null
-    packageFragments('kotlin.ModuleDescriptorImpl': FqName@139) = null
-    packageFragments('kotlin.ModuleInfo': FqName@140) = null
-    packageFragments('kotlin.R': FqName@141) = null
-    packageFragments('kotlin.ResolverForModule': FqName@142) = null
-    packageFragments('kotlin.ResolverForProject': FqName@143) = null
-    packageFragments('kotlin.io': FqName@144) = null
-    packageFragments('kotlin.jvm': FqName@145) = null
-    topLevelClasses(JavaClassImpl@29['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@146['HashMap']) = LazyJavaClassDescriptor@2['HashMap']
-    topLevelClasses(JavaClassImpl@80['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
-}
-
-LazyJavaPackageFragment@105['<root>'] {
-    classes('HashMap': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Map': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('ResolverForProjectImpl': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('java': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('HashMap': Name@153) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('ResolverForProjectImpl': Name@150) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('java': Name@155) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@148
-}
-
-LazyJavaPackageFragment@117['java'] {
-    classes('lang': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('util': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('lang': Name@160) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('util': Name@161) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-LazyJavaPackageFragment@121['lang'] {
-    classes('HashMap': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('ResolverForProjectImpl': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('HashMap': Name@153) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('ResolverForProjectImpl': Name@150) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@163
-}
-
-LazyJavaPackageFragment@132['util'] {
-    classes('HashMap': Name@165) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('HashMap': Name@167) = EmptyList@154[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
-}
-
-LazyJavaTypeParameterDescriptor@18['K'] {
-    defaultType = JetTypeImpl@169['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@170[1] { NullableType@171 }
-}
-
-LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaTypeParameterDescriptor@19['V'] {
-    defaultType = JetTypeImpl@172['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@173[1] { NullableType@174 }
-}
-
-LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaTypeParameterResolver@175 {
-    resolve(JavaTypeParameterImpl@176['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@177['V']) = LazyJavaTypeParameterDescriptor@19['V']
-}
-
-LazyJavaTypeParameterResolver@178 {
-    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
-}
-
-null {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@196[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
-    <name not found> = EmptyList@154[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
deleted file mode 100644
index 31c667df54a..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
+++ /dev/null
@@ -1,383 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassDescriptor@2['HashMap'] {
-    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['HashMap']
-}
-
-LazyJavaClassDescriptor@10['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractMap'] {
-    parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@9['HashMap'] {
-    parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
-    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['Serializable'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractMap<K, V>'] {
-    arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassifierType@23['Cloneable'] {
-    classifier = JavaClassImpl@30['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['K'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@37['K'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@41['K'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@43['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@44['K'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@47['K'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@43['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@46['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@52['K'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@67
-    nullable = 'true': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@16['Map<K, V>'] {
-    arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@22['Map<K, V>'] {
-    classifier = JavaClassImpl@73['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@74['Object'] {
-    classifier = JavaClassImpl@75['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    classifier = JavaClassImpl@80['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassifierType@81['V'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['V'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@88['V'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@91['V'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaClassifierType@95['V'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@97['V'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@90['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@99['V'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@93['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaClassifierType@101['V'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('M': FqName@106) = null
-    packageFragments('M1': FqName@107) = null
-    packageFragments('M2': FqName@108) = null
-    packageFragments('Map': FqName@109) = null
-    packageFragments('ResolverForProject': FqName@110) = null
-    packageFragments('ResolverForProjectImpl': FqName@111) = null
-    packageFragments('String': FqName@112) = null
-    packageFragments('WithFoo': FqName@113) = null
-    packageFragments('java': FqName@114) = LazyJavaPackageFragment@115['java']
-    packageFragments('java.io': FqName@116) = LazyJavaPackageFragment@117['io']
-    packageFragments('java.lang': FqName@118) = LazyJavaPackageFragment@119['lang']
-    packageFragments('java.lang.M': FqName@120) = null
-    packageFragments('java.lang.M1': FqName@121) = null
-    packageFragments('java.lang.M2': FqName@122) = null
-    packageFragments('java.lang.Map': FqName@123) = null
-    packageFragments('java.lang.ResolverForProject': FqName@124) = null
-    packageFragments('java.lang.String': FqName@125) = null
-    packageFragments('java.lang.WithFoo': FqName@126) = null
-    packageFragments('java.util': FqName@127) = LazyJavaPackageFragment@128['util']
-    packageFragments('java.util.HashMap': FqName@129) = null
-    packageFragments('kotlin': FqName@130) = null
-    packageFragments('kotlin.M': FqName@131) = null
-    packageFragments('kotlin.M1': FqName@132) = null
-    packageFragments('kotlin.M2': FqName@133) = null
-    packageFragments('kotlin.Map': FqName@134) = null
-    packageFragments('kotlin.ResolverForProject': FqName@135) = null
-    packageFragments('kotlin.String': FqName@136) = null
-    packageFragments('kotlin.WithFoo': FqName@137) = null
-    packageFragments('kotlin.io': FqName@138) = null
-    packageFragments('kotlin.jvm': FqName@139) = null
-    topLevelClasses(JavaClassImpl@29['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@140['HashMap']) = LazyJavaClassDescriptor@2['HashMap']
-    topLevelClasses(JavaClassImpl@80['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
-}
-
-LazyJavaPackageFragment@105['<root>'] {
-    classes('HashMap': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('Map': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('ResolverForProjectImpl': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('String': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('java': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('HashMap': Name@148) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('ResolverForProjectImpl': Name@144) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('java': Name@150) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaPackageFragment@115['java'] {
-    classes('lang': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('util': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('lang': Name@155) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('util': Name@156) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@153
-}
-
-LazyJavaPackageFragment@119['lang'] {
-    classes('HashMap': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('ResolverForProjectImpl': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('HashMap': Name@148) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('ResolverForProjectImpl': Name@144) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-LazyJavaPackageFragment@128['util'] {
-    classes('HashMap': Name@160) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('HashMap': Name@162) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
-}
-
-LazyJavaTypeParameterDescriptor@18['K'] {
-    defaultType = JetTypeImpl@164['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@165[1] { NullableType@166 }
-}
-
-LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-LazyJavaTypeParameterDescriptor@19['V'] {
-    defaultType = JetTypeImpl@167['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@168[1] { NullableType@169 }
-}
-
-LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@93['V']) = LazyJavaTypeParameterDescriptor@14['V']
-}
-
-LazyJavaTypeParameterResolver@171 {
-    resolve(JavaTypeParameterImpl@172['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@173['V']) = LazyJavaTypeParameterDescriptor@19['V']
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[4] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-}
-
-null {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-    <name not found> = EmptyList@149[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
deleted file mode 100644
index 73bf0c06643..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
+++ /dev/null
@@ -1,169 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('arr': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['arr'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('arr': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['Object']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['Object'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@18['Object']
-    nullable = 'true': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('Any': FqName@29) = null
-    packageFragments('Array': FqName@30) = null
-    packageFragments('String': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.Any': FqName@36) = null
-    packageFragments('java.lang.Array': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.Any': FqName@40) = null
-    packageFragments('kotlin.Array': FqName@41) = null
-    packageFragments('kotlin.String': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = null
-    packageFragments('p': FqName@45) = LazyJavaPackageFragment@46['p']
-    packageFragments('p.Any': FqName@47) = null
-    packageFragments('p.Array': FqName@48) = null
-    packageFragments('p.String': FqName@49) = null
-    topLevelClasses(JavaClassImpl@50['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('p': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('p': Name@59) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@35['lang'] {
-    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@46['p'] {
-    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('J': Name@54) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('String': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
deleted file mode 100644
index 59f23c560e2..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
+++ /dev/null
@@ -1,212 +0,0 @@
-LazyJavaClassDescriptor@0['Sub'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@1['Sub']
-}
-
-LazyJavaClassDescriptor@2['Super'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@3['Super']
-}
-
-LazyJavaClassDescriptor@4['Util'] {
-    allDescriptors = ArrayList@5[5] { DeserializedSimpleFunctionDescriptor@6['hashCode'], JavaMethodDescriptor@7['foo'], JavaMethodDescriptor@8['foo'], ... } // through LazyJavaClassMemberScope@9
-    constructors = ArrayList@10[1] { JavaConstructorDescriptor@11['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@12['Util']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@9
-    functions('clone': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('equals': Name@16) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['equals'] } // through LazyJavaClassMemberScope@9
-    functions('finalize': Name@19) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('foo': Name@20) = ArrayList@21[2] { JavaMethodDescriptor@7['foo'], JavaMethodDescriptor@8['foo'] } // through LazyJavaClassMemberScope@9
-    functions('getClass': Name@22) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('hashCode': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@6['hashCode'] } // through LazyJavaClassMemberScope@9
-    functions('notify': Name@25) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('notifyAll': Name@26) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@9
-    functions('wait': Name@30) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@9
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['Util']
-}
-
-LazyJavaClassTypeConstructor@1['Sub'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { LazyJavaClassifierType@37['Super'] }
-}
-
-LazyJavaClassTypeConstructor@3['Super'] {
-    parameters = ArrayList@38[empty]
-    supertypes = ArrayList@39[1] { JetTypeImpl@40['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Util'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[1] { JetTypeImpl@40['Any'] }
-}
-
-LazyJavaClassifierType@43['Object'] {
-    classifier = JavaClassImpl@44['Object']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Object'] {
-    classifier = JavaClassImpl@47['Object']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@48['String'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['String']
-    nullable = 'false': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@53['String'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@55['String']
-    nullable = 'false': Boolean@51
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@56['String'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaClassImpl@50['String']
-    nullable = 'true': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@59['String'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@55['String']
-    nullable = 'true': Boolean@58
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@61['Sub'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@63['Sub']
-    nullable = 'false': Boolean@51
-    typeConstructor = LazyJavaClassTypeConstructor@1['Sub']
-}
-
-LazyJavaClassifierType@64['Sub'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaClassImpl@63['Sub']
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@1['Sub']
-}
-
-LazyJavaClassifierType@66['Super'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@68['Super']
-    nullable = 'false': Boolean@51
-    typeConstructor = LazyJavaClassTypeConstructor@3['Super']
-}
-
-LazyJavaClassifierType@69['Super'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@68['Super']
-    nullable = 'true': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@3['Super']
-}
-
-LazyJavaClassifierType@37['Super'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Super']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Super']
-}
-
-LazyJavaPackageFragmentProvider@73 {
-    packageFragments('<root>': FqName@74) = LazyJavaPackageFragment@75['<root>']
-    packageFragments('C': FqName@76) = null
-    packageFragments('String': FqName@77) = null
-    packageFragments('Sub': FqName@78) = null
-    packageFragments('Super': FqName@79) = null
-    packageFragments('Util': FqName@80) = null
-    packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
-    packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
-    packageFragments('java.lang.String': FqName@85) = null
-    packageFragments('java.lang.Sub': FqName@86) = null
-    packageFragments('java.lang.Super': FqName@87) = null
-    packageFragments('java.lang.Util': FqName@88) = null
-    packageFragments('kotlin': FqName@89) = null
-    packageFragments('kotlin.String': FqName@90) = null
-    packageFragments('kotlin.Sub': FqName@91) = null
-    packageFragments('kotlin.Super': FqName@92) = null
-    packageFragments('kotlin.Util': FqName@93) = null
-    packageFragments('kotlin.io': FqName@94) = null
-    packageFragments('kotlin.jvm': FqName@95) = null
-    packageFragments('p': FqName@96) = LazyJavaPackageFragment@97['p']
-    packageFragments('p.String': FqName@98) = null
-    packageFragments('p.Sub': FqName@99) = null
-    packageFragments('p.Super': FqName@100) = null
-    packageFragments('p.Util': FqName@101) = null
-    topLevelClasses(JavaClassImpl@102['Sub']) = LazyJavaClassDescriptor@0['Sub']
-    topLevelClasses(JavaClassImpl@103['Super']) = LazyJavaClassDescriptor@2['Super']
-    topLevelClasses(JavaClassImpl@104['Util']) = LazyJavaClassDescriptor@4['Util']
-}
-
-LazyJavaPackageFragment@75['<root>'] {
-    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Sub': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Super': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Util': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('p': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('p': Name@113) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@82['java'] {
-    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('lang': Name@117) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@84['lang'] {
-    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
-}
-
-LazyJavaPackageFragment@97['p'] {
-    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Sub': Name@108) = LazyJavaClassDescriptor@0['Sub'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Super': Name@109) = LazyJavaClassDescriptor@2['Super'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Util': Name@110) = LazyJavaClassDescriptor@4['Util'] // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@139[2] { ResolutionCandidate@134, ResolutionCandidate@135 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
deleted file mode 100644
index 3c065be9e48..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
+++ /dev/null
@@ -1,185 +0,0 @@
-LazyJavaClassDescriptor@0['SAM'] {
-    functionTypeForSamInterface = JetTypeImpl@1['Function0<1>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@2['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@3['SAM']
-}
-
-LazyJavaClassDescriptor@4['Util'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functions('sam': Name@7) = ArrayList@8[2] { JavaMethodDescriptor@9['sam'], SamAdapterFunctionDescriptor@10['sam'] } // through LazyJavaStaticClassScope@11
-    functions('sam': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaStaticClassScope@11
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@6
-    nestedClasses('sam': Name@7) = null // through LazyJavaClassMemberScope@6
-    properties('sam': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@6
-    properties('sam': Name@7) = EmptyList@12[empty] // through LazyJavaStaticClassScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@16['Util']
-}
-
-LazyJavaClassDescriptor@17['Void'] {
-    typeConstructor = LazyJavaClassTypeConstructor@18['Void']
-}
-
-LazyJavaClassTypeConstructor@3['SAM'] {
-    parameters = ArrayList@19[1] { LazyJavaTypeParameterDescriptor@20['R'] }
-    supertypes = ArrayList@21[1] { JetTypeImpl@22['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Util'] {
-    supertypes = ArrayList@23[1] { JetTypeImpl@22['Any'] }
-}
-
-LazyJavaClassTypeConstructor@18['Void'] {
-    parameters = ArrayList@24[empty]
-}
-
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@28['Object'] {
-    classifier = JavaClassImpl@29['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@30['R'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@32['R']
-    nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-}
-
-LazyJavaClassifierType@35['R'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaTypeParameterImpl@32['R']
-    nullable = 'true': Boolean@37
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-}
-
-LazyJavaClassifierType@38['SAM<Void>'] {
-    arguments = ArrayList@39[1] { TypeProjectionImpl@40 }
-    classifier = JavaClassImpl@41['SAM']
-    nullable = 'false': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@3['SAM']
-}
-
-LazyJavaClassifierType@42['SAM<Void>'] {
-    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
-    classifier = JavaClassImpl@41['SAM']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@3['SAM']
-}
-
-LazyJavaClassifierType@45['Void'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@47['Void']
-    nullable = 'false': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@18['Void']
-}
-
-LazyJavaClassifierType@48['Void'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Void']
-    nullable = 'false': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@18['Void']
-}
-
-LazyJavaClassifierType@51['Void'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@47['Void']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@18['Void']
-}
-
-LazyJavaClassifierType@53['Void'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@50['Void']
-    nullable = 'true': Boolean@37
-    typeConstructor = LazyJavaClassTypeConstructor@18['Void']
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('Util': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Util': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Util': FqName@65) = null
-    packageFragments('kotlin.io': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = null
-    packageFragments('p': FqName@68) = LazyJavaPackageFragment@69['p']
-    packageFragments('p.Util': FqName@70) = null
-    topLevelClasses(JavaClassImpl@41['SAM']) = LazyJavaClassDescriptor@0['SAM']
-    topLevelClasses(JavaClassImpl@71['Util']) = LazyJavaClassDescriptor@4['Util']
-    topLevelClasses(JavaClassImpl@50['Void']) = LazyJavaClassDescriptor@17['Void']
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('Util': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@76) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@69['p'] {
-    classes('Util': Name@72) = LazyJavaClassDescriptor@4['Util'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaTypeParameterDescriptor@20['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-    upperBounds = LinkedHashSet@84[1] { NullableType@85 }
-}
-
-LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@87['R']) = LazyJavaTypeParameterDescriptor@20['R']
-}
-
-LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@32['R']) = null
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-null {
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@91, ResolutionCandidate@93 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
deleted file mode 100644
index 242f66530c3..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
+++ /dev/null
@@ -1,245 +0,0 @@
-LazyJavaClassDescriptor@0['Collections'] {
-    enumEntryIndex = LinkedHashMap@1 // through LazyJavaClassMemberScope@2
-    functions('singleton': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['singleton'] } // through LazyJavaStaticClassScope@6
-    functions('singleton': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@2
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaStaticClassScope@6
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@2
-    nestedClasses('singleton': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('singleton': Name@3) = EmptyList@7[empty] // through LazyJavaClassMemberScope@2
-    properties('singleton': Name@3) = EmptyList@7[empty] // through LazyJavaStaticClassScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['Collections']
-}
-
-LazyJavaClassTypeConstructor@11['Collections'] {
-    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
-}
-
-LazyJavaClassifierType@14['Object'] {
-    classifier = JavaClassImpl@15['Object']
-    typeConstructor = DeserializedClassTypeConstructor@16
-}
-
-LazyJavaClassifierType@17['Set<T>'] {
-    arguments = ArrayList@18[1] { TypeProjectionImpl@19 }
-    classifier = JavaClassImpl@20['Set']
-    memberScope = SubstitutingScope@21
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@24['Set<T>'] {
-    arguments = ArrayList@25[1] { TypeProjectionImpl@26 }
-    classifier = JavaClassImpl@20['Set']
-    memberScope = SubstitutingScope@27
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@30['T'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@34['T'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@37['T'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@40['T'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@32['T']
-    nullable = 'true': Boolean@28
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@42['T'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'true': Boolean@28
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaClassifierType@44['T'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@36['T']
-    nullable = 'true': Boolean@28
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@47) = LazyJavaPackageFragment@48['<root>']
-    packageFragments('Collection': FqName@49) = null
-    packageFragments('Foo': FqName@50) = null
-    packageFragments('java': FqName@51) = LazyJavaPackageFragment@52['java']
-    packageFragments('java.lang': FqName@53) = LazyJavaPackageFragment@54['lang']
-    packageFragments('java.lang.Collection': FqName@55) = null
-    packageFragments('java.lang.Foo': FqName@56) = null
-    packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
-    packageFragments('java.util.Collections': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Collection': FqName@61) = null
-    packageFragments('kotlin.Foo': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['Collections']) = LazyJavaClassDescriptor@0['Collections']
-}
-
-LazyJavaPackageFragment@48['<root>'] {
-    classes('Collection': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('java': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@52['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('util': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@73) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@54['lang'] {
-    classes('java': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@58['util'] {
-    classes('Collections': Name@76) = LazyJavaClassDescriptor@0['Collections'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaTypeParameterDescriptor@78['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@79[1] { NullableType@80 }
-    upperBoundsAsType = NullableType@80
-}
-
-LazyJavaTypeParameterResolver@81 {
-    resolve(JavaTypeParameterImpl@82['T']) = LazyJavaTypeParameterDescriptor@78['T']
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
deleted file mode 100644
index 2878dba765d..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
+++ /dev/null
@@ -1,117 +0,0 @@
-LazyJavaClassDescriptor@0['J'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['J']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('str': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['str'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('str': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['J'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['J']
-    nullable = 'false': Boolean@19
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassifierType@20['J'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@18['J']
-    nullable = 'true': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassifierType@23['Object'] {
-    classifier = JavaClassImpl@24['Object']
-    typeConstructor = DeserializedClassTypeConstructor@25
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
-    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    packageFragments('p': FqName@36) = LazyJavaPackageFragment@37['p']
-    topLevelClasses(JavaClassImpl@38['J']) = LazyJavaClassDescriptor@0['J']
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('p': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@32['lang'] {
-    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@37['p'] {
-    classes('J': Name@39) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-    <name not found> = EmptyList@43[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
deleted file mode 100644
index 72d2846ff11..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
+++ /dev/null
@@ -1,189 +0,0 @@
-LazyJavaClassDescriptor@0['Element'] {
-    defaultType = JetTypeImpl@1['Element']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('accept': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['accept'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
-    nestedClasses('accept': Name@4) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['Element']
-}
-
-LazyJavaClassDescriptor@11['Visitor'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
-}
-
-LazyJavaClassTypeConstructor@10['Element'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassTypeConstructor@12['Visitor'] {
-    parameters = ArrayList@16[1] { LazyJavaTypeParameterDescriptor@17['D'] }
-    supertypes = ArrayList@18[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@19['D'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaTypeParameterImpl@21['D']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@24['D'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaTypeParameterImpl@26['D']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@27['D'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaTypeParameterImpl@29['D']
-    nullable = 'false': Boolean@22
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@30['D'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaTypeParameterImpl@21['D']
-    nullable = 'true': Boolean@32
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@33['D'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaTypeParameterImpl@29['D']
-    nullable = 'true': Boolean@32
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@35['D'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaTypeParameterImpl@26['D']
-    nullable = 'true': Boolean@32
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-}
-
-LazyJavaClassifierType@37['Object'] {
-    classifier = JavaClassImpl@38['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@42['R'] {
-    arguments = ArrayList@43[empty]
-    classifier = null
-    nullable = 'false': Boolean@22
-    typeConstructor = TypeConstructorImpl$1@44
-}
-
-LazyJavaClassifierType@45['R'] {
-    classifier = null
-    nullable = 'true': Boolean@32
-    typeConstructor = TypeConstructorImpl$1@46
-}
-
-LazyJavaClassifierType@47['Visitor<D>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['Visitor']
-    memberScope = SubstitutingScope@51
-    nullable = 'false': Boolean@22
-    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
-}
-
-LazyJavaClassifierType@52['Visitor<D>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@50['Visitor']
-    memberScope = SubstitutingScope@55
-    nullable = 'true': Boolean@32
-    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
-}
-
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('Element': FqName@59) = null
-    packageFragments('Nothing': FqName@60) = null
-    packageFragments('Visitor': FqName@61) = null
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.Element': FqName@66) = null
-    packageFragments('java.lang.Nothing': FqName@67) = null
-    packageFragments('java.lang.Visitor': FqName@68) = null
-    packageFragments('kotlin': FqName@69) = null
-    packageFragments('kotlin.Element': FqName@70) = null
-    packageFragments('kotlin.Nothing': FqName@71) = null
-    packageFragments('kotlin.Visitor': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    packageFragments('p': FqName@75) = LazyJavaPackageFragment@76['p']
-    packageFragments('p.Element': FqName@77) = null
-    packageFragments('p.Nothing': FqName@78) = null
-    packageFragments('p.Visitor': FqName@79) = null
-    topLevelClasses(JavaClassImpl@80['Element']) = LazyJavaClassDescriptor@0['Element']
-    topLevelClasses(JavaClassImpl@81['Visitor']) = LazyJavaClassDescriptor@11['Visitor']
-}
-
-LazyJavaPackageFragment@58['<root>'] {
-    classes('Element': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Nothing': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Visitor': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-LazyJavaPackageFragment@76['p'] {
-    classes('Element': Name@82) = LazyJavaClassDescriptor@0['Element'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Nothing': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Visitor': Name@85) = LazyJavaClassDescriptor@11['Visitor'] // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaTypeParameterDescriptor@96['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-    upperBounds = LinkedHashSet@97[1] { NullableType@98 }
-}
-
-LazyJavaTypeParameterDescriptor@17['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@100[1] { NullableType@101 }
-}
-
-LazyJavaTypeParameterResolver@102 {
-    resolve(JavaTypeParameterImpl@103['D']) = LazyJavaTypeParameterDescriptor@17['D']
-}
-
-LazyJavaTypeParameterResolver@104 {
-    resolve(JavaTypeParameterImpl@105['D']) = LazyJavaTypeParameterDescriptor@96['D']
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-null {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@108 }
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
deleted file mode 100644
index 3111c09e1a1..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
+++ /dev/null
@@ -1,534 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassDescriptor@18['ArrayList'] {
-    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@24['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
-    functionTypeForSamInterface = null
-    functions('iterator': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@28['iterator'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
-    nestedClasses('iterator': Name@26) = null // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['ArrayList']
-}
-
-LazyJavaClassDescriptor@33['RandomAccess'] {
-    functions('iterator': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@37['RandomAccess']
-}
-
-LazyJavaClassDescriptor@38['Serializable'] {
-    functions('iterator': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['E'] }
-    supertypes = ArrayList@44[1] { LazyJavaClassifierType@45['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@17['AbstractList'] {
-    parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
-    supertypes = ArrayList@48[2] { LazyJavaClassifierType@49['AbstractCollection<E>'], LazyJavaClassifierType@50['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@32['ArrayList'] {
-    parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
-    supertypes = ArrayList@53[5] { LazyJavaClassifierType@54['AbstractList<E>'], LazyJavaClassifierType@55['List<E>'], LazyJavaClassifierType@56['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@37['RandomAccess'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
-}
-
-LazyJavaClassTypeConstructor@41['Serializable'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { JetTypeImpl@59['Any'] }
-}
-
-LazyJavaClassifierType@49['AbstractCollection<E>'] {
-    arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
-    classifier = JavaClassImpl@64['AbstractCollection']
-    memberScope = SubstitutingScope@65
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@54['AbstractList<E>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@68['AbstractList']
-    memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassifierType@70['Cloneable'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Cloneable']
-    memberScope = DeserializedClassMemberScope@73
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@75['Collection<? extends E>'] {
-    arguments = ArrayList@76[1] { TypeProjectionImpl@77 }
-    classifier = JavaClassImpl@78['Collection']
-    memberScope = SubstitutingScope@79
-    nullable = 'false': Boolean@80
-    typeConstructor = DeserializedClassTypeConstructor@81
-}
-
-LazyJavaClassifierType@82['Collection<? extends E>'] {
-    arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@78['Collection']
-    memberScope = SubstitutingScope@85
-    nullable = 'true': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@87
-}
-
-LazyJavaClassifierType@45['Collection<E>'] {
-    arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@90['Collection']
-    memberScope = SubstitutingScope@91
-    typeConstructor = DeserializedClassTypeConstructor@81
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@100['E'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@106['E'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@108['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@116['E'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@121['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@122['E'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@125['E'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@131['E'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@134['E'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@127['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@136['E'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@118['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@138['E'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@102['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@142['E'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@146['E'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@148['E'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@121['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-}
-
-LazyJavaClassifierType@152['E'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@108['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@158['E'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@105['E']
-    nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@160['Iterator<E>'] {
-    arguments = ArrayList@161[1] { TypeProjectionImpl@162 }
-    classifier = JavaClassImpl@163['Iterator']
-    memberScope = SubstitutingScope@164
-    nullable = 'false': Boolean@80
-    typeConstructor = DeserializedClassTypeConstructor@165
-}
-
-LazyJavaClassifierType@166['Iterator<E>'] {
-    arguments = ArrayList@167[1] { TypeProjectionImpl@168 }
-    classifier = JavaClassImpl@169['Iterator']
-    memberScope = SubstitutingScope@170
-    nullable = 'false': Boolean@80
-    typeConstructor = DeserializedClassTypeConstructor@165
-}
-
-LazyJavaClassifierType@171['Iterator<E>'] {
-    arguments = ArrayList@172[1] { TypeProjectionImpl@173 }
-    classifier = JavaClassImpl@174['Iterator']
-    memberScope = SubstitutingScope@175
-    nullable = 'false': Boolean@80
-    typeConstructor = DeserializedClassTypeConstructor@165
-}
-
-LazyJavaClassifierType@176['Iterator<E>'] {
-    arguments = ArrayList@177[1] { TypeProjectionImpl@178 }
-    classifier = JavaClassImpl@169['Iterator']
-    memberScope = SubstitutingScope@179
-    nullable = 'true': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@180
-}
-
-LazyJavaClassifierType@181['Iterator<E>'] {
-    arguments = ArrayList@182[1] { TypeProjectionImpl@183 }
-    classifier = JavaClassImpl@174['Iterator']
-    memberScope = SubstitutingScope@184
-    nullable = 'true': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@180
-}
-
-LazyJavaClassifierType@185['Iterator<E>'] {
-    arguments = ArrayList@186[1] { TypeProjectionImpl@187 }
-    classifier = JavaClassImpl@163['Iterator']
-    memberScope = SubstitutingScope@188
-    nullable = 'true': Boolean@86
-    typeConstructor = DeserializedClassTypeConstructor@180
-}
-
-LazyJavaClassifierType@50['List<E>'] {
-    arguments = ArrayList@189[1] { TypeProjectionImpl@190 }
-    classifier = JavaClassImpl@191['List']
-    memberScope = SubstitutingScope@192
-    typeConstructor = DeserializedClassTypeConstructor@193
-}
-
-LazyJavaClassifierType@55['List<E>'] {
-    arguments = ArrayList@194[1] { TypeProjectionImpl@195 }
-    classifier = JavaClassImpl@196['List']
-    memberScope = SubstitutingScope@197
-    typeConstructor = DeserializedClassTypeConstructor@193
-}
-
-LazyJavaClassifierType@198['Object'] {
-    classifier = JavaClassImpl@199['Object']
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@201['Object'] {
-    classifier = JavaClassImpl@202['Object']
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@203['Object'] {
-    classifier = JavaClassImpl@204['Object']
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@56['RandomAccess'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@206['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@37['RandomAccess']
-}
-
-LazyJavaClassifierType@207['Serializable'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@209['Serializable']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@210 {
-    packageFragments('<root>': FqName@211) = LazyJavaPackageFragment@212['<root>']
-    packageFragments('String': FqName@213) = null
-    packageFragments('java': FqName@214) = LazyJavaPackageFragment@215['java']
-    packageFragments('java.io': FqName@216) = LazyJavaPackageFragment@217['io']
-    packageFragments('java.lang': FqName@218) = LazyJavaPackageFragment@219['lang']
-    packageFragments('java.lang.String': FqName@220) = null
-    packageFragments('java.util': FqName@221) = LazyJavaPackageFragment@222['util']
-    packageFragments('java.util.ArrayList': FqName@223) = null
-    packageFragments('kotlin': FqName@224) = null
-    packageFragments('kotlin.String': FqName@225) = null
-    packageFragments('kotlin.io': FqName@226) = null
-    packageFragments('kotlin.jvm': FqName@227) = null
-    topLevelClasses(JavaClassImpl@64['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@68['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@228['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
-    topLevelClasses(JavaClassImpl@206['RandomAccess']) = LazyJavaClassDescriptor@33['RandomAccess']
-    topLevelClasses(JavaClassImpl@209['Serializable']) = LazyJavaClassDescriptor@38['Serializable']
-}
-
-LazyJavaPackageFragment@212['<root>'] {
-    classes('ArrayList': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('String': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('java': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('ArrayList': Name@234) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('java': Name@235) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    memberIndex = computeMemberIndex$1@236 // through LazyPackageFragmentScopeForJavaPackage@230
-}
-
-LazyJavaPackageFragment@215['java'] {
-    classes('lang': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('util': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('lang': Name@240) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('util': Name@241) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    memberIndex = computeMemberIndex$1@242 // through LazyPackageFragmentScopeForJavaPackage@238
-}
-
-LazyJavaPackageFragment@219['lang'] {
-    classes('ArrayList': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@243
-    functions('ArrayList': Name@234) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@243
-    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@243
-}
-
-LazyJavaPackageFragment@222['util'] {
-    classes('ArrayList': Name@245) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@246
-    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('ArrayList': Name@247) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@246
-}
-
-LazyJavaTypeParameterDescriptor@43['E'] {
-    defaultType = JetTypeImpl@249['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    upperBounds = LinkedHashSet@250[1] { NullableType@251 }
-    upperBoundsAsType = NullableType@251
-}
-
-LazyJavaTypeParameterDescriptor@47['E'] {
-    defaultType = JetTypeImpl@252['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-    upperBounds = LinkedHashSet@253[1] { NullableType@254 }
-    upperBoundsAsType = NullableType@254
-}
-
-LazyJavaTypeParameterDescriptor@52['E'] {
-    defaultType = JetTypeImpl@255['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@256[1] { NullableType@257 }
-}
-
-LazyJavaTypeParameterResolver@258 {
-    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@43['E']
-}
-
-LazyJavaTypeParameterResolver@260 {
-    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@52['E']
-}
-
-LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@264 {
-    resolve(JavaTypeParameterImpl@121['E']) = null
-}
-
-LazyJavaTypeParameterResolver@265 {
-    resolve(JavaTypeParameterImpl@124['E']) = null
-}
-
-LazyJavaTypeParameterResolver@266 {
-    resolve(JavaTypeParameterImpl@94['E']) = null
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[3] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@296[3] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
deleted file mode 100644
index 36dc1216d5e..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
+++ /dev/null
@@ -1,164 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['I'] {
-    defaultType = JetTypeImpl@2['I']
-    functions('s': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['s'] } // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@8['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@9['I']
-}
-
-LazyJavaClassDescriptor@10['J'] {
-    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
-    defaultType = JetTypeImpl@14['J']
-    enumEntryIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@13
-    functionTypeForSamInterface = null
-    functions('s': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['s'] } // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@13
-    nestedClassIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@13
-    nestedClasses('s': Name@16) = null // through LazyJavaClassMemberScope@13
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['J']
-}
-
-LazyJavaClassTypeConstructor@9['I'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassTypeConstructor@22['J'] {
-    parameters = ArrayList@26[empty]
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['I'] }
-}
-
-LazyJavaClassifierType@28['I'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['I']
-    memberScope = LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@9['I']
-}
-
-LazyJavaClassifierType@31['Object'] {
-    classifier = JavaClassImpl@32['Object']
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@34['Object'] {
-    classifier = JavaClassImpl@35['Object']
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    memberScope = DeserializedClassMemberScope@39
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@42['String'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['String']
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@45['String'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaClassifierType@48['String'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@44['String']
-    nullable = 'true': Boolean@47
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('kotlin': FqName@57) = null
-    packageFragments('kotlin.io': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = null
-    packageFragments('p': FqName@60) = LazyJavaPackageFragment@61['p']
-    topLevelClasses(JavaClassImpl@30['I']) = LazyJavaClassDescriptor@1['I']
-    topLevelClasses(JavaClassImpl@62['J']) = LazyJavaClassDescriptor@10['J']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('J': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@68) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('J': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@61['p'] {
-    classes('J': Name@63) = LazyJavaClassDescriptor@10['J'] // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-null {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
deleted file mode 100644
index 21741c2f01b..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
+++ /dev/null
@@ -1,150 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaClassDescriptor@2['J'] {
-    defaultType = JetTypeImpl@3['J']
-    enumEntryIndex = LinkedHashMap@4 // through LazyJavaClassMemberScope@5
-    functions('s': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['s'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@5
-    nestedClasses('s': Name@6) = null // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['J']
-}
-
-LazyJavaClassTypeConstructor@12['J'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    memberScope = DeserializedClassMemberScope@22
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Int': FqName@31) = null
-    packageFragments('J': FqName@32) = null
-    packageFragments('T': FqName@33) = null
-    packageFragments('Unit': FqName@34) = null
-    packageFragments('_': FqName@35) = null
-    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
-    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
-    packageFragments('java.lang.Int': FqName@40) = null
-    packageFragments('java.lang.J': FqName@41) = null
-    packageFragments('java.lang.T': FqName@42) = null
-    packageFragments('java.lang.Unit': FqName@43) = null
-    packageFragments('java.lang._': FqName@44) = null
-    packageFragments('kotlin': FqName@45) = null
-    packageFragments('kotlin.Int': FqName@46) = null
-    packageFragments('kotlin.J': FqName@47) = null
-    packageFragments('kotlin.T': FqName@48) = null
-    packageFragments('kotlin.Unit': FqName@49) = null
-    packageFragments('kotlin._': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-    packageFragments('p': FqName@53) = LazyJavaPackageFragment@54['p']
-    packageFragments('p.Int': FqName@55) = null
-    packageFragments('p.J': FqName@56) = null
-    packageFragments('p._': FqName@57) = null
-    packageFragments('tests': FqName@58) = null
-    packageFragments('tests._checkType': FqName@59) = null
-    packageFragments('tests._checkType.Int': FqName@60) = null
-    packageFragments('tests._checkType.J': FqName@61) = null
-    packageFragments('tests._checkType.T': FqName@62) = null
-    packageFragments('tests._checkType.Unit': FqName@63) = null
-    packageFragments('tests._checkType._': FqName@64) = null
-    topLevelClasses(JavaClassImpl@65['J']) = LazyJavaClassDescriptor@2['J']
-}
-
-LazyJavaPackageFragment@30['<root>'] {
-    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('J': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('_': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('tests': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('tests': Name@76) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@39['lang'] {
-    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@54['p'] {
-    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('J': Name@68) = LazyJavaClassDescriptor@2['J'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('_': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-null {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@74[empty]
-    <name not found> = EmptyList@74[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
deleted file mode 100644
index 01ae7e7a077..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
+++ /dev/null
@@ -1,286 +0,0 @@
-LazyJavaClassDescriptor@0['Comparator'] {
-    allDescriptors = ArrayList@1[4] { JavaMethodDescriptor@2['compare'], DeserializedSimpleFunctionDescriptor@3['hashCode'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    annotations = LazyJavaAnnotations@6
-    constructors = stdlib_emptyListClass@7[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['Comparator<1>']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = JetTypeImpl@10['Function2<3>']
-    functions('clone': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('compare': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@2['compare'] } // through LazyJavaClassMemberScope@5
-    functions('equals': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@18) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@19) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@3['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@22) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@23) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@24) = ArrayList@25[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@26) = EmptyList@12[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@30['Comparator']
-}
-
-LazyJavaClassDescriptor@31['J'] {
-    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@33
-    functions('c': Name@34) = ArrayList@35[2] { JavaMethodDescriptor@36['c'], SamAdapterFunctionDescriptor@37['c'] } // through LazyJavaStaticClassScope@38
-    functions('c': Name@34) = EmptyList@12[empty] // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaStaticClassScope@38
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@33
-    nestedClasses('c': Name@34) = null // through LazyJavaClassMemberScope@33
-    properties('c': Name@34) = EmptyList@12[empty] // through LazyJavaClassMemberScope@33
-    properties('c': Name@34) = EmptyList@12[empty] // through LazyJavaStaticClassScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@42['J']
-}
-
-LazyJavaClassTypeConstructor@30['Comparator'] {
-    parameters = ArrayList@43[1] { LazyJavaTypeParameterDescriptor@44['T'] }
-    supertypes = ArrayList@45[1] { JetTypeImpl@46['Any'] }
-}
-
-LazyJavaClassTypeConstructor@42['J'] {
-    supertypes = ArrayList@47[1] { JetTypeImpl@46['Any'] }
-}
-
-LazyJavaClassifierType@48['Comparator<Integer>'] {
-    arguments = ArrayList@49[1] { TypeProjectionImpl@50 }
-    classifier = JavaClassImpl@51['Comparator']
-    nullable = 'false': Boolean@52
-    typeConstructor = LazyJavaClassTypeConstructor@30['Comparator']
-}
-
-LazyJavaClassifierType@53['Comparator<Integer>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@51['Comparator']
-    nullable = 'true': Boolean@56
-    typeConstructor = LazyJavaClassTypeConstructor@30['Comparator']
-}
-
-LazyJavaClassifierType@57['Integer'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@59['Integer']
-    memberScope = DeserializedClassMemberScope@60
-    nullable = 'false': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@62['Integer'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@64['Integer']
-    nullable = 'false': Boolean@52
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@65['Integer'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@59['Integer']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@67['Integer'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@64['Integer']
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@61
-}
-
-LazyJavaClassifierType@69['Object'] {
-    classifier = JavaClassImpl@70['Object']
-    typeConstructor = DeserializedClassTypeConstructor@71
-}
-
-LazyJavaClassifierType@72['Object'] {
-    classifier = JavaClassImpl@73['Object']
-    typeConstructor = DeserializedClassTypeConstructor@71
-}
-
-LazyJavaClassifierType@74['T'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['T']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@78['T'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['T']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@81['T'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['T']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@84['T'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@86['T']
-    nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@87['T'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@76['T']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@89['T'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@83['T']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@91['T'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@80['T']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaClassifierType@93['T'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@86['T']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-}
-
-LazyJavaPackageFragmentProvider@95 {
-    packageFragments('<root>': FqName@96) = LazyJavaPackageFragment@97['<root>']
-    packageFragments('J': FqName@98) = null
-    packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
-    packageFragments('java.lang': FqName@101) = LazyJavaPackageFragment@102['lang']
-    packageFragments('java.lang.J': FqName@103) = null
-    packageFragments('java.util': FqName@104) = LazyJavaPackageFragment@105['util']
-    packageFragments('java.util.J': FqName@106) = null
-    packageFragments('kotlin': FqName@107) = null
-    packageFragments('kotlin.J': FqName@108) = null
-    packageFragments('kotlin.io': FqName@109) = null
-    packageFragments('kotlin.jvm': FqName@110) = null
-    packageFragments('p': FqName@111) = LazyJavaPackageFragment@112['p']
-    packageFragments('p.J': FqName@113) = null
-    topLevelClasses(JavaClassImpl@51['Comparator']) = LazyJavaClassDescriptor@0['Comparator']
-    topLevelClasses(JavaClassImpl@114['J']) = LazyJavaClassDescriptor@31['J']
-}
-
-LazyJavaPackageFragment@97['<root>'] {
-    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('J': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('java': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('p': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('java': Name@121) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('p': Name@122) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@100['java'] {
-    classes('lang': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('util': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('lang': Name@127) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('util': Name@128) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-LazyJavaPackageFragment@102['lang'] {
-    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@112['p'] {
-    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('J': Name@117) = LazyJavaClassDescriptor@31['J'] // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-LazyJavaPackageFragment@105['util'] {
-    classes('Comparator': Name@115) = LazyJavaClassDescriptor@0['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('Comparator': Name@115) = ArrayList@135[1] { SamConstructorDescriptor@136['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaTypeParameterDescriptor@44['T'] {
-    defaultType = JetTypeImpl@138['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    upperBounds = LinkedHashSet@139[1] { NullableType@140 }
-}
-
-LazyJavaTypeParameterResolver@141 {
-    resolve(JavaTypeParameterImpl@142['T']) = LazyJavaTypeParameterDescriptor@44['T']
-}
-
-LazyJavaTypeParameterResolver@143 {
-    resolve(JavaTypeParameterImpl@86['T']) = null
-}
-
-LazyJavaTypeParameterResolver@144 {
-    resolve(JavaTypeParameterImpl@80['T']) = null
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@166[2] { ResolutionCandidate@150, ResolutionCandidate@167 }
-    <name not found> = ArrayList@168[8] { ResolutionCandidate@159, ResolutionCandidate@160, ResolutionCandidate@161, ... }
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-    <name not found> = EmptyList@12[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.lazy.log
deleted file mode 100644
index f819934557a..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeArgumentsExplicit.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('F': FqName@8) = null
-    packageFragments('G': FqName@9) = null
-    packageFragments('H': FqName@10) = null
-    packageFragments('I': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('String': FqName@13) = null
-    packageFragments('T': FqName@14) = null
-    packageFragments('ft': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.B': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('java.lang.String': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.ft': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.A': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.Int': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.T': FqName@31) = null
-    packageFragments('kotlin.ft': FqName@32) = null
-    packageFragments('kotlin.internal': FqName@33) = null
-    packageFragments('kotlin.internal.flexible': FqName@34) = null
-    packageFragments('kotlin.internal.flexible.ft': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('ft': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
deleted file mode 100644
index 42965029d4d..00000000000
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
+++ /dev/null
@@ -1,2928 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    defaultType = JetTypeImpl@1['AbstractMap<2>']
-    functions('Entry': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('EntryIterator': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('EntrySet': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('HashIterator': Name@7) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('Holder': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('KeyIterator': Name@9) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('KeySet': Name@10) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ValueIterator': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('Values': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('addEntry': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('capacity': Name@14) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clear': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['clear'] } // through LazyJavaClassMemberScope@4
-    functions('clone': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['clone'] } // through LazyJavaClassMemberScope@4
-    functions('containsKey': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['containsKey'] } // through LazyJavaClassMemberScope@4
-    functions('containsNullValue': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('containsValue': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@27['containsValue'] } // through LazyJavaClassMemberScope@4
-    functions('createEntry': Name@28) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('entrySet': Name@29) = ArrayList@30[1] { JavaMethodDescriptor@31['entrySet'] } // through LazyJavaClassMemberScope@4
-    functions('entrySet0': Name@32) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@33) = ArrayList@34[1] { JavaMethodDescriptor@35['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@36) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('get': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['get'] } // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@40) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getEntry': Name@41) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getForNullKey': Name@42) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hash': Name@43) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@44) = ArrayList@45[1] { JavaMethodDescriptor@46['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('init': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('isEmpty': Name@48) = ArrayList@49[1] { JavaMethodDescriptor@50['isEmpty'] } // through LazyJavaClassMemberScope@4
-    functions('keySet': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['keySet'] } // through LazyJavaClassMemberScope@4
-    functions('loadFactor': Name@54) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('newEntryIterator': Name@55) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('newKeyIterator': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('newValueIterator': Name@57) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notify': Name@58) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@59) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('put': Name@60) = ArrayList@61[1] { JavaMethodDescriptor@62['put'] } // through LazyJavaClassMemberScope@4
-    functions('putAll': Name@63) = ArrayList@64[1] { JavaMethodDescriptor@65['putAll'] } // through LazyJavaClassMemberScope@4
-    functions('putAllForCreate': Name@66) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('putForCreate': Name@67) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('putForNullKey': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('readObject': Name@69) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('remove': Name@70) = ArrayList@71[1] { JavaMethodDescriptor@72['remove'] } // through LazyJavaClassMemberScope@4
-    functions('removeEntryForKey': Name@73) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('removeMapping': Name@74) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('resize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('size': Name@76) = ArrayList@77[1] { JavaMethodDescriptor@78['size'] } // through LazyJavaClassMemberScope@4
-    functions('toString': Name@79) = ArrayList@80[1] { JavaMethodDescriptor@81['toString'] } // through LazyJavaClassMemberScope@4
-    functions('transfer': Name@82) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('values': Name@83) = ArrayList@84[1] { JavaMethodDescriptor@85['values'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@86) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('writeObject': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@88 // through LazyJavaClassMemberScope@4
-    properties('entrySet': Name@89) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('hashSeed': Name@90) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('keySet': Name@91) = ArrayList@92[1] { JavaPropertyDescriptor@93['keySet'] } // through LazyJavaClassMemberScope@4
-    properties('loadFactor': Name@94) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('modCount': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('size': Name@96) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('table': Name@97) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('threshold': Name@98) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('useAltHashing': Name@99) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('values': Name@100) = ArrayList@101[1] { JavaPropertyDescriptor@102['values'] } // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@103['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@104['AbstractMap']
-}
-
-LazyJavaClassDescriptor@105['Entry'] {
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassDescriptor@107['HashMap'] {
-    allDescriptors = ArrayList@108[57] { LazyJavaClassDescriptor@109['EntrySet'], LazyJavaClassDescriptor@110['Values'], LazyJavaClassDescriptor@111['KeySet'], ... } // through LazyJavaClassMemberScope@112
-    constructors = ArrayList@113[4] { JavaConstructorDescriptor@114['<init>'], JavaConstructorDescriptor@115['<init>'], JavaConstructorDescriptor@116['<init>'], ... } // through LazyJavaClassMemberScope@112
-    defaultType = JetTypeImpl@117['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@118 // through LazyJavaClassMemberScope@112
-    functions('Entry': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('EntryIterator': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('EntrySet': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('HashIterator': Name@7) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('Holder': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('KeyIterator': Name@9) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('KeySet': Name@10) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('ValueIterator': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('Values': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('addEntry': Name@119) = ArrayList@120[1] { JavaMethodDescriptor@121['addEntry'] } // through LazyJavaClassMemberScope@112
-    functions('capacity': Name@122) = ArrayList@123[1] { JavaMethodDescriptor@124['capacity'] } // through LazyJavaClassMemberScope@112
-    functions('clear': Name@125) = ArrayList@126[1] { JavaMethodDescriptor@127['clear'] } // through LazyJavaClassMemberScope@112
-    functions('clone': Name@128) = ArrayList@129[1] { JavaMethodDescriptor@130['clone'] } // through LazyJavaClassMemberScope@112
-    functions('containsKey': Name@131) = ArrayList@132[1] { JavaMethodDescriptor@133['containsKey'] } // through LazyJavaClassMemberScope@112
-    functions('containsNullValue': Name@134) = ArrayList@135[1] { JavaMethodDescriptor@136['containsNullValue'] } // through LazyJavaClassMemberScope@112
-    functions('containsValue': Name@137) = ArrayList@138[1] { JavaMethodDescriptor@139['containsValue'] } // through LazyJavaClassMemberScope@112
-    functions('createEntry': Name@140) = ArrayList@141[1] { JavaMethodDescriptor@142['createEntry'] } // through LazyJavaClassMemberScope@112
-    functions('entrySet': Name@143) = ArrayList@144[1] { JavaMethodDescriptor@145['entrySet'] } // through LazyJavaClassMemberScope@112
-    functions('entrySet0': Name@146) = ArrayList@147[1] { JavaMethodDescriptor@148['entrySet0'] } // through LazyJavaClassMemberScope@112
-    functions('equals': Name@33) = ArrayList@149[1] { DeserializedSimpleFunctionDescriptor@150['equals'] } // through LazyJavaClassMemberScope@112
-    functions('finalize': Name@36) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('get': Name@151) = ArrayList@152[1] { JavaMethodDescriptor@153['get'] } // through LazyJavaClassMemberScope@112
-    functions('getClass': Name@40) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('getEntry': Name@154) = ArrayList@155[1] { JavaMethodDescriptor@156['getEntry'] } // through LazyJavaClassMemberScope@112
-    functions('getForNullKey': Name@157) = ArrayList@158[1] { JavaMethodDescriptor@159['getForNullKey'] } // through LazyJavaClassMemberScope@112
-    functions('hash': Name@160) = ArrayList@161[1] { JavaMethodDescriptor@162['hash'] } // through LazyJavaClassMemberScope@112
-    functions('hashCode': Name@44) = ArrayList@163[1] { DeserializedSimpleFunctionDescriptor@164['hashCode'] } // through LazyJavaClassMemberScope@112
-    functions('init': Name@165) = ArrayList@166[1] { JavaMethodDescriptor@167['init'] } // through LazyJavaClassMemberScope@112
-    functions('isEmpty': Name@168) = ArrayList@169[1] { JavaMethodDescriptor@170['isEmpty'] } // through LazyJavaClassMemberScope@112
-    functions('keySet': Name@171) = ArrayList@172[1] { JavaMethodDescriptor@173['keySet'] } // through LazyJavaClassMemberScope@112
-    functions('loadFactor': Name@174) = ArrayList@175[1] { JavaMethodDescriptor@176['loadFactor'] } // through LazyJavaClassMemberScope@112
-    functions('newEntryIterator': Name@177) = ArrayList@178[1] { JavaMethodDescriptor@179['newEntryIterator'] } // through LazyJavaClassMemberScope@112
-    functions('newKeyIterator': Name@180) = ArrayList@181[1] { JavaMethodDescriptor@182['newKeyIterator'] } // through LazyJavaClassMemberScope@112
-    functions('newValueIterator': Name@183) = ArrayList@184[1] { JavaMethodDescriptor@185['newValueIterator'] } // through LazyJavaClassMemberScope@112
-    functions('notify': Name@58) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('notifyAll': Name@59) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('put': Name@186) = ArrayList@187[1] { JavaMethodDescriptor@188['put'] } // through LazyJavaClassMemberScope@112
-    functions('putAll': Name@189) = ArrayList@190[1] { JavaMethodDescriptor@191['putAll'] } // through LazyJavaClassMemberScope@112
-    functions('putAllForCreate': Name@192) = ArrayList@193[1] { JavaMethodDescriptor@194['putAllForCreate'] } // through LazyJavaClassMemberScope@112
-    functions('putForCreate': Name@195) = ArrayList@196[1] { JavaMethodDescriptor@197['putForCreate'] } // through LazyJavaClassMemberScope@112
-    functions('putForNullKey': Name@198) = ArrayList@199[1] { JavaMethodDescriptor@200['putForNullKey'] } // through LazyJavaClassMemberScope@112
-    functions('readObject': Name@201) = ArrayList@202[1] { JavaMethodDescriptor@203['readObject'] } // through LazyJavaClassMemberScope@112
-    functions('remove': Name@204) = ArrayList@205[1] { JavaMethodDescriptor@206['remove'] } // through LazyJavaClassMemberScope@112
-    functions('removeEntryForKey': Name@207) = ArrayList@208[1] { JavaMethodDescriptor@209['removeEntryForKey'] } // through LazyJavaClassMemberScope@112
-    functions('removeMapping': Name@210) = ArrayList@211[1] { JavaMethodDescriptor@212['removeMapping'] } // through LazyJavaClassMemberScope@112
-    functions('resize': Name@213) = ArrayList@214[1] { JavaMethodDescriptor@215['resize'] } // through LazyJavaClassMemberScope@112
-    functions('size': Name@216) = ArrayList@217[1] { JavaMethodDescriptor@218['size'] } // through LazyJavaClassMemberScope@112
-    functions('toString': Name@79) = ArrayList@219[1] { DeserializedSimpleFunctionDescriptor@220['toString'] } // through LazyJavaClassMemberScope@112
-    functions('transfer': Name@221) = ArrayList@222[1] { JavaMethodDescriptor@223['transfer'] } // through LazyJavaClassMemberScope@112
-    functions('values': Name@224) = ArrayList@225[1] { JavaMethodDescriptor@226['values'] } // through LazyJavaClassMemberScope@112
-    functions('wait': Name@86) = EmptyList@3[empty] // through LazyJavaClassMemberScope@112
-    functions('writeObject': Name@227) = ArrayList@228[1] { JavaMethodDescriptor@229['writeObject'] } // through LazyJavaClassMemberScope@112
-    memberIndex = computeMemberIndex$1@230 // through LazyJavaClassMemberScope@112
-    nestedClassIndex = LinkedHashMap@231 // through LazyJavaClassMemberScope@112
-    nestedClasses('Entry': Name@2) = LazyJavaClassDescriptor@105['Entry'] // through LazyJavaClassMemberScope@112
-    nestedClasses('EntryIterator': Name@5) = LazyJavaClassDescriptor@232['EntryIterator'] // through LazyJavaClassMemberScope@112
-    nestedClasses('EntrySet': Name@6) = LazyJavaClassDescriptor@109['EntrySet'] // through LazyJavaClassMemberScope@112
-    nestedClasses('HashIterator': Name@7) = LazyJavaClassDescriptor@233['HashIterator'] // through LazyJavaClassMemberScope@112
-    nestedClasses('Holder': Name@8) = LazyJavaClassDescriptor@234['Holder'] // through LazyJavaClassMemberScope@112
-    nestedClasses('KeyIterator': Name@9) = LazyJavaClassDescriptor@235['KeyIterator'] // through LazyJavaClassMemberScope@112
-    nestedClasses('KeySet': Name@10) = LazyJavaClassDescriptor@111['KeySet'] // through LazyJavaClassMemberScope@112
-    nestedClasses('ValueIterator': Name@11) = LazyJavaClassDescriptor@236['ValueIterator'] // through LazyJavaClassMemberScope@112
-    nestedClasses('Values': Name@12) = LazyJavaClassDescriptor@110['Values'] // through LazyJavaClassMemberScope@112
-    properties('entrySet': Name@89) = ArrayList@237[1] { JavaPropertyDescriptor@238['entrySet'] } // through LazyJavaClassMemberScope@112
-    properties('hashSeed': Name@90) = ArrayList@239[1] { JavaPropertyDescriptor@240['hashSeed'] } // through LazyJavaClassMemberScope@112
-    properties('keySet': Name@91) = ArrayList@241[1] { PropertyDescriptorImpl@242['keySet'] } // through LazyJavaClassMemberScope@112
-    properties('loadFactor': Name@94) = ArrayList@243[1] { JavaPropertyDescriptor@244['loadFactor'] } // through LazyJavaClassMemberScope@112
-    properties('modCount': Name@95) = ArrayList@245[1] { JavaPropertyDescriptor@246['modCount'] } // through LazyJavaClassMemberScope@112
-    properties('size': Name@96) = ArrayList@247[1] { JavaPropertyDescriptor@248['size'] } // through LazyJavaClassMemberScope@112
-    properties('table': Name@97) = ArrayList@249[1] { JavaPropertyDescriptor@250['table'] } // through LazyJavaClassMemberScope@112
-    properties('threshold': Name@98) = ArrayList@251[1] { JavaPropertyDescriptor@252['threshold'] } // through LazyJavaClassMemberScope@112
-    properties('useAltHashing': Name@99) = ArrayList@253[1] { JavaPropertyDescriptor@254['useAltHashing'] } // through LazyJavaClassMemberScope@112
-    properties('values': Name@100) = ArrayList@255[1] { PropertyDescriptorImpl@256['values'] } // through LazyJavaClassMemberScope@112
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@257['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@258['HashMap']
-}
-
-LazyJavaClassDescriptor@259['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@260['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@261['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@262['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@263['Serializable'] {
-    defaultType = JetTypeImpl@264['Serializable']
-    functions('Entry': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('EntryIterator': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('EntrySet': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('HashIterator': Name@7) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('Holder': Name@8) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('KeyIterator': Name@9) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('KeySet': Name@10) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('ValueIterator': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('Values': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('addEntry': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('capacity': Name@14) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('clear': Name@15) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('clone': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('containsKey': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('containsNullValue': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('containsValue': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('createEntry': Name@28) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('entrySet': Name@29) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('entrySet0': Name@32) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('equals': Name@33) = ArrayList@266[1] { DeserializedSimpleFunctionDescriptor@267['equals'] } // through LazyJavaClassMemberScope@265
-    functions('finalize': Name@36) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('get': Name@37) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('getClass': Name@40) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('getEntry': Name@41) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('getForNullKey': Name@42) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('hash': Name@43) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('hashCode': Name@44) = ArrayList@268[1] { DeserializedSimpleFunctionDescriptor@269['hashCode'] } // through LazyJavaClassMemberScope@265
-    functions('init': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('isEmpty': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('keySet': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('loadFactor': Name@54) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('newEntryIterator': Name@55) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('newKeyIterator': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('newValueIterator': Name@57) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('notify': Name@58) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('notifyAll': Name@59) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('put': Name@60) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('putAll': Name@63) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('putAllForCreate': Name@66) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('putForCreate': Name@67) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('putForNullKey': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('readObject': Name@69) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('remove': Name@70) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('removeEntryForKey': Name@73) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('removeMapping': Name@74) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('resize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('size': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('toString': Name@79) = ArrayList@270[1] { DeserializedSimpleFunctionDescriptor@271['toString'] } // through LazyJavaClassMemberScope@265
-    functions('transfer': Name@82) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('values': Name@83) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('wait': Name@86) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    functions('writeObject': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    memberIndex = computeMemberIndex$1@272 // through LazyJavaClassMemberScope@265
-    properties('entrySet': Name@89) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('hashSeed': Name@90) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('keySet': Name@91) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('loadFactor': Name@94) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('modCount': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('size': Name@96) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('table': Name@97) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('threshold': Name@98) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('useAltHashing': Name@99) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    properties('values': Name@100) = EmptyList@3[empty] // through LazyJavaClassMemberScope@265
-    typeConstructor = LazyJavaClassTypeConstructor@273['Serializable']
-}
-
-LazyJavaClassTypeConstructor@104['AbstractMap'] {
-    parameters = ArrayList@274[2] { LazyJavaTypeParameterDescriptor@275['K'], LazyJavaTypeParameterDescriptor@276['V'] }
-    supertypes = ArrayList@277[1] { LazyJavaClassifierType@278['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@106['Entry'] {
-    parameters = ArrayList@279[2] { LazyJavaTypeParameterDescriptor@280['K'], LazyJavaTypeParameterDescriptor@281['V'] }
-}
-
-LazyJavaClassTypeConstructor@258['HashMap'] {
-    parameters = ArrayList@282[2] { LazyJavaTypeParameterDescriptor@283['K'], LazyJavaTypeParameterDescriptor@284['V'] }
-    supertypes = ArrayList@285[4] { LazyJavaClassifierType@286['AbstractMap<K, V>'], LazyJavaClassifierType@287['Map<K, V>'], LazyJavaClassifierType@288['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@260['ObjectInputStream'] {
-    parameters = ArrayList@289[empty]
-}
-
-LazyJavaClassTypeConstructor@262['ObjectOutputStream'] {
-    parameters = ArrayList@290[empty]
-}
-
-LazyJavaClassTypeConstructor@273['Serializable'] {
-    parameters = ArrayList@291[empty]
-    supertypes = ArrayList@292[1] { JetTypeImpl@293['Any'] }
-}
-
-LazyJavaClassifierType@286['AbstractMap<K, V>'] {
-    arguments = ArrayList@294[2] { TypeProjectionImpl@295, TypeProjectionImpl@296 }
-    classifier = JavaClassImpl@297['AbstractMap']
-    memberScope = SubstitutingScope@298
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@104['AbstractMap']
-}
-
-LazyJavaClassifierType@288['Cloneable'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaClassImpl@301['Cloneable']
-    memberScope = DeserializedClassMemberScope@302
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@303
-}
-
-LazyJavaClassifierType@304['Collection<V>'] {
-    arguments = ArrayList@305[1] { TypeProjectionImpl@306 }
-    classifier = JavaClassImpl@307['Collection']
-    memberScope = SubstitutingScope@308
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@309
-}
-
-LazyJavaClassifierType@310['Collection<V>'] {
-    arguments = ArrayList@311[1] { TypeProjectionImpl@312 }
-    classifier = JavaClassImpl@313['Collection']
-    memberScope = SubstitutingScope@314
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@309
-}
-
-LazyJavaClassifierType@315['Collection<V>'] {
-    arguments = ArrayList@316[1] { TypeProjectionImpl@317 }
-    classifier = JavaClassImpl@318['Collection']
-    memberScope = SubstitutingScope@319
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@309
-}
-
-LazyJavaClassifierType@320['Collection<V>'] {
-    arguments = ArrayList@321[1] { TypeProjectionImpl@322 }
-    classifier = JavaClassImpl@318['Collection']
-    memberScope = SubstitutingScope@323
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@326['Collection<V>'] {
-    arguments = ArrayList@327[1] { TypeProjectionImpl@328 }
-    classifier = JavaClassImpl@313['Collection']
-    memberScope = SubstitutingScope@329
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@330['Collection<V>'] {
-    arguments = ArrayList@331[1] { TypeProjectionImpl@332 }
-    classifier = JavaClassImpl@307['Collection']
-    memberScope = SubstitutingScope@333
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@334['Entry'] {
-    arguments = ArrayList@335[2] { LazyStarProjection@336, LazyStarProjection@337 }
-    classifier = JavaClassImpl@338['Entry']
-    memberScope = SubstitutingScope@339
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@340['Entry'] {
-    arguments = ArrayList@341[2] { LazyStarProjection@342, LazyStarProjection@343 }
-    classifier = JavaClassImpl@338['Entry']
-    memberScope = SubstitutingScope@344
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@345['Entry<K, V>'] {
-    arguments = ArrayList@346[2] { TypeProjectionImpl@347, TypeProjectionImpl@348 }
-    classifier = JavaClassImpl@349['Entry']
-    memberScope = SubstitutingScope@350
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@352['Entry<K, V>'] {
-    arguments = ArrayList@353[2] { TypeProjectionImpl@354, TypeProjectionImpl@355 }
-    classifier = JavaClassImpl@356['Entry']
-    memberScope = SubstitutingScope@357
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@358['Entry<K, V>'] {
-    arguments = ArrayList@359[2] { TypeProjectionImpl@360, TypeProjectionImpl@361 }
-    classifier = JavaClassImpl@362['Entry']
-    memberScope = SubstitutingScope@363
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@364['Entry<K, V>'] {
-    arguments = ArrayList@365[2] { TypeProjectionImpl@366, TypeProjectionImpl@367 }
-    classifier = JavaClassImpl@368['Entry']
-    memberScope = SubstitutingScope@369
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@370['Entry<K, V>'] {
-    arguments = ArrayList@371[2] { TypeProjectionImpl@372, TypeProjectionImpl@373 }
-    classifier = JavaClassImpl@374['Entry']
-    memberScope = SubstitutingScope@375
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@376['Entry<K, V>'] {
-    arguments = ArrayList@377[2] { TypeProjectionImpl@378, TypeProjectionImpl@379 }
-    classifier = JavaClassImpl@380['Entry']
-    memberScope = SubstitutingScope@381
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@382['Entry<K, V>'] {
-    arguments = ArrayList@383[2] { TypeProjectionImpl@384, TypeProjectionImpl@385 }
-    classifier = JavaClassImpl@386['Entry']
-    memberScope = SubstitutingScope@387
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@388['Entry<K, V>'] {
-    arguments = ArrayList@389[2] { TypeProjectionImpl@390, TypeProjectionImpl@391 }
-    classifier = JavaClassImpl@392['Entry']
-    memberScope = SubstitutingScope@393
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@394['Entry<K, V>'] {
-    arguments = ArrayList@395[2] { TypeProjectionImpl@396, TypeProjectionImpl@397 }
-    classifier = JavaClassImpl@398['Entry']
-    memberScope = SubstitutingScope@399
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@400['Entry<K, V>'] {
-    arguments = ArrayList@401[2] { TypeProjectionImpl@402, TypeProjectionImpl@403 }
-    classifier = JavaClassImpl@404['Entry']
-    memberScope = SubstitutingScope@405
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@351
-}
-
-LazyJavaClassifierType@406['Entry<K, V>'] {
-    arguments = ArrayList@407[2] { TypeProjectionImpl@408, TypeProjectionImpl@409 }
-    classifier = JavaClassImpl@410['Entry']
-    memberScope = SubstitutingScope@411
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@412['Entry<K, V>'] {
-    arguments = ArrayList@413[2] { TypeProjectionImpl@414, TypeProjectionImpl@415 }
-    classifier = JavaClassImpl@416['Entry']
-    memberScope = SubstitutingScope@417
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@418['Entry<K, V>'] {
-    arguments = ArrayList@419[2] { TypeProjectionImpl@420, TypeProjectionImpl@421 }
-    classifier = JavaClassImpl@422['Entry']
-    memberScope = SubstitutingScope@423
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@424['Entry<K, V>'] {
-    arguments = ArrayList@425[2] { TypeProjectionImpl@426, TypeProjectionImpl@427 }
-    classifier = JavaClassImpl@428['Entry']
-    memberScope = SubstitutingScope@429
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@430['Entry<K, V>'] {
-    arguments = ArrayList@431[2] { TypeProjectionImpl@432, TypeProjectionImpl@433 }
-    classifier = JavaClassImpl@349['Entry']
-    memberScope = SubstitutingScope@434
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@436['Entry<K, V>'] {
-    arguments = ArrayList@437[2] { TypeProjectionImpl@438, TypeProjectionImpl@439 }
-    classifier = JavaClassImpl@356['Entry']
-    memberScope = SubstitutingScope@440
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@441['Entry<K, V>'] {
-    arguments = ArrayList@442[2] { TypeProjectionImpl@443, TypeProjectionImpl@444 }
-    classifier = JavaClassImpl@398['Entry']
-    memberScope = SubstitutingScope@445
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@446['Entry<K, V>'] {
-    arguments = ArrayList@447[2] { TypeProjectionImpl@448, TypeProjectionImpl@449 }
-    classifier = JavaClassImpl@362['Entry']
-    memberScope = SubstitutingScope@450
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@451['Entry<K, V>'] {
-    arguments = ArrayList@452[2] { TypeProjectionImpl@453, TypeProjectionImpl@454 }
-    classifier = JavaClassImpl@374['Entry']
-    memberScope = SubstitutingScope@455
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@456['Entry<K, V>'] {
-    arguments = ArrayList@457[2] { TypeProjectionImpl@458, TypeProjectionImpl@459 }
-    classifier = JavaClassImpl@380['Entry']
-    memberScope = SubstitutingScope@460
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@461['Entry<K, V>'] {
-    arguments = ArrayList@462[2] { TypeProjectionImpl@463, TypeProjectionImpl@464 }
-    classifier = JavaClassImpl@386['Entry']
-    memberScope = SubstitutingScope@465
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@466['Entry<K, V>'] {
-    arguments = ArrayList@467[2] { TypeProjectionImpl@468, TypeProjectionImpl@469 }
-    classifier = JavaClassImpl@368['Entry']
-    memberScope = SubstitutingScope@470
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@471['Entry<K, V>'] {
-    arguments = ArrayList@472[2] { TypeProjectionImpl@473, TypeProjectionImpl@474 }
-    classifier = JavaClassImpl@404['Entry']
-    memberScope = SubstitutingScope@475
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@476['Entry<K, V>'] {
-    arguments = ArrayList@477[2] { TypeProjectionImpl@478, TypeProjectionImpl@479 }
-    classifier = JavaClassImpl@392['Entry']
-    memberScope = SubstitutingScope@480
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@435
-}
-
-LazyJavaClassifierType@481['Entry<K, V>'] {
-    arguments = ArrayList@482[2] { TypeProjectionImpl@483, TypeProjectionImpl@484 }
-    classifier = JavaClassImpl@416['Entry']
-    memberScope = SubstitutingScope@485
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@486['Entry<K, V>'] {
-    arguments = ArrayList@487[2] { TypeProjectionImpl@488, TypeProjectionImpl@489 }
-    classifier = JavaClassImpl@410['Entry']
-    memberScope = SubstitutingScope@490
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@491['Entry<K, V>'] {
-    arguments = ArrayList@492[2] { TypeProjectionImpl@493, TypeProjectionImpl@494 }
-    classifier = JavaClassImpl@428['Entry']
-    memberScope = SubstitutingScope@495
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@496['Entry<K, V>'] {
-    arguments = ArrayList@497[2] { TypeProjectionImpl@498, TypeProjectionImpl@499 }
-    classifier = JavaClassImpl@422['Entry']
-    memberScope = SubstitutingScope@500
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
-}
-
-LazyJavaClassifierType@501['Iterator<Entry<K, V>>'] {
-    arguments = ArrayList@502[1] { TypeProjectionImpl@503 }
-    classifier = JavaClassImpl@504['Iterator']
-    memberScope = SubstitutingScope@505
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@506
-}
-
-LazyJavaClassifierType@507['Iterator<Entry<K, V>>'] {
-    arguments = ArrayList@508[1] { TypeProjectionImpl@509 }
-    classifier = JavaClassImpl@504['Iterator']
-    memberScope = SubstitutingScope@510
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@511
-}
-
-LazyJavaClassifierType@512['Iterator<K>'] {
-    arguments = ArrayList@513[1] { TypeProjectionImpl@514 }
-    classifier = JavaClassImpl@515['Iterator']
-    memberScope = SubstitutingScope@516
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@506
-}
-
-LazyJavaClassifierType@517['Iterator<K>'] {
-    arguments = ArrayList@518[1] { TypeProjectionImpl@519 }
-    classifier = JavaClassImpl@515['Iterator']
-    memberScope = SubstitutingScope@520
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@511
-}
-
-LazyJavaClassifierType@521['Iterator<V>'] {
-    arguments = ArrayList@522[1] { TypeProjectionImpl@523 }
-    classifier = JavaClassImpl@524['Iterator']
-    memberScope = SubstitutingScope@525
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@506
-}
-
-LazyJavaClassifierType@526['Iterator<V>'] {
-    arguments = ArrayList@527[1] { TypeProjectionImpl@528 }
-    classifier = JavaClassImpl@524['Iterator']
-    memberScope = SubstitutingScope@529
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@511
-}
-
-LazyJavaClassifierType@530['K'] {
-    arguments = ArrayList@531[empty]
-    classifier = JavaTypeParameterImpl@532['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@534['K'] {
-    arguments = ArrayList@535[empty]
-    classifier = JavaTypeParameterImpl@536['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@538['K'] {
-    arguments = ArrayList@539[empty]
-    classifier = JavaTypeParameterImpl@540['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@541['K'] {
-    arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@543['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@544['K'] {
-    arguments = ArrayList@545[empty]
-    classifier = JavaTypeParameterImpl@546['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@547['K'] {
-    arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@549['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@550['K'] {
-    arguments = ArrayList@551[empty]
-    classifier = JavaTypeParameterImpl@552['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@553['K'] {
-    arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@555['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@556['K'] {
-    arguments = ArrayList@557[empty]
-    classifier = JavaTypeParameterImpl@558['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@559['K'] {
-    arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@561['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@562['K'] {
-    arguments = ArrayList@563[empty]
-    classifier = JavaTypeParameterImpl@564['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@565['K'] {
-    arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@567['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@568['K'] {
-    arguments = ArrayList@569[empty]
-    classifier = JavaTypeParameterImpl@570['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@571['K'] {
-    arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@573['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@574['K'] {
-    arguments = ArrayList@575[empty]
-    classifier = JavaTypeParameterImpl@576['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@577['K'] {
-    arguments = ArrayList@578[empty]
-    classifier = JavaTypeParameterImpl@579['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@580['K'] {
-    arguments = ArrayList@581[empty]
-    classifier = JavaTypeParameterImpl@582['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@583['K'] {
-    arguments = ArrayList@584[empty]
-    classifier = JavaTypeParameterImpl@585['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@586['K'] {
-    arguments = ArrayList@587[empty]
-    classifier = JavaTypeParameterImpl@588['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@589['K'] {
-    arguments = ArrayList@590[empty]
-    classifier = JavaTypeParameterImpl@591['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@592['K'] {
-    arguments = ArrayList@593[empty]
-    classifier = JavaTypeParameterImpl@594['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@595['K'] {
-    arguments = ArrayList@596[empty]
-    classifier = JavaTypeParameterImpl@597['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@598['K'] {
-    arguments = ArrayList@599[empty]
-    classifier = JavaTypeParameterImpl@600['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@601['K'] {
-    arguments = ArrayList@602[empty]
-    classifier = JavaTypeParameterImpl@603['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@604['K'] {
-    arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@606['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@607['K'] {
-    arguments = ArrayList@608[empty]
-    classifier = JavaTypeParameterImpl@609['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@610['K'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@612['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@613['K'] {
-    arguments = ArrayList@614[empty]
-    classifier = JavaTypeParameterImpl@615['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@616['K'] {
-    arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@618['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@619['K'] {
-    arguments = ArrayList@620[empty]
-    classifier = JavaTypeParameterImpl@621['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@622['K'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@624['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@625['K'] {
-    arguments = ArrayList@626[empty]
-    classifier = JavaTypeParameterImpl@627['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@628['K'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@630['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@631['K'] {
-    arguments = ArrayList@632[empty]
-    classifier = JavaTypeParameterImpl@633['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@634['K'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@636['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@637['K'] {
-    arguments = ArrayList@638[empty]
-    classifier = JavaTypeParameterImpl@639['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@640['K'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@642['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@643['K'] {
-    arguments = ArrayList@644[empty]
-    classifier = JavaTypeParameterImpl@645['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@646['K'] {
-    arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@648['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@649['K'] {
-    arguments = ArrayList@650[empty]
-    classifier = JavaTypeParameterImpl@651['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@652['K'] {
-    arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@654['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@655['K'] {
-    arguments = ArrayList@656[empty]
-    classifier = JavaTypeParameterImpl@657['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@658['K'] {
-    arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@660['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@661['K'] {
-    arguments = ArrayList@662[empty]
-    classifier = JavaTypeParameterImpl@663['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@664['K'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@666['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@667['K'] {
-    arguments = ArrayList@668[empty]
-    classifier = JavaTypeParameterImpl@669['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@670['K'] {
-    arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@672['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@673['K'] {
-    arguments = ArrayList@674[empty]
-    classifier = JavaTypeParameterImpl@675['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@676['K'] {
-    arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@678['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@679['K'] {
-    arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@681['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@682['K'] {
-    arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@684['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@685['K'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@687['K']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@688['K'] {
-    arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@606['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@690['K'] {
-    arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@573['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@692['K'] {
-    arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@582['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@694['K'] {
-    arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@651['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@696['K'] {
-    arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@657['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@698['K'] {
-    arguments = ArrayList@699[empty]
-    classifier = JavaTypeParameterImpl@579['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@700['K'] {
-    arguments = ArrayList@701[empty]
-    classifier = JavaTypeParameterImpl@536['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@702['K'] {
-    arguments = ArrayList@703[empty]
-    classifier = JavaTypeParameterImpl@585['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@704['K'] {
-    arguments = ArrayList@705[empty]
-    classifier = JavaTypeParameterImpl@588['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@706['K'] {
-    arguments = ArrayList@707[empty]
-    classifier = JavaTypeParameterImpl@561['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@708['K'] {
-    arguments = ArrayList@709[empty]
-    classifier = JavaTypeParameterImpl@591['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@710['K'] {
-    arguments = ArrayList@711[empty]
-    classifier = JavaTypeParameterImpl@639['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@712['K'] {
-    arguments = ArrayList@713[empty]
-    classifier = JavaTypeParameterImpl@570['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@714['K'] {
-    arguments = ArrayList@715[empty]
-    classifier = JavaTypeParameterImpl@633['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@716['K'] {
-    arguments = ArrayList@717[empty]
-    classifier = JavaTypeParameterImpl@597['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@718['K'] {
-    arguments = ArrayList@719[empty]
-    classifier = JavaTypeParameterImpl@648['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@720['K'] {
-    arguments = ArrayList@721[empty]
-    classifier = JavaTypeParameterImpl@663['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@722['K'] {
-    arguments = ArrayList@723[empty]
-    classifier = JavaTypeParameterImpl@624['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@724['K'] {
-    arguments = ArrayList@725[empty]
-    classifier = JavaTypeParameterImpl@681['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@726['K'] {
-    arguments = ArrayList@727[empty]
-    classifier = JavaTypeParameterImpl@552['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@728['K'] {
-    arguments = ArrayList@729[empty]
-    classifier = JavaTypeParameterImpl@600['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@730['K'] {
-    arguments = ArrayList@731[empty]
-    classifier = JavaTypeParameterImpl@636['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@732['K'] {
-    arguments = ArrayList@733[empty]
-    classifier = JavaTypeParameterImpl@532['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@734['K'] {
-    arguments = ArrayList@735[empty]
-    classifier = JavaTypeParameterImpl@642['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@736['K'] {
-    arguments = ArrayList@737[empty]
-    classifier = JavaTypeParameterImpl@654['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@738['K'] {
-    arguments = ArrayList@739[empty]
-    classifier = JavaTypeParameterImpl@594['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@740['K'] {
-    arguments = ArrayList@741[empty]
-    classifier = JavaTypeParameterImpl@666['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@742['K'] {
-    arguments = ArrayList@743[empty]
-    classifier = JavaTypeParameterImpl@687['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@744['K'] {
-    arguments = ArrayList@745[empty]
-    classifier = JavaTypeParameterImpl@555['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@746['K'] {
-    arguments = ArrayList@747[empty]
-    classifier = JavaTypeParameterImpl@540['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@748['K'] {
-    arguments = ArrayList@749[empty]
-    classifier = JavaTypeParameterImpl@684['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@750['K'] {
-    arguments = ArrayList@751[empty]
-    classifier = JavaTypeParameterImpl@612['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@752['K'] {
-    arguments = ArrayList@753[empty]
-    classifier = JavaTypeParameterImpl@660['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@754['K'] {
-    arguments = ArrayList@755[empty]
-    classifier = JavaTypeParameterImpl@615['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@756['K'] {
-    arguments = ArrayList@757[empty]
-    classifier = JavaTypeParameterImpl@546['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@758['K'] {
-    arguments = ArrayList@759[empty]
-    classifier = JavaTypeParameterImpl@603['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@760['K'] {
-    arguments = ArrayList@761[empty]
-    classifier = JavaTypeParameterImpl@549['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@762['K'] {
-    arguments = ArrayList@763[empty]
-    classifier = JavaTypeParameterImpl@576['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@764['K'] {
-    arguments = ArrayList@765[empty]
-    classifier = JavaTypeParameterImpl@567['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@766['K'] {
-    arguments = ArrayList@767[empty]
-    classifier = JavaTypeParameterImpl@645['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@768['K'] {
-    arguments = ArrayList@769[empty]
-    classifier = JavaTypeParameterImpl@678['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@770['K'] {
-    arguments = ArrayList@771[empty]
-    classifier = JavaTypeParameterImpl@558['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@772['K'] {
-    arguments = ArrayList@773[empty]
-    classifier = JavaTypeParameterImpl@543['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@774['K'] {
-    arguments = ArrayList@775[empty]
-    classifier = JavaTypeParameterImpl@672['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@776['K'] {
-    arguments = ArrayList@777[empty]
-    classifier = JavaTypeParameterImpl@618['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@778['K'] {
-    arguments = ArrayList@779[empty]
-    classifier = JavaTypeParameterImpl@621['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@780['K'] {
-    arguments = ArrayList@781[empty]
-    classifier = JavaTypeParameterImpl@609['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@782['K'] {
-    arguments = ArrayList@783[empty]
-    classifier = JavaTypeParameterImpl@564['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@784['K'] {
-    arguments = ArrayList@785[empty]
-    classifier = JavaTypeParameterImpl@630['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@786['K'] {
-    arguments = ArrayList@787[empty]
-    classifier = JavaTypeParameterImpl@669['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@788['K'] {
-    arguments = ArrayList@789[empty]
-    classifier = JavaTypeParameterImpl@627['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-}
-
-LazyJavaClassifierType@790['K'] {
-    arguments = ArrayList@791[empty]
-    classifier = JavaTypeParameterImpl@675['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@792['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@793[2] { TypeProjectionImpl@794, TypeProjectionImpl@795 }
-    classifier = JavaClassImpl@796['Map']
-    memberScope = SubstitutingScope@797
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@799['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@800[2] { TypeProjectionImpl@801, TypeProjectionImpl@802 }
-    classifier = JavaClassImpl@803['Map']
-    memberScope = SubstitutingScope@804
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@805['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@806[2] { TypeProjectionImpl@807, TypeProjectionImpl@808 }
-    classifier = JavaClassImpl@809['Map']
-    memberScope = SubstitutingScope@810
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@811['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@812[2] { TypeProjectionImpl@813, TypeProjectionImpl@814 }
-    classifier = JavaClassImpl@815['Map']
-    memberScope = SubstitutingScope@816
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@817['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@818[2] { TypeProjectionImpl@819, TypeProjectionImpl@820 }
-    classifier = JavaClassImpl@796['Map']
-    memberScope = SubstitutingScope@821
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@822
-}
-
-LazyJavaClassifierType@823['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@824[2] { TypeProjectionImpl@825, TypeProjectionImpl@826 }
-    classifier = JavaClassImpl@809['Map']
-    memberScope = SubstitutingScope@827
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@822
-}
-
-LazyJavaClassifierType@828['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@829[2] { TypeProjectionImpl@830, TypeProjectionImpl@831 }
-    classifier = JavaClassImpl@815['Map']
-    memberScope = SubstitutingScope@832
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@822
-}
-
-LazyJavaClassifierType@833['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@834[2] { TypeProjectionImpl@835, TypeProjectionImpl@836 }
-    classifier = JavaClassImpl@803['Map']
-    memberScope = SubstitutingScope@837
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@822
-}
-
-LazyJavaClassifierType@278['Map<K, V>'] {
-    arguments = ArrayList@838[2] { TypeProjectionImpl@839, TypeProjectionImpl@840 }
-    classifier = JavaClassImpl@841['Map']
-    memberScope = SubstitutingScope@842
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@287['Map<K, V>'] {
-    arguments = ArrayList@843[2] { TypeProjectionImpl@844, TypeProjectionImpl@845 }
-    classifier = JavaClassImpl@846['Map']
-    memberScope = SubstitutingScope@847
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@798
-}
-
-LazyJavaClassifierType@848['Object'] {
-    arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@850['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@853['Object'] {
-    arguments = ArrayList@854[empty]
-    classifier = JavaClassImpl@855['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@856['Object'] {
-    arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@858['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@859['Object'] {
-    arguments = ArrayList@860[empty]
-    classifier = JavaClassImpl@861['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@862['Object'] {
-    arguments = ArrayList@863[empty]
-    classifier = JavaClassImpl@864['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@865['Object'] {
-    arguments = ArrayList@866[empty]
-    classifier = JavaClassImpl@867['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@868['Object'] {
-    arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@870['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@871['Object'] {
-    arguments = ArrayList@872[empty]
-    classifier = JavaClassImpl@873['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@874['Object'] {
-    arguments = ArrayList@875[empty]
-    classifier = JavaClassImpl@876['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@877['Object'] {
-    arguments = ArrayList@878[empty]
-    classifier = JavaClassImpl@879['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@880['Object'] {
-    arguments = ArrayList@881[empty]
-    classifier = JavaClassImpl@882['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@883['Object'] {
-    arguments = ArrayList@884[empty]
-    classifier = JavaClassImpl@885['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@886['Object'] {
-    arguments = ArrayList@887[empty]
-    classifier = JavaClassImpl@888['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@889['Object'] {
-    arguments = ArrayList@890[empty]
-    classifier = JavaClassImpl@891['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@892['Object'] {
-    arguments = ArrayList@893[empty]
-    classifier = JavaClassImpl@894['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@895['Object'] {
-    arguments = ArrayList@896[empty]
-    classifier = JavaClassImpl@850['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@897['Object'] {
-    arguments = ArrayList@898[empty]
-    classifier = JavaClassImpl@867['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@899['Object'] {
-    arguments = ArrayList@900[empty]
-    classifier = JavaClassImpl@861['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@901['Object'] {
-    arguments = ArrayList@902[empty]
-    classifier = JavaClassImpl@876['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@903['Object'] {
-    arguments = ArrayList@904[empty]
-    classifier = JavaClassImpl@870['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@905['Object'] {
-    arguments = ArrayList@906[empty]
-    classifier = JavaClassImpl@855['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@907['Object'] {
-    arguments = ArrayList@908[empty]
-    classifier = JavaClassImpl@888['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@909['Object'] {
-    arguments = ArrayList@910[empty]
-    classifier = JavaClassImpl@864['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@911['Object'] {
-    arguments = ArrayList@912[empty]
-    classifier = JavaClassImpl@894['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@913['Object'] {
-    arguments = ArrayList@914[empty]
-    classifier = JavaClassImpl@879['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@915['Object'] {
-    arguments = ArrayList@916[empty]
-    classifier = JavaClassImpl@882['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@917['Object'] {
-    arguments = ArrayList@918[empty]
-    classifier = JavaClassImpl@891['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@919['Object'] {
-    arguments = ArrayList@920[empty]
-    classifier = JavaClassImpl@885['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@921['Object'] {
-    arguments = ArrayList@922[empty]
-    classifier = JavaClassImpl@873['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@923['Object'] {
-    arguments = ArrayList@924[empty]
-    classifier = JavaClassImpl@858['Object']
-    memberScope = DeserializedClassMemberScope@851
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@925['Object'] {
-    classifier = JavaClassImpl@926['Object']
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@927['Object'] {
-    classifier = JavaClassImpl@928['Object']
-    typeConstructor = DeserializedClassTypeConstructor@852
-}
-
-LazyJavaClassifierType@929['ObjectInputStream'] {
-    arguments = ArrayList@930[empty]
-    classifier = JavaClassImpl@931['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@932
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@260['ObjectInputStream']
-}
-
-LazyJavaClassifierType@933['ObjectInputStream'] {
-    arguments = ArrayList@934[empty]
-    classifier = JavaClassImpl@931['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@932
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@260['ObjectInputStream']
-}
-
-LazyJavaClassifierType@935['ObjectOutputStream'] {
-    arguments = ArrayList@936[empty]
-    classifier = JavaClassImpl@937['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@938
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@262['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@939['ObjectOutputStream'] {
-    arguments = ArrayList@940[empty]
-    classifier = JavaClassImpl@937['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@938
-    nullable = 'true': Boolean@324
-    typeConstructor = LazyJavaClassTypeConstructor@262['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@941['Serializable'] {
-    arguments = ArrayList@942[empty]
-    classifier = JavaClassImpl@943['Serializable']
-    memberScope = LazyJavaClassMemberScope@265
-    nullable = 'false': Boolean@299
-    typeConstructor = LazyJavaClassTypeConstructor@273['Serializable']
-}
-
-LazyJavaClassifierType@944['Set<Entry<K, V>>'] {
-    arguments = ArrayList@945[1] { TypeProjectionImpl@946 }
-    classifier = JavaClassImpl@947['Set']
-    memberScope = SubstitutingScope@948
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@950['Set<Entry<K, V>>'] {
-    arguments = ArrayList@951[1] { TypeProjectionImpl@952 }
-    classifier = JavaClassImpl@953['Set']
-    memberScope = SubstitutingScope@954
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@955['Set<Entry<K, V>>'] {
-    arguments = ArrayList@956[1] { TypeProjectionImpl@957 }
-    classifier = JavaClassImpl@958['Set']
-    memberScope = SubstitutingScope@959
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@960['Set<Entry<K, V>>'] {
-    arguments = ArrayList@961[1] { TypeProjectionImpl@962 }
-    classifier = JavaClassImpl@963['Set']
-    memberScope = SubstitutingScope@964
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@965['Set<Entry<K, V>>'] {
-    arguments = ArrayList@966[1] { TypeProjectionImpl@967 }
-    classifier = JavaClassImpl@963['Set']
-    memberScope = SubstitutingScope@968
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@970['Set<Entry<K, V>>'] {
-    arguments = ArrayList@971[1] { TypeProjectionImpl@972 }
-    classifier = JavaClassImpl@953['Set']
-    memberScope = SubstitutingScope@973
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@974['Set<Entry<K, V>>'] {
-    arguments = ArrayList@975[1] { TypeProjectionImpl@976 }
-    classifier = JavaClassImpl@958['Set']
-    memberScope = SubstitutingScope@977
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@978['Set<Entry<K, V>>'] {
-    arguments = ArrayList@979[1] { TypeProjectionImpl@980 }
-    classifier = JavaClassImpl@947['Set']
-    memberScope = SubstitutingScope@981
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@982['Set<K>'] {
-    arguments = ArrayList@983[1] { TypeProjectionImpl@984 }
-    classifier = JavaClassImpl@985['Set']
-    memberScope = SubstitutingScope@986
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@987['Set<K>'] {
-    arguments = ArrayList@988[1] { TypeProjectionImpl@989 }
-    classifier = JavaClassImpl@990['Set']
-    memberScope = SubstitutingScope@991
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@992['Set<K>'] {
-    arguments = ArrayList@993[1] { TypeProjectionImpl@994 }
-    classifier = JavaClassImpl@995['Set']
-    memberScope = SubstitutingScope@996
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@949
-}
-
-LazyJavaClassifierType@997['Set<K>'] {
-    arguments = ArrayList@998[1] { TypeProjectionImpl@999 }
-    classifier = JavaClassImpl@990['Set']
-    memberScope = SubstitutingScope@1000
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@1001['Set<K>'] {
-    arguments = ArrayList@1002[1] { TypeProjectionImpl@1003 }
-    classifier = JavaClassImpl@985['Set']
-    memberScope = SubstitutingScope@1004
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@1005['Set<K>'] {
-    arguments = ArrayList@1006[1] { TypeProjectionImpl@1007 }
-    classifier = JavaClassImpl@995['Set']
-    memberScope = SubstitutingScope@1008
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@969
-}
-
-LazyJavaClassifierType@1009['String'] {
-    arguments = ArrayList@1010[empty]
-    classifier = JavaClassImpl@1011['String']
-    memberScope = DeserializedClassMemberScope@1012
-    nullable = 'false': Boolean@299
-    typeConstructor = DeserializedClassTypeConstructor@1013
-}
-
-LazyJavaClassifierType@1014['String'] {
-    arguments = ArrayList@1015[empty]
-    classifier = JavaClassImpl@1011['String']
-    memberScope = DeserializedClassMemberScope@1012
-    nullable = 'true': Boolean@324
-    typeConstructor = DeserializedClassTypeConstructor@1013
-}
-
-LazyJavaClassifierType@1016['V'] {
-    arguments = ArrayList@1017[empty]
-    classifier = JavaTypeParameterImpl@1018['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1020['V'] {
-    arguments = ArrayList@1021[empty]
-    classifier = JavaTypeParameterImpl@1022['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1023['V'] {
-    arguments = ArrayList@1024[empty]
-    classifier = JavaTypeParameterImpl@1025['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1027['V'] {
-    arguments = ArrayList@1028[empty]
-    classifier = JavaTypeParameterImpl@1029['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1030['V'] {
-    arguments = ArrayList@1031[empty]
-    classifier = JavaTypeParameterImpl@1032['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1033['V'] {
-    arguments = ArrayList@1034[empty]
-    classifier = JavaTypeParameterImpl@1035['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1036['V'] {
-    arguments = ArrayList@1037[empty]
-    classifier = JavaTypeParameterImpl@1038['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1039['V'] {
-    arguments = ArrayList@1040[empty]
-    classifier = JavaTypeParameterImpl@1041['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1042['V'] {
-    arguments = ArrayList@1043[empty]
-    classifier = JavaTypeParameterImpl@1044['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1045['V'] {
-    arguments = ArrayList@1046[empty]
-    classifier = JavaTypeParameterImpl@1047['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1048['V'] {
-    arguments = ArrayList@1049[empty]
-    classifier = JavaTypeParameterImpl@1050['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1051['V'] {
-    arguments = ArrayList@1052[empty]
-    classifier = JavaTypeParameterImpl@1053['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1054['V'] {
-    arguments = ArrayList@1055[empty]
-    classifier = JavaTypeParameterImpl@1056['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1057['V'] {
-    arguments = ArrayList@1058[empty]
-    classifier = JavaTypeParameterImpl@1059['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1060['V'] {
-    arguments = ArrayList@1061[empty]
-    classifier = JavaTypeParameterImpl@1062['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1063['V'] {
-    arguments = ArrayList@1064[empty]
-    classifier = JavaTypeParameterImpl@1065['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1066['V'] {
-    arguments = ArrayList@1067[empty]
-    classifier = JavaTypeParameterImpl@1068['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1069['V'] {
-    arguments = ArrayList@1070[empty]
-    classifier = JavaTypeParameterImpl@1071['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1072['V'] {
-    arguments = ArrayList@1073[empty]
-    classifier = JavaTypeParameterImpl@1074['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1075['V'] {
-    arguments = ArrayList@1076[empty]
-    classifier = JavaTypeParameterImpl@1077['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1078['V'] {
-    arguments = ArrayList@1079[empty]
-    classifier = JavaTypeParameterImpl@1080['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1081['V'] {
-    arguments = ArrayList@1082[empty]
-    classifier = JavaTypeParameterImpl@1083['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1084['V'] {
-    arguments = ArrayList@1085[empty]
-    classifier = JavaTypeParameterImpl@1086['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1087['V'] {
-    arguments = ArrayList@1088[empty]
-    classifier = JavaTypeParameterImpl@1089['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1090['V'] {
-    arguments = ArrayList@1091[empty]
-    classifier = JavaTypeParameterImpl@1092['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1093['V'] {
-    arguments = ArrayList@1094[empty]
-    classifier = JavaTypeParameterImpl@1095['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1096['V'] {
-    arguments = ArrayList@1097[empty]
-    classifier = JavaTypeParameterImpl@1098['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1099['V'] {
-    arguments = ArrayList@1100[empty]
-    classifier = JavaTypeParameterImpl@1101['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1102['V'] {
-    arguments = ArrayList@1103[empty]
-    classifier = JavaTypeParameterImpl@1104['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1105['V'] {
-    arguments = ArrayList@1106[empty]
-    classifier = JavaTypeParameterImpl@1107['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1108['V'] {
-    arguments = ArrayList@1109[empty]
-    classifier = JavaTypeParameterImpl@1110['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1111['V'] {
-    arguments = ArrayList@1112[empty]
-    classifier = JavaTypeParameterImpl@1113['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1114['V'] {
-    arguments = ArrayList@1115[empty]
-    classifier = JavaTypeParameterImpl@1116['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1117['V'] {
-    arguments = ArrayList@1118[empty]
-    classifier = JavaTypeParameterImpl@1119['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1120['V'] {
-    arguments = ArrayList@1121[empty]
-    classifier = JavaTypeParameterImpl@1122['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1123['V'] {
-    arguments = ArrayList@1124[empty]
-    classifier = JavaTypeParameterImpl@1125['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1126['V'] {
-    arguments = ArrayList@1127[empty]
-    classifier = JavaTypeParameterImpl@1128['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1129['V'] {
-    arguments = ArrayList@1130[empty]
-    classifier = JavaTypeParameterImpl@1131['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1132['V'] {
-    arguments = ArrayList@1133[empty]
-    classifier = JavaTypeParameterImpl@1134['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1135['V'] {
-    arguments = ArrayList@1136[empty]
-    classifier = JavaTypeParameterImpl@1137['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1138['V'] {
-    arguments = ArrayList@1139[empty]
-    classifier = JavaTypeParameterImpl@1140['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1141['V'] {
-    arguments = ArrayList@1142[empty]
-    classifier = JavaTypeParameterImpl@1143['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1144['V'] {
-    arguments = ArrayList@1145[empty]
-    classifier = JavaTypeParameterImpl@1146['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1147['V'] {
-    arguments = ArrayList@1148[empty]
-    classifier = JavaTypeParameterImpl@1149['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1150['V'] {
-    arguments = ArrayList@1151[empty]
-    classifier = JavaTypeParameterImpl@1152['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1153['V'] {
-    arguments = ArrayList@1154[empty]
-    classifier = JavaTypeParameterImpl@1155['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1156['V'] {
-    arguments = ArrayList@1157[empty]
-    classifier = JavaTypeParameterImpl@1158['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1159['V'] {
-    arguments = ArrayList@1160[empty]
-    classifier = JavaTypeParameterImpl@1161['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1162['V'] {
-    arguments = ArrayList@1163[empty]
-    classifier = JavaTypeParameterImpl@1164['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1165['V'] {
-    arguments = ArrayList@1166[empty]
-    classifier = JavaTypeParameterImpl@1167['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1168['V'] {
-    arguments = ArrayList@1169[empty]
-    classifier = JavaTypeParameterImpl@1170['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1171['V'] {
-    arguments = ArrayList@1172[empty]
-    classifier = JavaTypeParameterImpl@1173['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1174['V'] {
-    arguments = ArrayList@1175[empty]
-    classifier = JavaTypeParameterImpl@1176['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1177['V'] {
-    arguments = ArrayList@1178[empty]
-    classifier = JavaTypeParameterImpl@1179['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1180['V'] {
-    arguments = ArrayList@1181[empty]
-    classifier = JavaTypeParameterImpl@1182['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1183['V'] {
-    arguments = ArrayList@1184[empty]
-    classifier = JavaTypeParameterImpl@1185['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1186['V'] {
-    arguments = ArrayList@1187[empty]
-    classifier = JavaTypeParameterImpl@1188['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1189['V'] {
-    arguments = ArrayList@1190[empty]
-    classifier = JavaTypeParameterImpl@1191['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1192['V'] {
-    arguments = ArrayList@1193[empty]
-    classifier = JavaTypeParameterImpl@1194['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1195['V'] {
-    arguments = ArrayList@1196[empty]
-    classifier = JavaTypeParameterImpl@1197['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1198['V'] {
-    arguments = ArrayList@1199[empty]
-    classifier = JavaTypeParameterImpl@1200['V']
-    nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1201['V'] {
-    arguments = ArrayList@1202[empty]
-    classifier = JavaTypeParameterImpl@1074['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1203['V'] {
-    arguments = ArrayList@1204[empty]
-    classifier = JavaTypeParameterImpl@1182['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1205['V'] {
-    arguments = ArrayList@1206[empty]
-    classifier = JavaTypeParameterImpl@1065['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1207['V'] {
-    arguments = ArrayList@1208[empty]
-    classifier = JavaTypeParameterImpl@1035['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1209['V'] {
-    arguments = ArrayList@1210[empty]
-    classifier = JavaTypeParameterImpl@1137['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1211['V'] {
-    arguments = ArrayList@1212[empty]
-    classifier = JavaTypeParameterImpl@1022['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1213['V'] {
-    arguments = ArrayList@1214[empty]
-    classifier = JavaTypeParameterImpl@1200['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1215['V'] {
-    arguments = ArrayList@1216[empty]
-    classifier = JavaTypeParameterImpl@1086['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1217['V'] {
-    arguments = ArrayList@1218[empty]
-    classifier = JavaTypeParameterImpl@1140['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1219['V'] {
-    arguments = ArrayList@1220[empty]
-    classifier = JavaTypeParameterImpl@1077['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1221['V'] {
-    arguments = ArrayList@1222[empty]
-    classifier = JavaTypeParameterImpl@1146['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1223['V'] {
-    arguments = ArrayList@1224[empty]
-    classifier = JavaTypeParameterImpl@1104['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1225['V'] {
-    arguments = ArrayList@1226[empty]
-    classifier = JavaTypeParameterImpl@1194['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1227['V'] {
-    arguments = ArrayList@1228[empty]
-    classifier = JavaTypeParameterImpl@1164['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1229['V'] {
-    arguments = ArrayList@1230[empty]
-    classifier = JavaTypeParameterImpl@1185['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1231['V'] {
-    arguments = ArrayList@1232[empty]
-    classifier = JavaTypeParameterImpl@1110['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1233['V'] {
-    arguments = ArrayList@1234[empty]
-    classifier = JavaTypeParameterImpl@1062['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1235['V'] {
-    arguments = ArrayList@1236[empty]
-    classifier = JavaTypeParameterImpl@1125['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1237['V'] {
-    arguments = ArrayList@1238[empty]
-    classifier = JavaTypeParameterImpl@1161['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1239['V'] {
-    arguments = ArrayList@1240[empty]
-    classifier = JavaTypeParameterImpl@1197['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1241['V'] {
-    arguments = ArrayList@1242[empty]
-    classifier = JavaTypeParameterImpl@1032['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1243['V'] {
-    arguments = ArrayList@1244[empty]
-    classifier = JavaTypeParameterImpl@1047['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1245['V'] {
-    arguments = ArrayList@1246[empty]
-    classifier = JavaTypeParameterImpl@1191['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1247['V'] {
-    arguments = ArrayList@1248[empty]
-    classifier = JavaTypeParameterImpl@1128['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1249['V'] {
-    arguments = ArrayList@1250[empty]
-    classifier = JavaTypeParameterImpl@1173['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1251['V'] {
-    arguments = ArrayList@1252[empty]
-    classifier = JavaTypeParameterImpl@1149['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1253['V'] {
-    arguments = ArrayList@1254[empty]
-    classifier = JavaTypeParameterImpl@1131['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1255['V'] {
-    arguments = ArrayList@1256[empty]
-    classifier = JavaTypeParameterImpl@1071['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1257['V'] {
-    arguments = ArrayList@1258[empty]
-    classifier = JavaTypeParameterImpl@1092['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1259['V'] {
-    arguments = ArrayList@1260[empty]
-    classifier = JavaTypeParameterImpl@1089['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1261['V'] {
-    arguments = ArrayList@1262[empty]
-    classifier = JavaTypeParameterImpl@1044['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1263['V'] {
-    arguments = ArrayList@1264[empty]
-    classifier = JavaTypeParameterImpl@1095['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1265['V'] {
-    arguments = ArrayList@1266[empty]
-    classifier = JavaTypeParameterImpl@1155['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1267['V'] {
-    arguments = ArrayList@1268[empty]
-    classifier = JavaTypeParameterImpl@1080['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1269['V'] {
-    arguments = ArrayList@1270[empty]
-    classifier = JavaTypeParameterImpl@1158['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1271['V'] {
-    arguments = ArrayList@1272[empty]
-    classifier = JavaTypeParameterImpl@1083['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1273['V'] {
-    arguments = ArrayList@1274[empty]
-    classifier = JavaTypeParameterImpl@1025['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1275['V'] {
-    arguments = ArrayList@1276[empty]
-    classifier = JavaTypeParameterImpl@1050['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1277['V'] {
-    arguments = ArrayList@1278[empty]
-    classifier = JavaTypeParameterImpl@1119['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1279['V'] {
-    arguments = ArrayList@1280[empty]
-    classifier = JavaTypeParameterImpl@1152['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1281['V'] {
-    arguments = ArrayList@1282[empty]
-    classifier = JavaTypeParameterImpl@1113['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1283['V'] {
-    arguments = ArrayList@1284[empty]
-    classifier = JavaTypeParameterImpl@1018['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1285['V'] {
-    arguments = ArrayList@1286[empty]
-    classifier = JavaTypeParameterImpl@1188['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1287['V'] {
-    arguments = ArrayList@1288[empty]
-    classifier = JavaTypeParameterImpl@1029['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1289['V'] {
-    arguments = ArrayList@1290[empty]
-    classifier = JavaTypeParameterImpl@1068['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1291['V'] {
-    arguments = ArrayList@1292[empty]
-    classifier = JavaTypeParameterImpl@1059['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1293['V'] {
-    arguments = ArrayList@1294[empty]
-    classifier = JavaTypeParameterImpl@1176['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1295['V'] {
-    arguments = ArrayList@1296[empty]
-    classifier = JavaTypeParameterImpl@1116['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1297['V'] {
-    arguments = ArrayList@1298[empty]
-    classifier = JavaTypeParameterImpl@1098['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1299['V'] {
-    arguments = ArrayList@1300[empty]
-    classifier = JavaTypeParameterImpl@1143['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1301['V'] {
-    arguments = ArrayList@1302[empty]
-    classifier = JavaTypeParameterImpl@1101['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1303['V'] {
-    arguments = ArrayList@1304[empty]
-    classifier = JavaTypeParameterImpl@1167['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1305['V'] {
-    arguments = ArrayList@1306[empty]
-    classifier = JavaTypeParameterImpl@1170['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1307['V'] {
-    arguments = ArrayList@1308[empty]
-    classifier = JavaTypeParameterImpl@1134['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1309['V'] {
-    arguments = ArrayList@1310[empty]
-    classifier = JavaTypeParameterImpl@1107['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1311['V'] {
-    arguments = ArrayList@1312[empty]
-    classifier = JavaTypeParameterImpl@1179['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1313['V'] {
-    arguments = ArrayList@1314[empty]
-    classifier = JavaTypeParameterImpl@1041['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1315['V'] {
-    arguments = ArrayList@1316[empty]
-    classifier = JavaTypeParameterImpl@1053['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1317['V'] {
-    arguments = ArrayList@1318[empty]
-    classifier = JavaTypeParameterImpl@1056['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaClassifierType@1319['V'] {
-    arguments = ArrayList@1320[empty]
-    classifier = JavaTypeParameterImpl@1038['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-}
-
-LazyJavaClassifierType@1321['V'] {
-    arguments = ArrayList@1322[empty]
-    classifier = JavaTypeParameterImpl@1122['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-}
-
-LazyJavaPackageFragmentProvider@1323 {
-    packageFragments('<root>': FqName@1324) = LazyJavaPackageFragment@1325['<root>']
-    packageFragments('ExtMap': FqName@1326) = null
-    packageFragments('HashMapEx': FqName@1327) = null
-    packageFragments('K': FqName@1328) = null
-    packageFragments('Map': FqName@1329) = null
-    packageFragments('V': FqName@1330) = null
-    packageFragments('java': FqName@1331) = LazyJavaPackageFragment@1332['java']
-    packageFragments('java.io': FqName@1333) = LazyJavaPackageFragment@1334['io']
-    packageFragments('java.lang': FqName@1335) = LazyJavaPackageFragment@1336['lang']
-    packageFragments('java.lang.ExtMap': FqName@1337) = null
-    packageFragments('java.lang.K': FqName@1338) = null
-    packageFragments('java.lang.Map': FqName@1339) = null
-    packageFragments('java.lang.V': FqName@1340) = null
-    packageFragments('java.util': FqName@1341) = LazyJavaPackageFragment@1342['util']
-    packageFragments('java.util.HashMap': FqName@1343) = null
-    packageFragments('kotlin': FqName@1344) = null
-    packageFragments('kotlin.ExtMap': FqName@1345) = null
-    packageFragments('kotlin.K': FqName@1346) = null
-    packageFragments('kotlin.Map': FqName@1347) = null
-    packageFragments('kotlin.V': FqName@1348) = null
-    packageFragments('kotlin.io': FqName@1349) = null
-    packageFragments('kotlin.jvm': FqName@1350) = null
-    topLevelClasses(JavaClassImpl@297['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@1351['HashMap']) = LazyJavaClassDescriptor@107['HashMap']
-    topLevelClasses(JavaClassImpl@931['ObjectInputStream']) = LazyJavaClassDescriptor@259['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@937['ObjectOutputStream']) = LazyJavaClassDescriptor@261['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@943['Serializable']) = LazyJavaClassDescriptor@263['Serializable']
-}
-
-LazyJavaPackageFragment@1325['<root>'] {
-    classes('Map': Name@1352) = null // through LazyPackageFragmentScopeForJavaPackage@1353
-    classes('java': Name@1354) = null // through LazyPackageFragmentScopeForJavaPackage@1353
-}
-
-LazyJavaPackageFragment@1332['java'] {
-    classes('lang': Name@1355) = null // through LazyPackageFragmentScopeForJavaPackage@1356
-    classes('util': Name@1357) = null // through LazyPackageFragmentScopeForJavaPackage@1356
-    deserializedPackageScope = Empty@1358 // through LazyPackageFragmentScopeForJavaPackage@1356
-    functions('lang': Name@1359) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@1356
-    memberIndex = computeMemberIndex$1@1360 // through LazyPackageFragmentScopeForJavaPackage@1356
-}
-
-LazyJavaPackageFragment@1336['lang'] {
-    classes('java': Name@1354) = null // through LazyPackageFragmentScopeForJavaPackage@1361
-}
-
-LazyJavaPackageFragment@1342['util'] {
-    classes('HashMap': Name@1362) = LazyJavaClassDescriptor@107['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@1363
-}
-
-LazyJavaTypeParameterDescriptor@283['K'] {
-    defaultType = JetTypeImpl@1364['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-    upperBounds = LinkedHashSet@1365[1] { NullableType@1366 }
-    upperBoundsAsType = NullableType@1366
-}
-
-LazyJavaTypeParameterDescriptor@275['K'] {
-    defaultType = JetTypeImpl@1367['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
-    upperBounds = LinkedHashSet@1368[1] { NullableType@1369 }
-    upperBoundsAsType = NullableType@1369
-}
-
-LazyJavaTypeParameterDescriptor@280['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1370
-    upperBounds = LinkedHashSet@1371[1] { NullableType@1372 }
-    upperBoundsAsType = NullableType@1372
-}
-
-LazyJavaTypeParameterDescriptor@276['V'] {
-    defaultType = JetTypeImpl@1373['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1026
-    upperBounds = LinkedHashSet@1374[1] { NullableType@1375 }
-    upperBoundsAsType = NullableType@1375
-}
-
-LazyJavaTypeParameterDescriptor@284['V'] {
-    defaultType = JetTypeImpl@1376['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
-    upperBounds = LinkedHashSet@1377[1] { NullableType@1378 }
-    upperBoundsAsType = NullableType@1378
-}
-
-LazyJavaTypeParameterDescriptor@281['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1379
-    upperBounds = LinkedHashSet@1380[1] { NullableType@1381 }
-    upperBoundsAsType = NullableType@1381
-}
-
-LazyJavaTypeParameterResolver@1382 {
-    resolve(JavaTypeParameterImpl@1383['K']) = LazyJavaTypeParameterDescriptor@275['K']
-    resolve(JavaTypeParameterImpl@1384['V']) = LazyJavaTypeParameterDescriptor@276['V']
-}
-
-LazyJavaTypeParameterResolver@1385 {
-    resolve(JavaTypeParameterImpl@1386['K']) = LazyJavaTypeParameterDescriptor@283['K']
-    resolve(JavaTypeParameterImpl@1387['V']) = LazyJavaTypeParameterDescriptor@284['V']
-}
-
-LazyJavaTypeParameterResolver@1388 {
-    resolve(JavaTypeParameterImpl@1389['K']) = LazyJavaTypeParameterDescriptor@280['K']
-    resolve(JavaTypeParameterImpl@1390['V']) = LazyJavaTypeParameterDescriptor@281['V']
-}
-
-LazyJavaTypeParameterResolver@1391 {
-    resolve(JavaTypeParameterImpl@540['K']) = null
-    resolve(JavaTypeParameterImpl@1080['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1392 {
-    resolve(JavaTypeParameterImpl@669['K']) = null
-    resolve(JavaTypeParameterImpl@1041['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1393 {
-    resolve(JavaTypeParameterImpl@546['K']) = null
-    resolve(JavaTypeParameterImpl@1197['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1394 {
-    resolve(JavaTypeParameterImpl@536['K']) = null
-    resolve(JavaTypeParameterImpl@1022['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1395 {
-    resolve(JavaTypeParameterImpl@582['K']) = null
-    resolve(JavaTypeParameterImpl@1140['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1396 {
-    resolve(JavaTypeParameterImpl@570['K']) = null
-    resolve(JavaTypeParameterImpl@1200['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1397 {
-    resolve(JavaTypeParameterImpl@648['K']) = null
-    resolve(JavaTypeParameterImpl@1053['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1398 {
-    resolve(JavaTypeParameterImpl@600['K']) = null
-    resolve(JavaTypeParameterImpl@1035['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1399 {
-    resolve(JavaTypeParameterImpl@552['K']) = null
-    resolve(JavaTypeParameterImpl@1038['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1400 {
-    resolve(JavaTypeParameterImpl@654['K']) = null
-    resolve(JavaTypeParameterImpl@1128['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1401 {
-    resolve(JavaTypeParameterImpl@555['K']) = null
-    resolve(JavaTypeParameterImpl@1101['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1402 {
-    resolve(JavaTypeParameterImpl@579['K']) = null
-    resolve(JavaTypeParameterImpl@1044['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1403 {
-    resolve(JavaTypeParameterImpl@663['K']) = null
-    resolve(JavaTypeParameterImpl@1164['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1404 {
-    resolve(JavaTypeParameterImpl@639['K']) = null
-    resolve(JavaTypeParameterImpl@1176['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1405 {
-    resolve(JavaTypeParameterImpl@606['K']) = null
-    resolve(JavaTypeParameterImpl@1137['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1406 {
-    resolve(JavaTypeParameterImpl@675['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1407 {
-    resolve(JavaTypeParameterImpl@543['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1408 {
-    resolve(JavaTypeParameterImpl@597['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1409 {
-    resolve(JavaTypeParameterImpl@1143['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1410 {
-    resolve(JavaTypeParameterImpl@1104['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1411 {
-    resolve(JavaTypeParameterImpl@1131['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1412 {
-    resolve(JavaTypeParameterImpl@1167['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1413 {
-    resolve(JavaTypeParameterImpl@1170['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1414 {
-    resolve(JavaTypeParameterImpl@1025['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1415 {
-    resolve(JavaTypeParameterImpl@1191['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1416 {
-    resolve(JavaTypeParameterImpl@1152['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1417 {
-    resolve(JavaTypeParameterImpl@1047['V']) = null
-}
-
-ResolutionTaskHolder@1418 {
-    <name not found> = ArrayList@1419[4] { ResolutionCandidate@1420, ResolutionCandidate@1421, ResolutionCandidate@1422, ... }
-}
-
-null {
-    <name not found> = ArrayList@1423[4] { ResolutionCandidate@1420, ResolutionCandidate@1421, ResolutionCandidate@1422, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
deleted file mode 100644
index fb4b28b9c49..00000000000
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
+++ /dev/null
@@ -1,252 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('html': FqName@3) = null
-    packageFragments('import': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.html': FqName@9) = null
-    packageFragments('java.lang.import': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.html': FqName@12) = null
-    packageFragments('kotlin.import': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('html': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('import': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('a': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('html': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('import': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('html': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('import': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('a': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('compareTo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('html': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('import': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@68[8] { ResolutionCandidate@52, ResolutionCandidate@53, ResolutionCandidate@54, ... }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log b/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
deleted file mode 100644
index a16ff13580f..00000000000
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
+++ /dev/null
@@ -1,84 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Nameless'] {
-    allDescriptors = ArrayList@3[3] { DeserializedSimpleFunctionDescriptor@4['hashCode'], DeserializedSimpleFunctionDescriptor@5['toString'], DeserializedSimpleFunctionDescriptor@6['equals'] } // through LazyJavaClassMemberScope@7
-    constructors = ArrayList@8[1] { JavaConstructorDescriptor@9['<init>'] } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@10['Nameless']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@7
-    functions('clone': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('equals': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@6['equals'] } // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@4['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('notify': Name@20) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@21) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@5['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@7
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@27['Nameless']
-}
-
-LazyJavaClassTypeConstructor@27['Nameless'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
-}
-
-LazyJavaClassifierType@31['Object'] {
-    classifier = JavaClassImpl@32['Object']
-    typeConstructor = DeserializedClassTypeConstructor@33
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('Int': FqName@37) = null
-    packageFragments('K': FqName@38) = null
-    packageFragments('Nameless': FqName@39) = null
-    packageFragments('java': FqName@40) = LazyJavaPackageFragment@41['java']
-    packageFragments('java.lang': FqName@42) = LazyJavaPackageFragment@43['lang']
-    packageFragments('java.lang.Int': FqName@44) = null
-    packageFragments('java.lang.Nameless': FqName@45) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.Int': FqName@47) = null
-    packageFragments('kotlin.Nameless': FqName@48) = null
-    packageFragments('kotlin.io': FqName@49) = null
-    packageFragments('kotlin.jvm': FqName@50) = null
-    packageFragments('p': FqName@51) = LazyJavaPackageFragment@52['p']
-    packageFragments('p.Int': FqName@53) = null
-    packageFragments('p.Nameless': FqName@54) = null
-    topLevelClasses(JavaClassImpl@55['Nameless']) = LazyJavaClassDescriptor@2['Nameless']
-}
-
-LazyJavaPackageFragment@36['<root>'] {
-    classes('Int': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('Nameless': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('p': Name@61) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@65) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@52['p'] {
-    classes('Int': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Nameless': Name@58) = LazyJavaClassDescriptor@2['Nameless'] // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
-}
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessMembers.lazy.log b/compiler/testData/diagnostics/tests/recovery/namelessMembers.lazy.log
deleted file mode 100644
index c9cee958116..00000000000
--- a/compiler/testData/diagnostics/tests/recovery/namelessMembers.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('C': FqName@5) = null
-    packageFragments('C1': FqName@6) = null
-    packageFragments('C2': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.lazy.log b/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.lazy.log
deleted file mode 100644
index cfaefea3b51..00000000000
--- a/compiler/testData/diagnostics/tests/recovery/namelessToplevelDeclarations.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.lazy.log
deleted file mode 100644
index ee101ff41d2..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/ClassRedeclarationInDifferentFiles.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-    packageFragments('test': FqName@10) = null
-    packageFragments('test.A': FqName@11) = null
-    packageFragments('test.F1': FqName@12) = null
-    packageFragments('test.F2': FqName@13) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.lazy.log
deleted file mode 100644
index c793a9c5bc3..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/ConflictingExtensionProperties.lazy.log
+++ /dev/null
@@ -1,21 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('foo': FqName@4) = null
-    packageFragments('foo.Int': FqName@5) = null
-    packageFragments('foo.foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.lazy.log
deleted file mode 100644
index c0d1c5b7642..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/EnumEntriesAndClassObjectMembers.lazy.log
+++ /dev/null
@@ -1,20 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['<class-object-for-E>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('E': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.lazy.log
deleted file mode 100644
index ae80c4c3ff3..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/MultiFilePackageRedeclaration.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('a.b': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.lazy.log
deleted file mode 100644
index f04abf63b72..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndFunInClass.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.lazy.log
deleted file mode 100644
index 594c94c4048..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/PropertyAndInnerClass.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-    <name not found> = StringValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.lazy.log
deleted file mode 100644
index 353c1325d38..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationInMultiFile.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.lazy.log
deleted file mode 100644
index be55169ba18..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/Redeclarations.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('redeclarations': FqName@18) = null
-    packageFragments('redeclarations.A': FqName@19) = null
-    packageFragments('redeclarations.A.A': FqName@20) = null
-    packageFragments('redeclarations.Int': FqName@21) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.lazy.log
deleted file mode 100644
index 9080110742c..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclarationsInObjects.lazy.log
+++ /dev/null
@@ -1,28 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('B': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.lazy.log
deleted file mode 100644
index 26400c8ce3f..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/RedeclaredTypeParameters.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('P': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.T': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
deleted file mode 100644
index 02247ba64a8..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('En': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('ENTRY': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('ENTRY': Name@14) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('ENTRY': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('ENTRY': Name@14) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2247.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/kt2247.lazy.log
deleted file mode 100644
index 95c7a7b24a7..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2247.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-    packageFragments('kt2247': FqName@10) = null
-    packageFragments('kt2247.B': FqName@11) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2418.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/kt2418.lazy.log
deleted file mode 100644
index 2752d782416..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2418.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt2418': FqName@13) = null
-    packageFragments('kt2418.A': FqName@14) = null
-    packageFragments('kt2418.B': FqName@15) = null
-    packageFragments('kt2418.C': FqName@16) = null
-    packageFragments('kt2418.D': FqName@17) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt2438.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/kt2438.lazy.log
deleted file mode 100644
index 31b7262844d..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/kt2438.lazy.log
+++ /dev/null
@@ -1,18 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-    packageFragments('kt2438': FqName@10) = null
-    packageFragments('kt2438.A': FqName@11) = null
-    packageFragments('kt2438.B': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/kt470.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/kt470.lazy.log
deleted file mode 100644
index a99206a239e..00000000000
--- a/compiler/testData/diagnostics/tests/redeclarations/kt470.lazy.log
+++ /dev/null
@@ -1,42 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = IntValue@13
-    <name not found> = IntValue@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('Int': FqName@19) = null
-    packageFragments('a': FqName@20) = null
-    packageFragments('b': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.Int': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
deleted file mode 100644
index 54912aa4aa8..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Byte': FqName@5) = null
-    packageFragments('Char': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Byte': FqName@13) = null
-    packageFragments('java.lang.Char': FqName@14) = null
-    packageFragments('java.lang.Foo': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Byte': FqName@18) = null
-    packageFragments('kotlin.Char': FqName@19) = null
-    packageFragments('kotlin.Foo': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('x': FqName@24) = null
-    packageFragments('x.Byte': FqName@25) = null
-    packageFragments('x.Char': FqName@26) = null
-    packageFragments('x.Foo': FqName@27) = null
-    packageFragments('x.Int': FqName@28) = null
-    packageFragments('x.a1': FqName@29) = null
-    packageFragments('x.b': FqName@30) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('b': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Foo': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@53[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
deleted file mode 100644
index 5d31596c84e..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Any': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Any': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
deleted file mode 100644
index 593b9a60326..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
+++ /dev/null
@@ -1,86 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
deleted file mode 100644
index 409017a88c8..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
+++ /dev/null
@@ -1,2774 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['AbstractCollection'] {
-    defaultType = JetTypeImpl@2['AbstractCollection<1>']
-    functions('add': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['add'] } // through LazyJavaClassMemberScope@6
-    functions('contains': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['contains'] } // through LazyJavaClassMemberScope@6
-    functions('remove': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['remove'] } // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@16['AbstractList'] {
-    defaultType = JetTypeImpl@17['AbstractList<1>']
-    functions('add': Name@18) = ArrayList@19[2] { JavaMethodDescriptor@20['add'], JavaMethodDescriptor@21['add'] } // through LazyJavaClassMemberScope@22
-    functions('contains': Name@7) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['contains'] } // through LazyJavaClassMemberScope@22
-    functions('remove': Name@25) = ArrayList@26[2] { JavaMethodDescriptor@27['remove'], DeserializedSimpleFunctionDescriptor@28['remove'] } // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@22
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['AbstractList']
-}
-
-LazyJavaClassDescriptor@32['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@33['AbstractStringBuilder']
-    functions('append': Name@34) = ArrayList@35[13] { JavaMethodDescriptor@36['append'], JavaMethodDescriptor@37['append'], JavaMethodDescriptor@38['append'], ... } // through LazyJavaClassMemberScope@39
-    functions('charAt': Name@40) = ArrayList@41[1] { JavaMethodDescriptor@42['charAt'] } // through LazyJavaClassMemberScope@39
-    functions('deleteCharAt': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['deleteCharAt'] } // through LazyJavaClassMemberScope@39
-    functions('length': Name@46) = ArrayList@47[1] { JavaMethodDescriptor@48['length'] } // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@39
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@50['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@52['Appendable'] {
-    defaultType = JetTypeImpl@53['Appendable']
-    functions('append': Name@54) = ArrayList@55[3] { JavaMethodDescriptor@56['append'], JavaMethodDescriptor@57['append'], JavaMethodDescriptor@58['append'] } // through LazyJavaClassMemberScope@59
-    functions('charAt': Name@60) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
-    functions('deleteCharAt': Name@62) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
-    functions('length': Name@63) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
-    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@59
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@66['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassDescriptor@68['ArrayList'] {
-    constructors = ArrayList@69[3] { JavaConstructorDescriptor@70['<init>'], JavaConstructorDescriptor@71['<init>'], JavaConstructorDescriptor@72['<init>'] } // through LazyJavaClassMemberScope@73
-    defaultType = JetTypeImpl@74['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@75 // through LazyJavaClassMemberScope@73
-    functionTypeForSamInterface = null
-    functions('add': Name@76) = ArrayList@77[2] { JavaMethodDescriptor@78['add'], JavaMethodDescriptor@79['add'] } // through LazyJavaClassMemberScope@73
-    functions('contains': Name@80) = ArrayList@81[1] { JavaMethodDescriptor@82['contains'] } // through LazyJavaClassMemberScope@73
-    functions('remove': Name@83) = ArrayList@84[2] { JavaMethodDescriptor@85['remove'], JavaMethodDescriptor@86['remove'] } // through LazyJavaClassMemberScope@73
-    memberIndex = computeMemberIndex$1@87 // through LazyJavaClassMemberScope@73
-    nestedClassIndex = LinkedHashMap@88 // through LazyJavaClassMemberScope@73
-    nestedClasses('add': Name@76) = null // through LazyJavaClassMemberScope@73
-    nestedClasses('contains': Name@80) = null // through LazyJavaClassMemberScope@73
-    nestedClasses('remove': Name@83) = null // through LazyJavaClassMemberScope@73
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@89['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@90['ArrayList']
-}
-
-LazyJavaClassDescriptor@91['AutoCloseable'] {
-    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@92
-    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@92
-    memberIndex = computeMemberIndex$1@94 // through LazyJavaClassMemberScope@92
-    typeConstructor = LazyJavaClassTypeConstructor@95['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@96['BufferedReader'] {
-    constructors = ArrayList@97[2] { JavaConstructorDescriptor@98['<init>'], JavaConstructorDescriptor@99['<init>'] } // through LazyJavaClassMemberScope@100
-    defaultType = JetTypeImpl@101['BufferedReader']
-    enumEntryIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@100
-    functionTypeForSamInterface = null
-    functions('readLine': Name@103) = ArrayList@104[2] { JavaMethodDescriptor@105['readLine'], JavaMethodDescriptor@106['readLine'] } // through LazyJavaClassMemberScope@100
-    memberIndex = computeMemberIndex$1@107 // through LazyJavaClassMemberScope@100
-    nestedClassIndex = LinkedHashMap@108 // through LazyJavaClassMemberScope@100
-    nestedClasses('readLine': Name@103) = null // through LazyJavaClassMemberScope@100
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@109['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@110['BufferedReader']
-}
-
-LazyJavaClassDescriptor@111['Charset'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
-}
-
-LazyJavaClassDescriptor@113['Closeable'] {
-    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@114
-    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@114
-    memberIndex = computeMemberIndex$1@115 // through LazyJavaClassMemberScope@114
-    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
-}
-
-LazyJavaClassDescriptor@117['Exception'] {
-    constructors = ArrayList@118[5] { JavaConstructorDescriptor@119['<init>'], JavaConstructorDescriptor@120['<init>'], JavaConstructorDescriptor@121['<init>'], ... } // through LazyJavaClassMemberScope@122
-    defaultType = JetTypeImpl@123['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@124['Exception']
-}
-
-LazyJavaClassDescriptor@125['FilterOutputStream'] {
-    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@126
-    memberIndex = computeMemberIndex$1@127 // through LazyJavaClassMemberScope@126
-    typeConstructor = LazyJavaClassTypeConstructor@128['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@129['InputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassDescriptor@131['InputStreamReader'] {
-    constructors = ArrayList@132[4] { JavaConstructorDescriptor@133['<init>'], JavaConstructorDescriptor@134['<init>'], JavaConstructorDescriptor@135['<init>'], ... } // through LazyJavaClassMemberScope@136
-    defaultType = JetTypeImpl@137['InputStreamReader']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@138['InputStreamReader']
-}
-
-LazyJavaClassDescriptor@139['OutputStream'] {
-    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@140
-    memberIndex = computeMemberIndex$1@141 // through LazyJavaClassMemberScope@140
-    typeConstructor = LazyJavaClassTypeConstructor@142['OutputStream']
-}
-
-LazyJavaClassDescriptor@143['PrintStream'] {
-    defaultType = JetTypeImpl@144['PrintStream']
-    enumEntryIndex = LinkedHashMap@145 // through LazyJavaClassMemberScope@146
-    functions('println': Name@147) = ArrayList@148[10] { JavaMethodDescriptor@149['println'], JavaMethodDescriptor@150['println'], JavaMethodDescriptor@151['println'], ... } // through LazyJavaClassMemberScope@146
-    memberIndex = computeMemberIndex$1@152 // through LazyJavaClassMemberScope@146
-    nestedClassIndex = LinkedHashMap@153 // through LazyJavaClassMemberScope@146
-    nestedClasses('println': Name@147) = null // through LazyJavaClassMemberScope@146
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@154['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
-}
-
-LazyJavaClassDescriptor@156['Random'] {
-    constructors = ArrayList@157[2] { JavaConstructorDescriptor@158['<init>'], JavaConstructorDescriptor@159['<init>'] } // through LazyJavaClassMemberScope@160
-    defaultType = JetTypeImpl@161['Random']
-    enumEntryIndex = LinkedHashMap@162 // through LazyJavaClassMemberScope@160
-    functionTypeForSamInterface = null
-    functions('nextInt': Name@163) = ArrayList@164[2] { JavaMethodDescriptor@165['nextInt'], JavaMethodDescriptor@166['nextInt'] } // through LazyJavaClassMemberScope@160
-    memberIndex = computeMemberIndex$1@167 // through LazyJavaClassMemberScope@160
-    nestedClassIndex = LinkedHashMap@168 // through LazyJavaClassMemberScope@160
-    nestedClasses('nextInt': Name@163) = null // through LazyJavaClassMemberScope@160
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@169['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@170['Random']
-}
-
-LazyJavaClassDescriptor@171['RandomAccess'] {
-    functions('add': Name@18) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
-    functions('contains': Name@7) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
-    functions('remove': Name@25) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
-    memberIndex = computeMemberIndex$1@173 // through LazyJavaClassMemberScope@172
-    typeConstructor = LazyJavaClassTypeConstructor@174['RandomAccess']
-}
-
-LazyJavaClassDescriptor@175['Readable'] {
-    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@176
-    memberIndex = computeMemberIndex$1@177 // through LazyJavaClassMemberScope@176
-    typeConstructor = LazyJavaClassTypeConstructor@178['Readable']
-}
-
-LazyJavaClassDescriptor@179['Reader'] {
-    functionTypeForSamInterface = null
-    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@180
-    memberIndex = computeMemberIndex$1@181 // through LazyJavaClassMemberScope@180
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassDescriptor@183['Serializable'] {
-    functions('add': Name@18) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('append': Name@34) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('charAt': Name@40) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('contains': Name@7) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('deleteCharAt': Name@43) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('length': Name@46) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('nextInt': Name@185) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    functions('remove': Name@25) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
-    memberIndex = computeMemberIndex$1@186 // through LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
-LazyJavaClassDescriptor@188['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
-}
-
-LazyJavaClassDescriptor@190['StringBuilder'] {
-    constructors = ArrayList@191[4] { JavaConstructorDescriptor@192['<init>'], JavaConstructorDescriptor@193['<init>'], JavaConstructorDescriptor@194['<init>'], ... } // through LazyJavaClassMemberScope@195
-    defaultType = JetTypeImpl@196['StringBuilder']
-    enumEntryIndex = LinkedHashMap@197 // through LazyJavaClassMemberScope@195
-    functionTypeForSamInterface = null
-    functions('append': Name@198) = ArrayList@199[14] { JavaMethodDescriptor@200['append'], JavaMethodDescriptor@201['append'], JavaMethodDescriptor@202['append'], ... } // through LazyJavaClassMemberScope@195
-    functions('charAt': Name@40) = ArrayList@203[1] { JavaMethodDescriptor@204['charAt'] } // through LazyJavaClassMemberScope@195
-    functions('deleteCharAt': Name@205) = ArrayList@206[1] { JavaMethodDescriptor@207['deleteCharAt'] } // through LazyJavaClassMemberScope@195
-    functions('length': Name@46) = ArrayList@208[1] { JavaMethodDescriptor@209['length'] } // through LazyJavaClassMemberScope@195
-    memberIndex = computeMemberIndex$1@210 // through LazyJavaClassMemberScope@195
-    nestedClassIndex = LinkedHashMap@211 // through LazyJavaClassMemberScope@195
-    nestedClasses('append': Name@198) = null // through LazyJavaClassMemberScope@195
-    nestedClasses('charAt': Name@40) = null // through LazyJavaClassMemberScope@195
-    nestedClasses('deleteCharAt': Name@205) = null // through LazyJavaClassMemberScope@195
-    nestedClasses('length': Name@46) = null // through LazyJavaClassMemberScope@195
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@212['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassDescriptor@214['System'] {
-    enumEntryIndex = LinkedHashMap@215 // through LazyJavaClassMemberScope@216
-    memberIndex = computeMemberIndex$1@217 // through LazyJavaClassMemberScope@216
-    memberIndex = computeMemberIndex$1@218 // through LazyJavaStaticClassScope@219
-    nestedClassIndex = LinkedHashMap@220 // through LazyJavaClassMemberScope@216
-    nestedClasses('in': Name@221) = null // through LazyJavaClassMemberScope@216
-    nestedClasses('out': Name@222) = null // through LazyJavaClassMemberScope@216
-    properties('in': Name@221) = ArrayList@223[1] { JavaPropertyDescriptor@224['in'] } // through LazyJavaStaticClassScope@219
-    properties('in': Name@221) = EmptyList@61[empty] // through LazyJavaClassMemberScope@216
-    properties('out': Name@222) = ArrayList@225[1] { JavaPropertyDescriptor@226['out'] } // through LazyJavaStaticClassScope@219
-    properties('out': Name@222) = EmptyList@61[empty] // through LazyJavaClassMemberScope@216
-    typeConstructor = LazyJavaClassTypeConstructor@227['System']
-}
-
-LazyJavaClassTypeConstructor@15['AbstractCollection'] {
-    parameters = ArrayList@228[1] { LazyJavaTypeParameterDescriptor@229['E'] }
-    supertypes = ArrayList@230[1] { LazyJavaClassifierType@231['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@31['AbstractList'] {
-    parameters = ArrayList@232[1] { LazyJavaTypeParameterDescriptor@233['E'] }
-    supertypes = ArrayList@234[2] { LazyJavaClassifierType@235['AbstractCollection<E>'], LazyJavaClassifierType@236['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@51['AbstractStringBuilder'] {
-    parameters = ArrayList@237[empty]
-    supertypes = ArrayList@238[2] { LazyJavaClassifierType@239['Appendable'], LazyJavaClassifierType@240['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@67['Appendable'] {
-    parameters = ArrayList@241[empty]
-    supertypes = ArrayList@242[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassTypeConstructor@90['ArrayList'] {
-    parameters = ArrayList@244[1] { LazyJavaTypeParameterDescriptor@245['E'] }
-    supertypes = ArrayList@246[5] { LazyJavaClassifierType@247['AbstractList<E>'], LazyJavaClassifierType@248['List<E>'], LazyJavaClassifierType@249['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@95['AutoCloseable'] {
-    parameters = ArrayList@250[empty]
-    supertypes = ArrayList@251[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassTypeConstructor@110['BufferedReader'] {
-    parameters = ArrayList@252[empty]
-    supertypes = ArrayList@253[1] { LazyJavaClassifierType@254['Reader'] }
-}
-
-LazyJavaClassTypeConstructor@112['Charset'] {
-    parameters = ArrayList@255[empty]
-}
-
-LazyJavaClassTypeConstructor@116['Closeable'] {
-    parameters = ArrayList@256[empty]
-    supertypes = ArrayList@257[1] { LazyJavaClassifierType@258['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@124['Exception'] {
-    parameters = ArrayList@259[empty]
-    supertypes = ArrayList@260[1] { LazyJavaClassifierType@261['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@128['FilterOutputStream'] {
-    parameters = ArrayList@262[empty]
-    supertypes = ArrayList@263[1] { LazyJavaClassifierType@264['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@130['InputStream'] {
-    parameters = ArrayList@265[empty]
-    supertypes = ArrayList@266[1] { LazyJavaClassifierType@267['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@138['InputStreamReader'] {
-    parameters = ArrayList@268[empty]
-    supertypes = ArrayList@269[1] { LazyJavaClassifierType@270['Reader'] }
-}
-
-LazyJavaClassTypeConstructor@142['OutputStream'] {
-    parameters = ArrayList@271[empty]
-    supertypes = ArrayList@272[1] { LazyJavaClassifierType@273['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@155['PrintStream'] {
-    parameters = ArrayList@274[empty]
-    supertypes = ArrayList@275[3] { LazyJavaClassifierType@276['FilterOutputStream'], LazyJavaClassifierType@277['Appendable'], LazyJavaClassifierType@278['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@170['Random'] {
-    parameters = ArrayList@279[empty]
-    supertypes = ArrayList@280[1] { LazyJavaClassifierType@281['Serializable'] }
-}
-
-LazyJavaClassTypeConstructor@174['RandomAccess'] {
-    parameters = ArrayList@282[empty]
-    supertypes = ArrayList@283[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassTypeConstructor@178['Readable'] {
-    parameters = ArrayList@284[empty]
-    supertypes = ArrayList@285[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassTypeConstructor@182['Reader'] {
-    parameters = ArrayList@286[empty]
-    supertypes = ArrayList@287[2] { LazyJavaClassifierType@288['Readable'], LazyJavaClassifierType@289['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@187['Serializable'] {
-    parameters = ArrayList@290[empty]
-    supertypes = ArrayList@291[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassTypeConstructor@189['StringBuffer'] {
-    parameters = ArrayList@292[empty]
-    supertypes = ArrayList@293[3] { LazyJavaClassifierType@294['AbstractStringBuilder'], LazyJavaClassifierType@295['Serializable'], LazyJavaClassifierType@296['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@213['StringBuilder'] {
-    parameters = ArrayList@297[empty]
-    supertypes = ArrayList@298[3] { LazyJavaClassifierType@299['AbstractStringBuilder'], LazyJavaClassifierType@300['Serializable'], LazyJavaClassifierType@301['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@227['System'] {
-    supertypes = ArrayList@302[1] { JetTypeImpl@243['Any'] }
-}
-
-LazyJavaClassifierType@235['AbstractCollection<E>'] {
-    arguments = ArrayList@303[1] { TypeProjectionImpl@304 }
-    classifier = JavaClassImpl@305['AbstractCollection']
-    memberScope = SubstitutingScope@306
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractCollection']
-}
-
-LazyJavaClassifierType@247['AbstractList<E>'] {
-    arguments = ArrayList@308[1] { TypeProjectionImpl@309 }
-    classifier = JavaClassImpl@310['AbstractList']
-    memberScope = SubstitutingScope@311
-    typeConstructor = LazyJavaClassTypeConstructor@31['AbstractList']
-}
-
-LazyJavaClassifierType@299['AbstractStringBuilder'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@313['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@314['AbstractStringBuilder'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@316['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@317['AbstractStringBuilder'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@319['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@320['AbstractStringBuilder'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@322['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@323['AbstractStringBuilder'] {
-    arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@325['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@326['AbstractStringBuilder'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@328['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@329['AbstractStringBuilder'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@331['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@332['AbstractStringBuilder'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@334['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@335['AbstractStringBuilder'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@337['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@338['AbstractStringBuilder'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@340['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@341['AbstractStringBuilder'] {
-    arguments = ArrayList@342[empty]
-    classifier = JavaClassImpl@343['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@344['AbstractStringBuilder'] {
-    arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@346['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@347['AbstractStringBuilder'] {
-    arguments = ArrayList@348[empty]
-    classifier = JavaClassImpl@349['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@350['AbstractStringBuilder'] {
-    arguments = ArrayList@351[empty]
-    classifier = JavaClassImpl@352['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@353['AbstractStringBuilder'] {
-    arguments = ArrayList@354[empty]
-    classifier = JavaClassImpl@355['AbstractStringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@356['AbstractStringBuilder'] {
-    arguments = ArrayList@357[empty]
-    classifier = JavaClassImpl@343['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@359['AbstractStringBuilder'] {
-    arguments = ArrayList@360[empty]
-    classifier = JavaClassImpl@355['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@361['AbstractStringBuilder'] {
-    arguments = ArrayList@362[empty]
-    classifier = JavaClassImpl@331['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@363['AbstractStringBuilder'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@328['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@365['AbstractStringBuilder'] {
-    arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@340['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@367['AbstractStringBuilder'] {
-    arguments = ArrayList@368[empty]
-    classifier = JavaClassImpl@337['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@369['AbstractStringBuilder'] {
-    arguments = ArrayList@370[empty]
-    classifier = JavaClassImpl@352['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@371['AbstractStringBuilder'] {
-    arguments = ArrayList@372[empty]
-    classifier = JavaClassImpl@319['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@373['AbstractStringBuilder'] {
-    arguments = ArrayList@374[empty]
-    classifier = JavaClassImpl@349['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@375['AbstractStringBuilder'] {
-    arguments = ArrayList@376[empty]
-    classifier = JavaClassImpl@325['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@377['AbstractStringBuilder'] {
-    arguments = ArrayList@378[empty]
-    classifier = JavaClassImpl@346['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@379['AbstractStringBuilder'] {
-    arguments = ArrayList@380[empty]
-    classifier = JavaClassImpl@322['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@381['AbstractStringBuilder'] {
-    arguments = ArrayList@382[empty]
-    classifier = JavaClassImpl@316['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@383['AbstractStringBuilder'] {
-    arguments = ArrayList@384[empty]
-    classifier = JavaClassImpl@334['AbstractStringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@294['AbstractStringBuilder'] {
-    arguments = ArrayList@385[empty]
-    classifier = JavaClassImpl@386['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@239['Appendable'] {
-    arguments = ArrayList@387[empty]
-    classifier = JavaClassImpl@388['Appendable']
-    memberScope = LazyJavaClassMemberScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@277['Appendable'] {
-    arguments = ArrayList@389[empty]
-    classifier = JavaClassImpl@390['Appendable']
-    memberScope = LazyJavaClassMemberScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@391['Appendable'] {
-    arguments = ArrayList@392[empty]
-    classifier = JavaClassImpl@393['Appendable']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@394['Appendable'] {
-    arguments = ArrayList@395[empty]
-    classifier = JavaClassImpl@396['Appendable']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@397['Appendable'] {
-    arguments = ArrayList@398[empty]
-    classifier = JavaClassImpl@399['Appendable']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@400['Appendable'] {
-    arguments = ArrayList@401[empty]
-    classifier = JavaClassImpl@399['Appendable']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@402['Appendable'] {
-    arguments = ArrayList@403[empty]
-    classifier = JavaClassImpl@396['Appendable']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@404['Appendable'] {
-    arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@393['Appendable']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
-}
-
-LazyJavaClassifierType@258['AutoCloseable'] {
-    arguments = ArrayList@406[empty]
-    classifier = JavaClassImpl@407['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@92
-    typeConstructor = LazyJavaClassTypeConstructor@95['AutoCloseable']
-}
-
-LazyJavaClassifierType@240['CharSequence'] {
-    arguments = ArrayList@408[empty]
-    classifier = JavaClassImpl@409['CharSequence']
-    memberScope = DeserializedClassMemberScope@410
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@301['CharSequence'] {
-    arguments = ArrayList@412[empty]
-    classifier = JavaClassImpl@413['CharSequence']
-    memberScope = DeserializedClassMemberScope@410
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@414['CharSequence'] {
-    arguments = ArrayList@415[empty]
-    classifier = JavaClassImpl@416['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@417['CharSequence'] {
-    arguments = ArrayList@418[empty]
-    classifier = JavaClassImpl@419['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@420['CharSequence'] {
-    arguments = ArrayList@421[empty]
-    classifier = JavaClassImpl@422['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@423['CharSequence'] {
-    arguments = ArrayList@424[empty]
-    classifier = JavaClassImpl@425['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@426['CharSequence'] {
-    arguments = ArrayList@427[empty]
-    classifier = JavaClassImpl@428['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@429['CharSequence'] {
-    arguments = ArrayList@430[empty]
-    classifier = JavaClassImpl@431['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@432['CharSequence'] {
-    arguments = ArrayList@433[empty]
-    classifier = JavaClassImpl@434['CharSequence']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@435['CharSequence'] {
-    arguments = ArrayList@436[empty]
-    classifier = JavaClassImpl@416['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@437['CharSequence'] {
-    arguments = ArrayList@438[empty]
-    classifier = JavaClassImpl@419['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@439['CharSequence'] {
-    arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@425['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@441['CharSequence'] {
-    arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@422['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@443['CharSequence'] {
-    arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@434['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@445['CharSequence'] {
-    arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@428['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@447['CharSequence'] {
-    arguments = ArrayList@448[empty]
-    classifier = JavaClassImpl@431['CharSequence']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@296['CharSequence'] {
-    classifier = JavaClassImpl@449['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@411
-}
-
-LazyJavaClassifierType@450['Charset'] {
-    arguments = ArrayList@451[empty]
-    classifier = JavaClassImpl@452['Charset']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
-}
-
-LazyJavaClassifierType@453['Charset'] {
-    arguments = ArrayList@454[empty]
-    classifier = JavaClassImpl@452['Charset']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
-}
-
-LazyJavaClassifierType@455['CharsetDecoder'] {
-    classifier = null
-    nullable = 'false': Boolean@307
-    typeConstructor = TypeConstructorImpl$1@456
-}
-
-LazyJavaClassifierType@457['CharsetDecoder'] {
-    nullable = 'true': Boolean@358
-}
-
-LazyJavaClassifierType@458['Cloneable'] {
-    arguments = ArrayList@459[empty]
-    classifier = JavaClassImpl@460['Cloneable']
-    memberScope = DeserializedClassMemberScope@461
-    typeConstructor = DeserializedClassTypeConstructor@462
-}
-
-LazyJavaClassifierType@278['Closeable'] {
-    arguments = ArrayList@463[empty]
-    classifier = JavaClassImpl@464['Closeable']
-    memberScope = LazyJavaClassMemberScope@114
-    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
-}
-
-LazyJavaClassifierType@289['Closeable'] {
-    arguments = ArrayList@465[empty]
-    classifier = JavaClassImpl@466['Closeable']
-    memberScope = LazyJavaClassMemberScope@114
-    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
-}
-
-LazyJavaClassifierType@273['Closeable'] {
-    arguments = ArrayList@467[empty]
-    classifier = JavaClassImpl@468['Closeable']
-    memberScope = LazyJavaClassMemberScope@114
-    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
-}
-
-LazyJavaClassifierType@267['Closeable'] {
-    arguments = ArrayList@469[empty]
-    classifier = JavaClassImpl@470['Closeable']
-    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
-}
-
-LazyJavaClassifierType@471['Collection<? extends E>'] {
-    arguments = ArrayList@472[1] { TypeProjectionImpl@473 }
-    classifier = JavaClassImpl@474['Collection']
-    memberScope = SubstitutingScope@475
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@476
-}
-
-LazyJavaClassifierType@477['Collection<? extends E>'] {
-    arguments = ArrayList@478[1] { TypeProjectionImpl@479 }
-    classifier = JavaClassImpl@474['Collection']
-    memberScope = SubstitutingScope@480
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@481
-}
-
-LazyJavaClassifierType@231['Collection<E>'] {
-    arguments = ArrayList@482[1] { TypeProjectionImpl@483 }
-    classifier = JavaClassImpl@484['Collection']
-    memberScope = SubstitutingScope@485
-    typeConstructor = DeserializedClassTypeConstructor@476
-}
-
-LazyJavaClassifierType@486['E'] {
-    arguments = ArrayList@487[empty]
-    classifier = JavaTypeParameterImpl@488['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@490['E'] {
-    arguments = ArrayList@491[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@497['E'] {
-    arguments = ArrayList@498[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@500['E'] {
-    arguments = ArrayList@501[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@503['E'] {
-    arguments = ArrayList@504[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@506['E'] {
-    arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
-}
-
-LazyJavaClassifierType@510['E'] {
-    arguments = ArrayList@511[empty]
-    classifier = JavaTypeParameterImpl@512['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@513['E'] {
-    arguments = ArrayList@514[empty]
-    classifier = JavaTypeParameterImpl@515['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@516['E'] {
-    arguments = ArrayList@517[empty]
-    classifier = JavaTypeParameterImpl@518['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@519['E'] {
-    arguments = ArrayList@520[empty]
-    classifier = JavaTypeParameterImpl@521['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
-}
-
-LazyJavaClassifierType@522['E'] {
-    arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@524['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@525['E'] {
-    arguments = ArrayList@526[empty]
-    classifier = JavaTypeParameterImpl@527['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@528['E'] {
-    arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@530['E']
-    nullable = 'false': Boolean@307
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@531['E'] {
-    arguments = ArrayList@532[empty]
-    classifier = JavaTypeParameterImpl@518['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@533['E'] {
-    arguments = ArrayList@534[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@535['E'] {
-    arguments = ArrayList@536[empty]
-    classifier = JavaTypeParameterImpl@512['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@537['E'] {
-    arguments = ArrayList@538[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
-}
-
-LazyJavaClassifierType@539['E'] {
-    arguments = ArrayList@540[empty]
-    classifier = JavaTypeParameterImpl@488['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@541['E'] {
-    arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@515['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@543['E'] {
-    arguments = ArrayList@544[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@545['E'] {
-    arguments = ArrayList@546[empty]
-    classifier = JavaTypeParameterImpl@521['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
-}
-
-LazyJavaClassifierType@547['E'] {
-    arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@549['E'] {
-    arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@524['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@551['E'] {
-    arguments = ArrayList@552[empty]
-    classifier = JavaTypeParameterImpl@530['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@553['E'] {
-    arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-}
-
-LazyJavaClassifierType@555['E'] {
-    arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@527['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@557['E'] {
-    arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'true': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@276['FilterOutputStream'] {
-    arguments = ArrayList@559[empty]
-    classifier = JavaClassImpl@560['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@126
-    typeConstructor = LazyJavaClassTypeConstructor@128['FilterOutputStream']
-}
-
-LazyJavaClassifierType@561['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@562
-}
-
-LazyJavaClassifierType@563['InputStream'] {
-    arguments = ArrayList@564[empty]
-    classifier = JavaClassImpl@565['InputStream']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@566['InputStream'] {
-    arguments = ArrayList@567[empty]
-    classifier = JavaClassImpl@568['InputStream']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@569['InputStream'] {
-    arguments = ArrayList@570[empty]
-    classifier = JavaClassImpl@571['InputStream']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@572['InputStream'] {
-    arguments = ArrayList@573[empty]
-    classifier = JavaClassImpl@574['InputStream']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@575['InputStream'] {
-    arguments = ArrayList@576[empty]
-    classifier = JavaClassImpl@577['InputStream']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@578['InputStream'] {
-    arguments = ArrayList@579[empty]
-    classifier = JavaClassImpl@571['InputStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@580['InputStream'] {
-    arguments = ArrayList@581[empty]
-    classifier = JavaClassImpl@568['InputStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@582['InputStream'] {
-    arguments = ArrayList@583[empty]
-    classifier = JavaClassImpl@574['InputStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@584['InputStream'] {
-    arguments = ArrayList@585[empty]
-    classifier = JavaClassImpl@577['InputStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@586['InputStream'] {
-    arguments = ArrayList@587[empty]
-    classifier = JavaClassImpl@565['InputStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
-}
-
-LazyJavaClassifierType@236['List<E>'] {
-    arguments = ArrayList@588[1] { TypeProjectionImpl@589 }
-    classifier = JavaClassImpl@590['List']
-    memberScope = SubstitutingScope@591
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@592
-}
-
-LazyJavaClassifierType@248['List<E>'] {
-    arguments = ArrayList@593[1] { TypeProjectionImpl@594 }
-    classifier = JavaClassImpl@595['List']
-    memberScope = SubstitutingScope@596
-    typeConstructor = DeserializedClassTypeConstructor@592
-}
-
-LazyJavaClassifierType@597['Object'] {
-    arguments = ArrayList@598[empty]
-    classifier = JavaClassImpl@599['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@602['Object'] {
-    arguments = ArrayList@603[empty]
-    classifier = JavaClassImpl@604['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@605['Object'] {
-    arguments = ArrayList@606[empty]
-    classifier = JavaClassImpl@607['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@608['Object'] {
-    arguments = ArrayList@609[empty]
-    classifier = JavaClassImpl@610['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@611['Object'] {
-    arguments = ArrayList@612[empty]
-    classifier = JavaClassImpl@610['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@613['Object'] {
-    arguments = ArrayList@614[empty]
-    classifier = JavaClassImpl@604['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@615['Object'] {
-    arguments = ArrayList@616[empty]
-    classifier = JavaClassImpl@607['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@617['Object'] {
-    arguments = ArrayList@618[empty]
-    classifier = JavaClassImpl@599['Object']
-    memberScope = DeserializedClassMemberScope@600
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@619['Object'] {
-    arguments = ArrayList@620[empty]
-    classifier = JavaClassImpl@621['Object']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@622['Object'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaClassImpl@624['Object']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@625['Object'] {
-    arguments = ArrayList@626[empty]
-    classifier = JavaClassImpl@627['Object']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@628['Object'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaClassImpl@624['Object']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@630['Object'] {
-    arguments = ArrayList@631[empty]
-    classifier = JavaClassImpl@627['Object']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@632['Object'] {
-    arguments = ArrayList@633[empty]
-    classifier = JavaClassImpl@621['Object']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@634['Object'] {
-    classifier = JavaClassImpl@635['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@636['Object'] {
-    classifier = JavaClassImpl@637['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@638['Object'] {
-    classifier = JavaClassImpl@639['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@640['Object'] {
-    classifier = JavaClassImpl@641['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@642['Object'] {
-    classifier = JavaClassImpl@643['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@644['Object'] {
-    classifier = JavaClassImpl@645['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@646['Object'] {
-    classifier = JavaClassImpl@647['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@648['Object'] {
-    classifier = JavaClassImpl@649['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@650['Object'] {
-    classifier = JavaClassImpl@651['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@652['Object'] {
-    classifier = JavaClassImpl@653['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@654['Object'] {
-    classifier = JavaClassImpl@655['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@656['Object'] {
-    classifier = JavaClassImpl@657['Object']
-    typeConstructor = DeserializedClassTypeConstructor@601
-}
-
-LazyJavaClassifierType@264['OutputStream'] {
-    arguments = ArrayList@658[empty]
-    classifier = JavaClassImpl@659['OutputStream']
-    memberScope = LazyJavaClassMemberScope@140
-    typeConstructor = LazyJavaClassTypeConstructor@142['OutputStream']
-}
-
-LazyJavaClassifierType@660['PrintStream'] {
-    arguments = ArrayList@661[empty]
-    classifier = JavaClassImpl@662['PrintStream']
-    memberScope = LazyJavaClassMemberScope@146
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
-}
-
-LazyJavaClassifierType@663['PrintStream'] {
-    arguments = ArrayList@664[empty]
-    classifier = JavaClassImpl@662['PrintStream']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
-}
-
-LazyJavaClassifierType@249['RandomAccess'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaClassImpl@666['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@172
-    typeConstructor = LazyJavaClassTypeConstructor@174['RandomAccess']
-}
-
-LazyJavaClassifierType@288['Readable'] {
-    arguments = ArrayList@667[empty]
-    classifier = JavaClassImpl@668['Readable']
-    memberScope = LazyJavaClassMemberScope@176
-    typeConstructor = LazyJavaClassTypeConstructor@178['Readable']
-}
-
-LazyJavaClassifierType@254['Reader'] {
-    arguments = ArrayList@669[empty]
-    classifier = JavaClassImpl@670['Reader']
-    memberScope = LazyJavaClassMemberScope@180
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@671['Reader'] {
-    arguments = ArrayList@672[empty]
-    classifier = JavaClassImpl@673['Reader']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@674['Reader'] {
-    arguments = ArrayList@675[empty]
-    classifier = JavaClassImpl@676['Reader']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@677['Reader'] {
-    arguments = ArrayList@678[empty]
-    classifier = JavaClassImpl@673['Reader']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@679['Reader'] {
-    arguments = ArrayList@680[empty]
-    classifier = JavaClassImpl@676['Reader']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@270['Reader'] {
-    arguments = ArrayList@681[empty]
-    classifier = JavaClassImpl@682['Reader']
-    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
-}
-
-LazyJavaClassifierType@281['Serializable'] {
-    arguments = ArrayList@683[empty]
-    classifier = JavaClassImpl@684['Serializable']
-    memberScope = LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
-LazyJavaClassifierType@300['Serializable'] {
-    arguments = ArrayList@685[empty]
-    classifier = JavaClassImpl@686['Serializable']
-    memberScope = LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
-LazyJavaClassifierType@687['Serializable'] {
-    arguments = ArrayList@688[empty]
-    classifier = JavaClassImpl@689['Serializable']
-    memberScope = LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
-LazyJavaClassifierType@295['Serializable'] {
-    classifier = JavaClassImpl@690['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
-}
-
-LazyJavaClassifierType@691['String'] {
-    arguments = ArrayList@692[empty]
-    classifier = JavaClassImpl@693['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@695['String'] {
-    arguments = ArrayList@696[empty]
-    classifier = JavaClassImpl@697['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@698['String'] {
-    arguments = ArrayList@699[empty]
-    classifier = JavaClassImpl@700['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@701['String'] {
-    arguments = ArrayList@702[empty]
-    classifier = JavaClassImpl@703['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@704['String'] {
-    arguments = ArrayList@705[empty]
-    classifier = JavaClassImpl@706['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@707['String'] {
-    arguments = ArrayList@708[empty]
-    classifier = JavaClassImpl@709['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@710['String'] {
-    arguments = ArrayList@711[empty]
-    classifier = JavaClassImpl@712['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@713['String'] {
-    arguments = ArrayList@714[empty]
-    classifier = JavaClassImpl@715['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@716['String'] {
-    arguments = ArrayList@717[empty]
-    classifier = JavaClassImpl@718['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@719['String'] {
-    arguments = ArrayList@720[empty]
-    classifier = JavaClassImpl@721['String']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@722['String'] {
-    arguments = ArrayList@723[empty]
-    classifier = JavaClassImpl@693['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@724['String'] {
-    arguments = ArrayList@725[empty]
-    classifier = JavaClassImpl@718['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@726['String'] {
-    arguments = ArrayList@727[empty]
-    classifier = JavaClassImpl@721['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@728['String'] {
-    arguments = ArrayList@729[empty]
-    classifier = JavaClassImpl@703['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@730['String'] {
-    arguments = ArrayList@731[empty]
-    classifier = JavaClassImpl@712['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@732['String'] {
-    arguments = ArrayList@733[empty]
-    classifier = JavaClassImpl@715['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@734['String'] {
-    arguments = ArrayList@735[empty]
-    classifier = JavaClassImpl@709['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@736['String'] {
-    arguments = ArrayList@737[empty]
-    classifier = JavaClassImpl@706['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@738['String'] {
-    arguments = ArrayList@739[empty]
-    classifier = JavaClassImpl@697['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@740['String'] {
-    arguments = ArrayList@741[empty]
-    classifier = JavaClassImpl@700['String']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@694
-}
-
-LazyJavaClassifierType@742['StringBuffer'] {
-    arguments = ArrayList@743[empty]
-    classifier = JavaClassImpl@744['StringBuffer']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
-}
-
-LazyJavaClassifierType@745['StringBuffer'] {
-    arguments = ArrayList@746[empty]
-    classifier = JavaClassImpl@747['StringBuffer']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
-}
-
-LazyJavaClassifierType@748['StringBuffer'] {
-    arguments = ArrayList@749[empty]
-    classifier = JavaClassImpl@747['StringBuffer']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
-}
-
-LazyJavaClassifierType@750['StringBuffer'] {
-    arguments = ArrayList@751[empty]
-    classifier = JavaClassImpl@744['StringBuffer']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
-}
-
-LazyJavaClassifierType@752['StringBuilder'] {
-    arguments = ArrayList@753[empty]
-    classifier = JavaClassImpl@754['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@755['StringBuilder'] {
-    arguments = ArrayList@756[empty]
-    classifier = JavaClassImpl@757['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@758['StringBuilder'] {
-    arguments = ArrayList@759[empty]
-    classifier = JavaClassImpl@760['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@761['StringBuilder'] {
-    arguments = ArrayList@762[empty]
-    classifier = JavaClassImpl@763['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@764['StringBuilder'] {
-    arguments = ArrayList@765[empty]
-    classifier = JavaClassImpl@766['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@767['StringBuilder'] {
-    arguments = ArrayList@768[empty]
-    classifier = JavaClassImpl@769['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@770['StringBuilder'] {
-    arguments = ArrayList@771[empty]
-    classifier = JavaClassImpl@772['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@773['StringBuilder'] {
-    arguments = ArrayList@774[empty]
-    classifier = JavaClassImpl@775['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@776['StringBuilder'] {
-    arguments = ArrayList@777[empty]
-    classifier = JavaClassImpl@778['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@779['StringBuilder'] {
-    arguments = ArrayList@780[empty]
-    classifier = JavaClassImpl@781['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@782['StringBuilder'] {
-    arguments = ArrayList@783[empty]
-    classifier = JavaClassImpl@784['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@785['StringBuilder'] {
-    arguments = ArrayList@786[empty]
-    classifier = JavaClassImpl@787['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@788['StringBuilder'] {
-    arguments = ArrayList@789[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@791['StringBuilder'] {
-    arguments = ArrayList@792[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@794['StringBuilder'] {
-    arguments = ArrayList@795[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@797['StringBuilder'] {
-    arguments = ArrayList@798[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
-    nullable = 'false': Boolean@307
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@800['StringBuilder'] {
-    arguments = ArrayList@801[empty]
-    classifier = JavaClassImpl@790['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@802['StringBuilder'] {
-    arguments = ArrayList@803[empty]
-    classifier = JavaClassImpl@799['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@804['StringBuilder'] {
-    arguments = ArrayList@805[empty]
-    classifier = JavaClassImpl@778['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@806['StringBuilder'] {
-    arguments = ArrayList@807[empty]
-    classifier = JavaClassImpl@793['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@808['StringBuilder'] {
-    arguments = ArrayList@809[empty]
-    classifier = JavaClassImpl@763['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@810['StringBuilder'] {
-    arguments = ArrayList@811[empty]
-    classifier = JavaClassImpl@775['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@812['StringBuilder'] {
-    arguments = ArrayList@813[empty]
-    classifier = JavaClassImpl@787['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@814['StringBuilder'] {
-    arguments = ArrayList@815[empty]
-    classifier = JavaClassImpl@772['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@816['StringBuilder'] {
-    arguments = ArrayList@817[empty]
-    classifier = JavaClassImpl@796['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@818['StringBuilder'] {
-    arguments = ArrayList@819[empty]
-    classifier = JavaClassImpl@781['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@820['StringBuilder'] {
-    arguments = ArrayList@821[empty]
-    classifier = JavaClassImpl@754['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@822['StringBuilder'] {
-    arguments = ArrayList@823[empty]
-    classifier = JavaClassImpl@769['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@824['StringBuilder'] {
-    arguments = ArrayList@825[empty]
-    classifier = JavaClassImpl@784['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@826['StringBuilder'] {
-    arguments = ArrayList@827[empty]
-    classifier = JavaClassImpl@760['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@828['StringBuilder'] {
-    arguments = ArrayList@829[empty]
-    classifier = JavaClassImpl@766['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@830['StringBuilder'] {
-    arguments = ArrayList@831[empty]
-    classifier = JavaClassImpl@757['StringBuilder']
-    nullable = 'true': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
-}
-
-LazyJavaClassifierType@832['Throwable'] {
-    arguments = ArrayList@833[empty]
-    classifier = JavaClassImpl@834['Throwable']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@836['Throwable'] {
-    arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@838['Throwable']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@839['Throwable'] {
-    arguments = ArrayList@840[empty]
-    classifier = JavaClassImpl@841['Throwable']
-    nullable = 'false': Boolean@307
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@842['Throwable'] {
-    arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@834['Throwable']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@844['Throwable'] {
-    arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@838['Throwable']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@846['Throwable'] {
-    arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@841['Throwable']
-    nullable = 'true': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaClassifierType@261['Throwable'] {
-    arguments = ArrayList@848[empty]
-    classifier = JavaClassImpl@849['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@835
-}
-
-LazyJavaPackageFragmentProvider@850 {
-    packageFragments('<root>': FqName@851) = LazyJavaPackageFragment@852['<root>']
-    packageFragments('Array': FqName@853) = null
-    packageFragments('ArrayList': FqName@854) = null
-    packageFragments('Char': FqName@855) = null
-    packageFragments('CharSequence': FqName@856) = null
-    packageFragments('Int': FqName@857) = null
-    packageFragments('String': FqName@858) = null
-    packageFragments('StringBuilder': FqName@859) = null
-    packageFragments('System': FqName@860) = null
-    packageFragments('Throwable': FqName@861) = null
-    packageFragments('java': FqName@862) = LazyJavaPackageFragment@863['java']
-    packageFragments('java.io': FqName@864) = LazyJavaPackageFragment@865['io']
-    packageFragments('java.io.Array': FqName@866) = null
-    packageFragments('java.io.ArrayList': FqName@867) = null
-    packageFragments('java.io.Char': FqName@868) = null
-    packageFragments('java.io.CharSequence': FqName@869) = null
-    packageFragments('java.io.Int': FqName@870) = null
-    packageFragments('java.io.String': FqName@871) = null
-    packageFragments('java.io.StringBuilder': FqName@872) = null
-    packageFragments('java.io.System': FqName@873) = null
-    packageFragments('java.io.Throwable': FqName@874) = null
-    packageFragments('java.lang': FqName@875) = LazyJavaPackageFragment@876['lang']
-    packageFragments('java.lang.Array': FqName@877) = null
-    packageFragments('java.lang.ArrayList': FqName@878) = null
-    packageFragments('java.lang.Char': FqName@879) = null
-    packageFragments('java.lang.CharSequence': FqName@880) = null
-    packageFragments('java.lang.Int': FqName@881) = null
-    packageFragments('java.lang.String': FqName@882) = null
-    packageFragments('java.lang.StringBuilder': FqName@883) = null
-    packageFragments('java.lang.System': FqName@884) = null
-    packageFragments('java.lang.Throwable': FqName@885) = null
-    packageFragments('java.nio.charset': FqName@886) = LazyJavaPackageFragment@887['charset']
-    packageFragments('java.util': FqName@888) = LazyJavaPackageFragment@889['util']
-    packageFragments('java.util.Array': FqName@890) = null
-    packageFragments('java.util.ArrayList': FqName@891) = null
-    packageFragments('java.util.Char': FqName@892) = null
-    packageFragments('java.util.CharSequence': FqName@893) = null
-    packageFragments('java.util.Int': FqName@894) = null
-    packageFragments('java.util.String': FqName@895) = null
-    packageFragments('java.util.StringBuilder': FqName@896) = null
-    packageFragments('java.util.System': FqName@897) = null
-    packageFragments('java.util.Throwable': FqName@898) = null
-    packageFragments('kotlin': FqName@899) = null
-    packageFragments('kotlin.Array': FqName@900) = null
-    packageFragments('kotlin.ArrayList': FqName@901) = null
-    packageFragments('kotlin.Char': FqName@902) = null
-    packageFragments('kotlin.CharSequence': FqName@903) = null
-    packageFragments('kotlin.Int': FqName@904) = null
-    packageFragments('kotlin.String': FqName@905) = null
-    packageFragments('kotlin.StringBuilder': FqName@906) = null
-    packageFragments('kotlin.System': FqName@907) = null
-    packageFragments('kotlin.Throwable': FqName@908) = null
-    packageFragments('kotlin.io': FqName@909) = null
-    packageFragments('kotlin.jvm': FqName@910) = null
-    topLevelClasses(JavaClassImpl@305['AbstractCollection']) = LazyJavaClassDescriptor@1['AbstractCollection']
-    topLevelClasses(JavaClassImpl@310['AbstractList']) = LazyJavaClassDescriptor@16['AbstractList']
-    topLevelClasses(JavaClassImpl@313['AbstractStringBuilder']) = LazyJavaClassDescriptor@32['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@388['Appendable']) = LazyJavaClassDescriptor@52['Appendable']
-    topLevelClasses(JavaClassImpl@911['ArrayList']) = LazyJavaClassDescriptor@68['ArrayList']
-    topLevelClasses(JavaClassImpl@407['AutoCloseable']) = LazyJavaClassDescriptor@91['AutoCloseable']
-    topLevelClasses(JavaClassImpl@912['BufferedReader']) = LazyJavaClassDescriptor@96['BufferedReader']
-    topLevelClasses(JavaClassImpl@452['Charset']) = LazyJavaClassDescriptor@111['Charset']
-    topLevelClasses(JavaClassImpl@464['Closeable']) = LazyJavaClassDescriptor@113['Closeable']
-    topLevelClasses(JavaClassImpl@913['Exception']) = LazyJavaClassDescriptor@117['Exception']
-    topLevelClasses(JavaClassImpl@560['FilterOutputStream']) = LazyJavaClassDescriptor@125['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@577['InputStream']) = LazyJavaClassDescriptor@129['InputStream']
-    topLevelClasses(JavaClassImpl@914['InputStreamReader']) = LazyJavaClassDescriptor@131['InputStreamReader']
-    topLevelClasses(JavaClassImpl@659['OutputStream']) = LazyJavaClassDescriptor@139['OutputStream']
-    topLevelClasses(JavaClassImpl@662['PrintStream']) = LazyJavaClassDescriptor@143['PrintStream']
-    topLevelClasses(JavaClassImpl@915['Random']) = LazyJavaClassDescriptor@156['Random']
-    topLevelClasses(JavaClassImpl@666['RandomAccess']) = LazyJavaClassDescriptor@171['RandomAccess']
-    topLevelClasses(JavaClassImpl@668['Readable']) = LazyJavaClassDescriptor@175['Readable']
-    topLevelClasses(JavaClassImpl@673['Reader']) = LazyJavaClassDescriptor@179['Reader']
-    topLevelClasses(JavaClassImpl@686['Serializable']) = LazyJavaClassDescriptor@183['Serializable']
-    topLevelClasses(JavaClassImpl@744['StringBuffer']) = LazyJavaClassDescriptor@188['StringBuffer']
-    topLevelClasses(JavaClassImpl@916['StringBuilder']) = LazyJavaClassDescriptor@190['StringBuilder']
-    topLevelClasses(JavaClassImpl@917['System']) = LazyJavaClassDescriptor@214['System']
-}
-
-LazyJavaPackageFragment@852['<root>'] {
-    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('ArrayList': Name@920) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('java': Name@935) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@919
-    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('java': Name@940) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
-    memberIndex = computeMemberIndex$1@941 // through LazyPackageFragmentScopeForJavaPackage@919
-}
-
-LazyJavaPackageFragment@865['io'] {
-    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('ArrayList': Name@920) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('BufferedReader': Name@921) = LazyJavaClassDescriptor@96['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('InputStreamReader': Name@925) = LazyJavaClassDescriptor@131['InputStreamReader'] // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@942
-    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
-    memberIndex = computeMemberIndex$1@943 // through LazyPackageFragmentScopeForJavaPackage@942
-}
-
-LazyJavaPackageFragment@863['java'] {
-    classes('io': Name@944) = null // through LazyPackageFragmentScopeForJavaPackage@945
-    classes('lang': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@945
-    classes('util': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@945
-    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@945
-    functions('io': Name@948) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
-    functions('lang': Name@949) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
-    functions('util': Name@950) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
-    memberIndex = computeMemberIndex$1@951 // through LazyPackageFragmentScopeForJavaPackage@945
-}
-
-LazyJavaPackageFragment@876['lang'] {
-    classes('ArrayList': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('Exception': Name@924) = LazyJavaClassDescriptor@117['Exception'] // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('StringBuilder': Name@929) = LazyJavaClassDescriptor@190['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('System': Name@930) = LazyJavaClassDescriptor@214['System'] // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@952
-    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
-    memberIndex = computeMemberIndex$1@953 // through LazyPackageFragmentScopeForJavaPackage@952
-}
-
-LazyJavaPackageFragment@889['util'] {
-    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('ArrayList': Name@920) = LazyJavaClassDescriptor@68['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('Random': Name@927) = LazyJavaClassDescriptor@156['Random'] // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@954
-    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
-    memberIndex = computeMemberIndex$1@955 // through LazyPackageFragmentScopeForJavaPackage@954
-}
-
-LazyJavaTypeParameterDescriptor@245['E'] {
-    defaultType = JetTypeImpl@956['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-    upperBounds = LinkedHashSet@957[1] { NullableType@958 }
-    upperBoundsAsType = NullableType@958
-}
-
-LazyJavaTypeParameterDescriptor@233['E'] {
-    defaultType = JetTypeImpl@959['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
-    upperBounds = LinkedHashSet@960[1] { NullableType@961 }
-    upperBoundsAsType = NullableType@961
-}
-
-LazyJavaTypeParameterDescriptor@229['E'] {
-    defaultType = JetTypeImpl@962['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@509
-    upperBounds = LinkedHashSet@963[1] { NullableType@964 }
-    upperBoundsAsType = NullableType@964
-}
-
-LazyJavaTypeParameterResolver@965 {
-    resolve(JavaTypeParameterImpl@966['E']) = LazyJavaTypeParameterDescriptor@245['E']
-}
-
-LazyJavaTypeParameterResolver@967 {
-    resolve(JavaTypeParameterImpl@968['E']) = LazyJavaTypeParameterDescriptor@233['E']
-}
-
-LazyJavaTypeParameterResolver@969 {
-    resolve(JavaTypeParameterImpl@970['E']) = LazyJavaTypeParameterDescriptor@229['E']
-}
-
-LazyJavaTypeParameterResolver@971 {
-    resolve(JavaTypeParameterImpl@524['E']) = null
-}
-
-LazyJavaTypeParameterResolver@972 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@973 {
-    resolve(JavaTypeParameterImpl@505['E']) = null
-}
-
-LazyJavaTypeParameterResolver@974 {
-    resolve(JavaTypeParameterImpl@515['E']) = null
-}
-
-LazyJavaTypeParameterResolver@975 {
-    resolve(JavaTypeParameterImpl@527['E']) = null
-}
-
-LazyJavaTypeParameterResolver@976 {
-    resolve(JavaTypeParameterImpl@499['E']) = null
-}
-
-LazyJavaTypeParameterResolver@977 {
-    resolve(JavaTypeParameterImpl@530['E']) = null
-}
-
-ResolutionTaskHolder@978 {
-    <name not found> = ArrayList@979[10] { ResolutionCandidate@980, ResolutionCandidate@981, ResolutionCandidate@982, ... }
-}
-
-ResolutionTaskHolder@983 {
-    <name not found> = ArrayList@984[10] { ResolutionCandidate@985, ResolutionCandidate@986, ResolutionCandidate@987, ... }
-}
-
-ResolutionTaskHolder@988 {
-    <name not found> = ArrayList@989[10] { ResolutionCandidate@990, ResolutionCandidate@991, ResolutionCandidate@992, ... }
-}
-
-ResolutionTaskHolder@993 {
-    <name not found> = ArrayList@994[10] { ResolutionCandidate@995, ResolutionCandidate@996, ResolutionCandidate@997, ... }
-}
-
-ResolutionTaskHolder@998 {
-    <name not found> = ArrayList@999[10] { ResolutionCandidate@1000, ResolutionCandidate@1001, ResolutionCandidate@1002, ... }
-}
-
-ResolutionTaskHolder@1003 {
-    <name not found> = ArrayList@1004[10] { ResolutionCandidate@1005, ResolutionCandidate@1006, ResolutionCandidate@1007, ... }
-}
-
-ResolutionTaskHolder@1008 {
-    <name not found> = ArrayList@1009[13] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1012, ... }
-}
-
-ResolutionTaskHolder@1013 {
-    <name not found> = ArrayList@1014[13] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1017, ... }
-}
-
-ResolutionTaskHolder@1018 {
-    <name not found> = ArrayList@1019[1] { ResolutionCandidate@1020 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1021 {
-    <name not found> = ArrayList@1022[1] { ResolutionCandidate@1023 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1024 {
-    <name not found> = ArrayList@1025[1] { ResolutionCandidate@1026 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1027 {
-    <name not found> = ArrayList@1028[1] { ResolutionCandidate@1029 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1030 {
-    <name not found> = ArrayList@1031[1] { ResolutionCandidate@1032 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1033 {
-    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1035 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1036 {
-    <name not found> = ArrayList@1037[1] { ResolutionCandidate@1038 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1039 {
-    <name not found> = ArrayList@1040[1] { ResolutionCandidate@1041 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1042 {
-    <name not found> = ArrayList@1043[1] { ResolutionCandidate@1044 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1045 {
-    <name not found> = ArrayList@1046[1] { ResolutionCandidate@1047 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1048 {
-    <name not found> = ArrayList@1049[1] { ResolutionCandidate@1050 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1051 {
-    <name not found> = ArrayList@1052[1] { ResolutionCandidate@1053 }
-}
-
-ResolutionTaskHolder@1054 {
-    <name not found> = ArrayList@1055[1] { ResolutionCandidate@1056 }
-}
-
-ResolutionTaskHolder@1057 {
-    <name not found> = ArrayList@1058[1] { ResolutionCandidate@1059 }
-}
-
-ResolutionTaskHolder@1060 {
-    <name not found> = ArrayList@1061[1] { ResolutionCandidate@1062 }
-}
-
-ResolutionTaskHolder@1063 {
-    <name not found> = ArrayList@1064[1] { ResolutionCandidate@1065 }
-}
-
-ResolutionTaskHolder@1066 {
-    <name not found> = ArrayList@1067[1] { ResolutionCandidate@1068 }
-}
-
-ResolutionTaskHolder@1069 {
-    <name not found> = ArrayList@1070[1] { ResolutionCandidate@1071 }
-}
-
-ResolutionTaskHolder@1072 {
-    <name not found> = ArrayList@1073[1] { ResolutionCandidate@1074 }
-}
-
-ResolutionTaskHolder@1075 {
-    <name not found> = ArrayList@1076[1] { ResolutionCandidate@1077 }
-}
-
-ResolutionTaskHolder@1078 {
-    <name not found> = ArrayList@1079[1] { ResolutionCandidate@1080 }
-}
-
-ResolutionTaskHolder@1081 {
-    <name not found> = ArrayList@1082[1] { ResolutionCandidate@1083 }
-}
-
-ResolutionTaskHolder@1084 {
-    <name not found> = ArrayList@1085[1] { ResolutionCandidate@1086 }
-}
-
-ResolutionTaskHolder@1087 {
-    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1089 }
-}
-
-ResolutionTaskHolder@1090 {
-    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1092 }
-}
-
-ResolutionTaskHolder@1093 {
-    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1095 }
-}
-
-ResolutionTaskHolder@1096 {
-    <name not found> = ArrayList@1097[1] { ResolutionCandidate@1098 }
-}
-
-ResolutionTaskHolder@1099 {
-    <name not found> = ArrayList@1100[1] { ResolutionCandidate@1101 }
-}
-
-ResolutionTaskHolder@1102 {
-    <name not found> = ArrayList@1103[1] { ResolutionCandidate@1104 }
-}
-
-ResolutionTaskHolder@1105 {
-    <name not found> = ArrayList@1106[1] { ResolutionCandidate@1107 }
-}
-
-ResolutionTaskHolder@1108 {
-    <name not found> = ArrayList@1109[1] { ResolutionCandidate@1110 }
-}
-
-ResolutionTaskHolder@1111 {
-    <name not found> = ArrayList@1112[1] { ResolutionCandidate@1113 }
-}
-
-ResolutionTaskHolder@1114 {
-    <name not found> = ArrayList@1115[1] { ResolutionCandidate@1116 }
-}
-
-ResolutionTaskHolder@1117 {
-    <name not found> = ArrayList@1118[1] { ResolutionCandidate@1119 }
-}
-
-ResolutionTaskHolder@1120 {
-    <name not found> = ArrayList@1121[1] { ResolutionCandidate@1122 }
-}
-
-ResolutionTaskHolder@1123 {
-    <name not found> = ArrayList@1124[1] { ResolutionCandidate@1125 }
-}
-
-ResolutionTaskHolder@1126 {
-    <name not found> = ArrayList@1127[1] { ResolutionCandidate@1128 }
-}
-
-ResolutionTaskHolder@1129 {
-    <name not found> = ArrayList@1130[1] { ResolutionCandidate@1131 }
-}
-
-ResolutionTaskHolder@1132 {
-    <name not found> = ArrayList@1133[1] { ResolutionCandidate@1134 }
-}
-
-ResolutionTaskHolder@1135 {
-    <name not found> = ArrayList@1136[1] { ResolutionCandidate@1137 }
-}
-
-ResolutionTaskHolder@1138 {
-    <name not found> = ArrayList@1139[1] { ResolutionCandidate@1140 }
-}
-
-ResolutionTaskHolder@1141 {
-    <name not found> = ArrayList@1142[1] { ResolutionCandidate@1143 }
-}
-
-ResolutionTaskHolder@1144 {
-    <name not found> = ArrayList@1145[1] { ResolutionCandidate@1146 }
-}
-
-ResolutionTaskHolder@1147 {
-    <name not found> = ArrayList@1148[1] { ResolutionCandidate@1149 }
-}
-
-ResolutionTaskHolder@1150 {
-    <name not found> = ArrayList@1151[1] { ResolutionCandidate@1152 }
-}
-
-ResolutionTaskHolder@1153 {
-    <name not found> = ArrayList@1154[1] { ResolutionCandidate@1155 }
-}
-
-ResolutionTaskHolder@1156 {
-    <name not found> = ArrayList@1157[1] { ResolutionCandidate@1158 }
-}
-
-ResolutionTaskHolder@1159 {
-    <name not found> = ArrayList@1160[1] { ResolutionCandidate@1161 }
-}
-
-ResolutionTaskHolder@1162 {
-    <name not found> = ArrayList@1163[1] { ResolutionCandidate@1164 }
-}
-
-ResolutionTaskHolder@1165 {
-    <name not found> = ArrayList@1166[1] { ResolutionCandidate@1167 }
-}
-
-ResolutionTaskHolder@1168 {
-    <name not found> = ArrayList@1169[1] { ResolutionCandidate@1170 }
-}
-
-ResolutionTaskHolder@1171 {
-    <name not found> = ArrayList@1172[1] { ResolutionCandidate@1173 }
-}
-
-ResolutionTaskHolder@1174 {
-    <name not found> = ArrayList@1175[1] { ResolutionCandidate@1176 }
-}
-
-ResolutionTaskHolder@1177 {
-    <name not found> = ArrayList@1178[1] { ResolutionCandidate@1179 }
-}
-
-ResolutionTaskHolder@1180 {
-    <name not found> = ArrayList@1181[1] { ResolutionCandidate@1182 }
-}
-
-ResolutionTaskHolder@1183 {
-    <name not found> = ArrayList@1184[1] { ResolutionCandidate@1185 }
-}
-
-ResolutionTaskHolder@1186 {
-    <name not found> = ArrayList@1187[1] { ResolutionCandidate@1188 }
-}
-
-ResolutionTaskHolder@1189 {
-    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1191 }
-}
-
-ResolutionTaskHolder@1192 {
-    <name not found> = ArrayList@1193[1] { ResolutionCandidate@1194 }
-}
-
-ResolutionTaskHolder@1195 {
-    <name not found> = ArrayList@1196[1] { ResolutionCandidate@1197 }
-}
-
-ResolutionTaskHolder@1198 {
-    <name not found> = ArrayList@1199[1] { ResolutionCandidate@1200 }
-}
-
-ResolutionTaskHolder@1201 {
-    <name not found> = ArrayList@1202[1] { ResolutionCandidate@1203 }
-}
-
-ResolutionTaskHolder@1204 {
-    <name not found> = ArrayList@1205[1] { ResolutionCandidate@1206 }
-}
-
-ResolutionTaskHolder@1207 {
-    <name not found> = ArrayList@1208[1] { ResolutionCandidate@1209 }
-}
-
-ResolutionTaskHolder@1210 {
-    <name not found> = ArrayList@1211[1] { ResolutionCandidate@1212 }
-}
-
-ResolutionTaskHolder@1213 {
-    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1215 }
-}
-
-ResolutionTaskHolder@1216 {
-    <name not found> = ArrayList@1217[1] { ResolutionCandidate@1218 }
-}
-
-ResolutionTaskHolder@1219 {
-    <name not found> = ArrayList@1220[1] { ResolutionCandidate@1221 }
-}
-
-ResolutionTaskHolder@1222 {
-    <name not found> = ArrayList@1223[1] { ResolutionCandidate@1224 }
-}
-
-ResolutionTaskHolder@1225 {
-    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1227 }
-}
-
-ResolutionTaskHolder@1228 {
-    <name not found> = ArrayList@1229[1] { ResolutionCandidate@1230 }
-}
-
-ResolutionTaskHolder@1231 {
-    <name not found> = ArrayList@1232[1] { ResolutionCandidate@1233 }
-}
-
-ResolutionTaskHolder@1234 {
-    <name not found> = ArrayList@1235[2] { ResolutionCandidate@1236, ResolutionCandidate@1237 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1238 {
-    <name not found> = ArrayList@1239[2] { ResolutionCandidate@1240, ResolutionCandidate@1241 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1242 {
-    <name not found> = ArrayList@1243[2] { ResolutionCandidate@1244, ResolutionCandidate@1245 }
-}
-
-ResolutionTaskHolder@1246 {
-    <name not found> = ArrayList@1247[2] { ResolutionCandidate@1248, ResolutionCandidate@1249 }
-}
-
-ResolutionTaskHolder@1250 {
-    <name not found> = ArrayList@1251[2] { ResolutionCandidate@1252, ResolutionCandidate@1253 }
-}
-
-ResolutionTaskHolder@1254 {
-    <name not found> = ArrayList@1255[3] { ResolutionCandidate@1256, ResolutionCandidate@1257, ResolutionCandidate@1258 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1259 {
-    <name not found> = ArrayList@1260[4] { ResolutionCandidate@1261, ResolutionCandidate@1262, ResolutionCandidate@1263, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1264 {
-    <name not found> = ArrayList@1265[4] { ResolutionCandidate@1266, ResolutionCandidate@1267, ResolutionCandidate@1268, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1269 {
-    <name not found> = ArrayList@1270[4] { ResolutionCandidate@1271, ResolutionCandidate@1272, ResolutionCandidate@1273, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1274 {
-    <name not found> = ArrayList@1275[4] { ResolutionCandidate@1276, ResolutionCandidate@1277, ResolutionCandidate@1278, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1279 {
-    <name not found> = ArrayList@1280[4] { ResolutionCandidate@1281, ResolutionCandidate@1282, ResolutionCandidate@1283, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1284 {
-    <name not found> = ArrayList@1285[4] { ResolutionCandidate@1286, ResolutionCandidate@1287, ResolutionCandidate@1288, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1289 {
-    <name not found> = ArrayList@1290[7] { ResolutionCandidate@1291, ResolutionCandidate@1292, ResolutionCandidate@1293, ... }
-}
-
-ResolutionTaskHolder@1294 {
-    <name not found> = ArrayList@1295[7] { ResolutionCandidate@1296, ResolutionCandidate@1297, ResolutionCandidate@1298, ... }
-}
-
-ResolutionTaskHolder@1299 {
-    <name not found> = ArrayList@1300[7] { ResolutionCandidate@1301, ResolutionCandidate@1302, ResolutionCandidate@1303, ... }
-}
-
-ResolutionTaskHolder@1304 {
-    <name not found> = ArrayList@1305[7] { ResolutionCandidate@1306, ResolutionCandidate@1307, ResolutionCandidate@1308, ... }
-}
-
-ResolutionTaskHolder@1309 {
-    <name not found> = ArrayList@1310[7] { ResolutionCandidate@1311, ResolutionCandidate@1312, ResolutionCandidate@1313, ... }
-}
-
-ResolutionTaskHolder@1314 {
-    <name not found> = ArrayList@1315[7] { ResolutionCandidate@1316, ResolutionCandidate@1317, ResolutionCandidate@1318, ... }
-}
-
-ResolutionTaskHolder@1319 {
-    <name not found> = ArrayList@1320[8] { ResolutionCandidate@1321, ResolutionCandidate@1322, ResolutionCandidate@1323, ... }
-}
-
-ResolutionTaskHolder@1324 {
-    <name not found> = ArrayList@1325[8] { ResolutionCandidate@1326, ResolutionCandidate@1327, ResolutionCandidate@1328, ... }
-}
-
-ResolutionTaskHolder@1329 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1330 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1331 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1332 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1333 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1334 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@1335 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-null {
-    <name not found> = ArrayList@1336[10] { ResolutionCandidate@995, ResolutionCandidate@996, ResolutionCandidate@997, ... }
-    <name not found> = ArrayList@1337[10] { ResolutionCandidate@1005, ResolutionCandidate@1006, ResolutionCandidate@1007, ... }
-    <name not found> = ArrayList@1338[10] { ResolutionCandidate@985, ResolutionCandidate@986, ResolutionCandidate@987, ... }
-    <name not found> = ArrayList@1339[10] { ResolutionCandidate@990, ResolutionCandidate@991, ResolutionCandidate@992, ... }
-    <name not found> = ArrayList@1340[10] { ResolutionCandidate@980, ResolutionCandidate@981, ResolutionCandidate@982, ... }
-    <name not found> = ArrayList@1341[10] { ResolutionCandidate@1000, ResolutionCandidate@1001, ResolutionCandidate@1002, ... }
-    <name not found> = ArrayList@1342[14] { ResolutionCandidate@1010, ResolutionCandidate@1011, ResolutionCandidate@1343, ... }
-    <name not found> = ArrayList@1344[14] { ResolutionCandidate@1015, ResolutionCandidate@1016, ResolutionCandidate@1345, ... }
-    <name not found> = ArrayList@1346[1] { ResolutionCandidate@1194 }
-    <name not found> = ArrayList@1347[1] { ResolutionCandidate@1173 }
-    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1101 }
-    <name not found> = ArrayList@1349[1] { ResolutionCandidate@1068 }
-    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1092 }
-    <name not found> = ArrayList@1351[1] { ResolutionCandidate@1053 }
-    <name not found> = ArrayList@1352[1] { ResolutionCandidate@1077 }
-    <name not found> = ArrayList@1353[1] { ResolutionCandidate@1170 }
-    <name not found> = ArrayList@1354[1] { ResolutionCandidate@1164 }
-    <name not found> = ArrayList@1355[1] { ResolutionCandidate@1020 }
-    <name not found> = ArrayList@1356[1] { ResolutionCandidate@1206 }
-    <name not found> = ArrayList@1357[1] { ResolutionCandidate@1215 }
-    <name not found> = ArrayList@1358[1] { ResolutionCandidate@1146 }
-    <name not found> = ArrayList@1359[1] { ResolutionCandidate@1089 }
-    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1113 }
-    <name not found> = ArrayList@1361[1] { ResolutionCandidate@1185 }
-    <name not found> = ArrayList@1362[1] { ResolutionCandidate@1098 }
-    <name not found> = ArrayList@1363[1] { ResolutionCandidate@1200 }
-    <name not found> = ArrayList@1364[1] { ResolutionCandidate@1149 }
-    <name not found> = ArrayList@1365[1] { ResolutionCandidate@1161 }
-    <name not found> = ArrayList@1366[1] { ResolutionCandidate@1167 }
-    <name not found> = ArrayList@1367[1] { ResolutionCandidate@1134 }
-    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1188 }
-    <name not found> = ArrayList@1369[1] { ResolutionCandidate@1176 }
-    <name not found> = ArrayList@1370[1] { ResolutionCandidate@1056 }
-    <name not found> = ArrayList@1371[1] { ResolutionCandidate@1095 }
-    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1023 }
-    <name not found> = ArrayList@1373[1] { ResolutionCandidate@1221 }
-    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1212 }
-    <name not found> = ArrayList@1375[1] { ResolutionCandidate@1122 }
-    <name not found> = ArrayList@1376[1] { ResolutionCandidate@1107 }
-    <name not found> = ArrayList@1377[1] { ResolutionCandidate@1230 }
-    <name not found> = ArrayList@1378[1] { ResolutionCandidate@1029 }
-    <name not found> = ArrayList@1379[1] { ResolutionCandidate@1083 }
-    <name not found> = ArrayList@1380[1] { ResolutionCandidate@1071 }
-    <name not found> = ArrayList@1381[1] { ResolutionCandidate@1143 }
-    <name not found> = ArrayList@1382[1] { ResolutionCandidate@1080 }
-    <name not found> = ArrayList@1383[1] { ResolutionCandidate@1104 }
-    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1197 }
-    <name not found> = ArrayList@1385[1] { ResolutionCandidate@1227 }
-    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1044 }
-    <name not found> = ArrayList@1387[1] { ResolutionCandidate@1155 }
-    <name not found> = ArrayList@1388[1] { ResolutionCandidate@1128 }
-    <name not found> = ArrayList@1389[1] { ResolutionCandidate@1233 }
-    <name not found> = ArrayList@1390[1] { ResolutionCandidate@1131 }
-    <name not found> = ArrayList@1391[1] { ResolutionCandidate@1062 }
-    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1203 }
-    <name not found> = ArrayList@1393[1] { ResolutionCandidate@1125 }
-    <name not found> = ArrayList@1394[1] { ResolutionCandidate@1119 }
-    <name not found> = ArrayList@1395[1] { ResolutionCandidate@1224 }
-    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1158 }
-    <name not found> = ArrayList@1397[1] { ResolutionCandidate@1050 }
-    <name not found> = ArrayList@1398[1] { ResolutionCandidate@1179 }
-    <name not found> = ArrayList@1399[1] { ResolutionCandidate@1218 }
-    <name not found> = ArrayList@1400[1] { ResolutionCandidate@1035 }
-    <name not found> = ArrayList@1401[1] { ResolutionCandidate@1041 }
-    <name not found> = ArrayList@1402[1] { ResolutionCandidate@1209 }
-    <name not found> = ArrayList@1403[1] { ResolutionCandidate@1182 }
-    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1047 }
-    <name not found> = ArrayList@1405[1] { ResolutionCandidate@1065 }
-    <name not found> = ArrayList@1406[1] { ResolutionCandidate@1074 }
-    <name not found> = ArrayList@1407[1] { ResolutionCandidate@1110 }
-    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1140 }
-    <name not found> = ArrayList@1409[1] { ResolutionCandidate@1026 }
-    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1059 }
-    <name not found> = ArrayList@1411[1] { ResolutionCandidate@1137 }
-    <name not found> = ArrayList@1412[1] { ResolutionCandidate@1032 }
-    <name not found> = ArrayList@1413[1] { ResolutionCandidate@1152 }
-    <name not found> = ArrayList@1414[1] { ResolutionCandidate@1191 }
-    <name not found> = ArrayList@1415[1] { ResolutionCandidate@1038 }
-    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1116 }
-    <name not found> = ArrayList@1417[2] { ResolutionCandidate@1248, ResolutionCandidate@1249 }
-    <name not found> = ArrayList@1418[2] { ResolutionCandidate@1240, ResolutionCandidate@1241 }
-    <name not found> = ArrayList@1419[2] { ResolutionCandidate@1244, ResolutionCandidate@1245 }
-    <name not found> = ArrayList@1420[2] { ResolutionCandidate@1252, ResolutionCandidate@1253 }
-    <name not found> = ArrayList@1421[2] { ResolutionCandidate@1236, ResolutionCandidate@1237 }
-    <name not found> = ArrayList@1422[2] { ResolutionCandidate@1423, ResolutionCandidate@1086 }
-    <name not found> = ArrayList@1424[3] { ResolutionCandidate@1256, ResolutionCandidate@1257, ResolutionCandidate@1258 }
-    <name not found> = ArrayList@1425[4] { ResolutionCandidate@1261, ResolutionCandidate@1262, ResolutionCandidate@1263, ... }
-    <name not found> = ArrayList@1426[4] { ResolutionCandidate@1286, ResolutionCandidate@1287, ResolutionCandidate@1288, ... }
-    <name not found> = ArrayList@1427[4] { ResolutionCandidate@1276, ResolutionCandidate@1277, ResolutionCandidate@1278, ... }
-    <name not found> = ArrayList@1428[5] { ResolutionCandidate@1266, ResolutionCandidate@1267, ResolutionCandidate@1268, ... }
-    <name not found> = ArrayList@1429[5] { ResolutionCandidate@1271, ResolutionCandidate@1272, ResolutionCandidate@1273, ... }
-    <name not found> = ArrayList@1430[5] { ResolutionCandidate@1281, ResolutionCandidate@1282, ResolutionCandidate@1283, ... }
-    <name not found> = ArrayList@1431[7] { ResolutionCandidate@1301, ResolutionCandidate@1302, ResolutionCandidate@1303, ... }
-    <name not found> = ArrayList@1432[7] { ResolutionCandidate@1306, ResolutionCandidate@1307, ResolutionCandidate@1308, ... }
-    <name not found> = ArrayList@1433[7] { ResolutionCandidate@1316, ResolutionCandidate@1317, ResolutionCandidate@1318, ... }
-    <name not found> = ArrayList@1434[7] { ResolutionCandidate@1291, ResolutionCandidate@1292, ResolutionCandidate@1293, ... }
-    <name not found> = ArrayList@1435[7] { ResolutionCandidate@1296, ResolutionCandidate@1297, ResolutionCandidate@1298, ... }
-    <name not found> = ArrayList@1436[7] { ResolutionCandidate@1311, ResolutionCandidate@1312, ResolutionCandidate@1313, ... }
-    <name not found> = ArrayList@1437[8] { ResolutionCandidate@1321, ResolutionCandidate@1322, ResolutionCandidate@1323, ... }
-    <name not found> = ArrayList@1438[8] { ResolutionCandidate@1326, ResolutionCandidate@1327, ResolutionCandidate@1328, ... }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log b/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
deleted file mode 100644
index d86bb77c1aa..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
deleted file mode 100644
index dd07b179c6b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('NoC': FqName@3) = null
-    packageFragments('NoC1': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.NoC': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.NoC': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-null {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
deleted file mode 100644
index fcfd467f7f9..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
+++ /dev/null
@@ -1,119 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('jet121': FqName@12) = null
-    packageFragments('jet121.Int': FqName@13) = null
-    packageFragments('jet121.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('apply': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('length': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('apply': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('get': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
deleted file mode 100644
index b7fa3e75f30..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('foo1': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('h': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('m': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo1': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('h': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('m': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('foo1': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('h': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('m': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo1': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('h': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('m': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
deleted file mode 100644
index d77b24df5d3..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('toString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('toString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('toString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('toString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[2] { ResolutionCandidate@54, ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@62[2] { ResolutionCandidate@54, ResolutionCandidate@55 }
-    <name not found> = ArrayList@63[2] { ResolutionCandidate@50, ResolutionCandidate@51 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
deleted file mode 100644
index c43e480f441..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('WithC': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
deleted file mode 100644
index 8e94811a117..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
+++ /dev/null
@@ -1,368 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ProtocolState']
-    <name not found> = JetTypeImpl@1['ProtocolState']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('ProtocolState': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.ProtocolState': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.ProtocolState': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
deleted file mode 100644
index 8e534256828..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
+++ /dev/null
@@ -1,274 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ProtocolState']
-    <name not found> = JetTypeImpl@1['ProtocolState']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('ProtocolState': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.ProtocolState': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.ProtocolState': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
deleted file mode 100644
index 31ffbf9e181..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
+++ /dev/null
@@ -1,158 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Collections'] {
-    enumEntryIndex = LinkedHashMap@3 // through LazyJavaClassMemberScope@4
-    functionTypeForSamInterface = null
-    functions('emptyList': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['emptyList'] } // through LazyJavaStaticClassScope@8
-    functions('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@4
-    nestedClasses('emptyList': Name@5) = null // through LazyJavaClassMemberScope@4
-    properties('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaClassMemberScope@4
-    properties('emptyList': Name@5) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@13['Collections']
-}
-
-LazyJavaClassTypeConstructor@13['Collections'] {
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['List<T>'] {
-    arguments = ArrayList@17[1] { TypeProjectionImpl@18 }
-    classifier = JavaClassImpl@19['List']
-    memberScope = SubstitutingScope@20
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@23['List<T>'] {
-    arguments = ArrayList@24[1] { TypeProjectionImpl@25 }
-    classifier = JavaClassImpl@19['List']
-    memberScope = SubstitutingScope@26
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['Object'] {
-    classifier = JavaClassImpl@30['Object']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['T'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@34['T']
-    nullable = 'false': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-}
-
-LazyJavaClassifierType@36['T'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaTypeParameterImpl@38['T']
-    nullable = 'false': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-}
-
-LazyJavaClassifierType@39['T'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@38['T']
-    nullable = 'true': Boolean@27
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-}
-
-LazyJavaClassifierType@41['T'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@34['T']
-    nullable = 'true': Boolean@27
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('Collections': FqName@46) = null
-    packageFragments('Int': FqName@47) = null
-    packageFragments('List': FqName@48) = null
-    packageFragments('ab': FqName@49) = null
-    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    packageFragments('java.lang.Collections': FqName@54) = null
-    packageFragments('java.lang.Int': FqName@55) = null
-    packageFragments('java.lang.List': FqName@56) = null
-    packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
-    packageFragments('java.util.Collections': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Collections': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.List': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['Collections']) = LazyJavaClassDescriptor@2['Collections']
-}
-
-LazyJavaPackageFragment@45['<root>'] {
-    classes('Collections': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('List': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('java': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('java': Name@73) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-LazyJavaPackageFragment@51['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('util': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@78) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('util': Name@79) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@53['lang'] {
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@58['util'] {
-    classes('Collections': Name@82) = LazyJavaClassDescriptor@2['Collections'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('Collections': Name@84) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaTypeParameterDescriptor@86['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    upperBounds = LinkedHashSet@87[1] { NullableType@88 }
-    upperBoundsAsType = NullableType@88
-}
-
-LazyJavaTypeParameterResolver@89 {
-    resolve(JavaTypeParameterImpl@90['T']) = LazyJavaTypeParameterDescriptor@86['T']
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet67.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet67.lazy.log
deleted file mode 100644
index 5a271f163a6..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet67.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('XXX': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Int': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
deleted file mode 100644
index a1c87f1db7e..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Foo': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Foo': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('equals': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@13) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@13) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@16[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@16[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@16[empty]
-    <name not found> = EmptyList@16[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
deleted file mode 100644
index 5443ca9999a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Command': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Command': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.Command': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Boolean': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('parse': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('parse': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('parse': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('parse': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@60[2] { ResolutionCandidate@45, ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
deleted file mode 100644
index 0882dff757a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
+++ /dev/null
@@ -1,800 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassDescriptor@18['Appendable'] {
-    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassDescriptor@24['ArrayList'] {
-    constructors = ArrayList@25[3] { JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'] } // through LazyJavaClassMemberScope@29
-    defaultType = JetTypeImpl@30['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@29
-    functionTypeForSamInterface = null
-    functions('iterator': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['iterator'] } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
-    nestedClasses('iterator': Name@32) = null // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
-}
-
-LazyJavaClassDescriptor@39['AutoCloseable'] {
-    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@43['Closeable'] {
-    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
-}
-
-LazyJavaClassDescriptor@47['FilterOutputStream'] {
-    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@51['Object'] {
-    typeConstructor = LazyJavaClassTypeConstructor@52['Object']
-}
-
-LazyJavaClassDescriptor@53['OutputStream'] {
-    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
-}
-
-LazyJavaClassDescriptor@57['PrintStream'] {
-    defaultType = JetTypeImpl@58['PrintStream']
-    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
-    functions('println': Name@61) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@60
-    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@60
-    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@60
-    nestedClasses('println': Name@61) = null // through LazyJavaClassMemberScope@60
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@68['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassDescriptor@70['RandomAccess'] {
-    functions('iterator': Name@11) = EmptyList@20[empty] // through LazyJavaClassMemberScope@71
-    memberIndex = computeMemberIndex$1@72 // through LazyJavaClassMemberScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
-}
-
-LazyJavaClassDescriptor@74['Serializable'] {
-    functions('iterator': Name@11) = EmptyList@20[empty] // through LazyJavaClassMemberScope@75
-    memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@75
-    typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
-}
-
-LazyJavaClassDescriptor@78['System'] {
-    enumEntryIndex = LinkedHashMap@79 // through LazyJavaClassMemberScope@80
-    memberIndex = computeMemberIndex$1@81 // through LazyJavaClassMemberScope@80
-    memberIndex = computeMemberIndex$1@82 // through LazyJavaStaticClassScope@83
-    nestedClassIndex = LinkedHashMap@84 // through LazyJavaClassMemberScope@80
-    nestedClasses('out': Name@85) = null // through LazyJavaClassMemberScope@80
-    properties('out': Name@85) = ArrayList@86[1] { JavaPropertyDescriptor@87['out'] } // through LazyJavaStaticClassScope@83
-    properties('out': Name@85) = EmptyList@20[empty] // through LazyJavaClassMemberScope@80
-    typeConstructor = LazyJavaClassTypeConstructor@88['System']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@89[1] { LazyJavaTypeParameterDescriptor@90['E'] }
-    supertypes = ArrayList@91[1] { LazyJavaClassifierType@92['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@17['AbstractList'] {
-    parameters = ArrayList@93[1] { LazyJavaTypeParameterDescriptor@94['E'] }
-    supertypes = ArrayList@95[2] { LazyJavaClassifierType@96['AbstractCollection<E>'], LazyJavaClassifierType@97['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@23['Appendable'] {
-    parameters = ArrayList@98[empty]
-    supertypes = ArrayList@99[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['ArrayList'] {
-    parameters = ArrayList@101[1] { LazyJavaTypeParameterDescriptor@102['E'] }
-    supertypes = ArrayList@103[5] { LazyJavaClassifierType@104['AbstractList<E>'], LazyJavaClassifierType@105['List<E>'], LazyJavaClassifierType@106['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@42['AutoCloseable'] {
-    parameters = ArrayList@107[empty]
-    supertypes = ArrayList@108[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@46['Closeable'] {
-    parameters = ArrayList@109[empty]
-    supertypes = ArrayList@110[1] { LazyJavaClassifierType@111['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@50['FilterOutputStream'] {
-    parameters = ArrayList@112[empty]
-    supertypes = ArrayList@113[1] { LazyJavaClassifierType@114['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@52['Object'] {
-    parameters = ArrayList@115[empty]
-    supertypes = ArrayList@116[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@56['OutputStream'] {
-    parameters = ArrayList@117[empty]
-    supertypes = ArrayList@118[1] { LazyJavaClassifierType@119['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@69['PrintStream'] {
-    parameters = ArrayList@120[empty]
-    supertypes = ArrayList@121[3] { LazyJavaClassifierType@122['FilterOutputStream'], LazyJavaClassifierType@123['Appendable'], LazyJavaClassifierType@124['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@73['RandomAccess'] {
-    parameters = ArrayList@125[empty]
-    supertypes = ArrayList@126[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@77['Serializable'] {
-    parameters = ArrayList@127[empty]
-    supertypes = ArrayList@128[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@88['System'] {
-    supertypes = ArrayList@129[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassifierType@96['AbstractCollection<E>'] {
-    arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
-    classifier = JavaClassImpl@132['AbstractCollection']
-    memberScope = SubstitutingScope@133
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@104['AbstractList<E>'] {
-    arguments = ArrayList@134[1] { TypeProjectionImpl@135 }
-    classifier = JavaClassImpl@136['AbstractList']
-    memberScope = SubstitutingScope@137
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassifierType@123['Appendable'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@139['Appendable']
-    memberScope = LazyJavaClassMemberScope@21
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@111['AutoCloseable'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@141['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['AutoCloseable']
-}
-
-LazyJavaClassifierType@142['Cloneable'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['Cloneable']
-    memberScope = DeserializedClassMemberScope@145
-    typeConstructor = DeserializedClassTypeConstructor@146
-}
-
-LazyJavaClassifierType@119['Closeable'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@148['Closeable']
-    memberScope = LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
-}
-
-LazyJavaClassifierType@124['Closeable'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@150['Closeable']
-    memberScope = LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
-}
-
-LazyJavaClassifierType@151['Collection<? extends E>'] {
-    arguments = ArrayList@152[1] { TypeProjectionImpl@153 }
-    classifier = JavaClassImpl@154['Collection']
-    memberScope = SubstitutingScope@155
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@157
-}
-
-LazyJavaClassifierType@158['Collection<? extends E>'] {
-    arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
-    classifier = JavaClassImpl@154['Collection']
-    memberScope = SubstitutingScope@161
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@163
-}
-
-LazyJavaClassifierType@92['Collection<E>'] {
-    arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
-    classifier = JavaClassImpl@166['Collection']
-    memberScope = SubstitutingScope@167
-    typeConstructor = DeserializedClassTypeConstructor@157
-}
-
-LazyJavaClassifierType@168['E'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@170['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@172['E'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@174['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@175['E'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaTypeParameterImpl@177['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@179['E'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaTypeParameterImpl@181['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@183['E'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@185['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@186['E'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaTypeParameterImpl@188['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@189['E'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@191['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@192['E'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaTypeParameterImpl@194['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@195['E'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@197['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@198['E'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaTypeParameterImpl@200['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@201['E'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaTypeParameterImpl@203['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@204['E'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaTypeParameterImpl@206['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@207['E'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@209['E']
-    nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@210['E'] {
-    arguments = ArrayList@211[empty]
-    classifier = JavaTypeParameterImpl@185['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@212['E'] {
-    arguments = ArrayList@213[empty]
-    classifier = JavaTypeParameterImpl@170['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@214['E'] {
-    arguments = ArrayList@215[empty]
-    classifier = JavaTypeParameterImpl@181['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@216['E'] {
-    arguments = ArrayList@217[empty]
-    classifier = JavaTypeParameterImpl@188['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@218['E'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaTypeParameterImpl@191['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@220['E'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@177['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@222['E'] {
-    arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@203['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@224['E'] {
-    arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@174['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
-LazyJavaClassifierType@226['E'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@209['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@228['E'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@200['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@230['E'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@194['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-}
-
-LazyJavaClassifierType@232['E'] {
-    arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@197['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@234['E'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@206['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-}
-
-LazyJavaClassifierType@122['FilterOutputStream'] {
-    arguments = ArrayList@236[empty]
-    classifier = JavaClassImpl@237['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['FilterOutputStream']
-}
-
-LazyJavaClassifierType@238['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@239
-}
-
-LazyJavaClassifierType@240['Iterator<E>'] {
-    arguments = ArrayList@241[1] { TypeProjectionImpl@242 }
-    classifier = JavaClassImpl@243['Iterator']
-    memberScope = SubstitutingScope@244
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@246['Iterator<E>'] {
-    arguments = ArrayList@247[1] { TypeProjectionImpl@248 }
-    classifier = JavaClassImpl@249['Iterator']
-    memberScope = SubstitutingScope@250
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@251['Iterator<E>'] {
-    arguments = ArrayList@252[1] { TypeProjectionImpl@253 }
-    classifier = JavaClassImpl@254['Iterator']
-    memberScope = SubstitutingScope@255
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@256['Iterator<E>'] {
-    arguments = ArrayList@257[1] { TypeProjectionImpl@258 }
-    classifier = JavaClassImpl@243['Iterator']
-    memberScope = SubstitutingScope@259
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@260
-}
-
-LazyJavaClassifierType@261['Iterator<E>'] {
-    arguments = ArrayList@262[1] { TypeProjectionImpl@263 }
-    classifier = JavaClassImpl@249['Iterator']
-    memberScope = SubstitutingScope@264
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@260
-}
-
-LazyJavaClassifierType@265['Iterator<E>'] {
-    arguments = ArrayList@266[1] { TypeProjectionImpl@267 }
-    classifier = JavaClassImpl@254['Iterator']
-    memberScope = SubstitutingScope@268
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@260
-}
-
-LazyJavaClassifierType@97['List<E>'] {
-    arguments = ArrayList@269[1] { TypeProjectionImpl@270 }
-    classifier = JavaClassImpl@271['List']
-    memberScope = SubstitutingScope@272
-    typeConstructor = DeserializedClassTypeConstructor@273
-}
-
-LazyJavaClassifierType@105['List<E>'] {
-    arguments = ArrayList@274[1] { TypeProjectionImpl@275 }
-    classifier = JavaClassImpl@276['List']
-    memberScope = SubstitutingScope@277
-    typeConstructor = DeserializedClassTypeConstructor@273
-}
-
-LazyJavaClassifierType@278['Object'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['Object']
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@282['Object'] {
-    arguments = ArrayList@283[empty]
-    classifier = JavaClassImpl@280['Object']
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@284['Object'] {
-    classifier = JavaClassImpl@285['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@286['Object'] {
-    classifier = JavaClassImpl@287['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@288['Object'] {
-    classifier = JavaClassImpl@289['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@290['Object'] {
-    classifier = JavaClassImpl@291['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@292['Object'] {
-    classifier = JavaClassImpl@293['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@294['Object'] {
-    classifier = JavaClassImpl@295['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@296['Object'] {
-    classifier = JavaClassImpl@297['Object']
-    typeConstructor = DeserializedClassTypeConstructor@281
-}
-
-LazyJavaClassifierType@114['OutputStream'] {
-    arguments = ArrayList@298[empty]
-    classifier = JavaClassImpl@299['OutputStream']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
-}
-
-LazyJavaClassifierType@300['PrintStream'] {
-    arguments = ArrayList@301[empty]
-    classifier = JavaClassImpl@302['PrintStream']
-    memberScope = LazyJavaClassMemberScope@60
-    nullable = 'false': Boolean@156
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassifierType@303['PrintStream'] {
-    arguments = ArrayList@304[empty]
-    classifier = JavaClassImpl@302['PrintStream']
-    nullable = 'true': Boolean@162
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassifierType@106['RandomAccess'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaClassImpl@306['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
-}
-
-LazyJavaClassifierType@307['Serializable'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@309['Serializable']
-    memberScope = LazyJavaClassMemberScope@75
-    typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
-}
-
-LazyJavaClassifierType@310['String'] {
-    arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@312['String']
-    nullable = 'false': Boolean@156
-    typeConstructor = DeserializedClassTypeConstructor@313
-}
-
-LazyJavaClassifierType@314['String'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@312['String']
-    nullable = 'true': Boolean@162
-    typeConstructor = DeserializedClassTypeConstructor@313
-}
-
-LazyJavaPackageFragmentProvider@316 {
-    packageFragments('<root>': FqName@317) = LazyJavaPackageFragment@318['<root>']
-    packageFragments('ArrayList': FqName@319) = null
-    packageFragments('Item': FqName@320) = null
-    packageFragments('Object': FqName@321) = null
-    packageFragments('String': FqName@322) = null
-    packageFragments('System': FqName@323) = null
-    packageFragments('items': FqName@324) = null
-    packageFragments('java': FqName@325) = LazyJavaPackageFragment@326['java']
-    packageFragments('java.io': FqName@327) = LazyJavaPackageFragment@328['io']
-    packageFragments('java.lang': FqName@329) = LazyJavaPackageFragment@330['lang']
-    packageFragments('java.lang.ArrayList': FqName@331) = null
-    packageFragments('java.lang.Item': FqName@332) = null
-    packageFragments('java.lang.Object': FqName@333) = null
-    packageFragments('java.lang.String': FqName@334) = null
-    packageFragments('java.lang.System': FqName@335) = null
-    packageFragments('java.util': FqName@336) = LazyJavaPackageFragment@337['util']
-    packageFragments('java.util.ArrayList': FqName@338) = null
-    packageFragments('kotlin': FqName@339) = null
-    packageFragments('kotlin.ArrayList': FqName@340) = null
-    packageFragments('kotlin.Item': FqName@341) = null
-    packageFragments('kotlin.Object': FqName@342) = null
-    packageFragments('kotlin.String': FqName@343) = null
-    packageFragments('kotlin.System': FqName@344) = null
-    packageFragments('kotlin.io': FqName@345) = null
-    packageFragments('kotlin.jvm': FqName@346) = null
-    topLevelClasses(JavaClassImpl@132['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@136['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@139['Appendable']) = LazyJavaClassDescriptor@18['Appendable']
-    topLevelClasses(JavaClassImpl@347['ArrayList']) = LazyJavaClassDescriptor@24['ArrayList']
-    topLevelClasses(JavaClassImpl@141['AutoCloseable']) = LazyJavaClassDescriptor@39['AutoCloseable']
-    topLevelClasses(JavaClassImpl@150['Closeable']) = LazyJavaClassDescriptor@43['Closeable']
-    topLevelClasses(JavaClassImpl@237['FilterOutputStream']) = LazyJavaClassDescriptor@47['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@348['Object']) = LazyJavaClassDescriptor@51['Object']
-    topLevelClasses(JavaClassImpl@299['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
-    topLevelClasses(JavaClassImpl@302['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
-    topLevelClasses(JavaClassImpl@306['RandomAccess']) = LazyJavaClassDescriptor@70['RandomAccess']
-    topLevelClasses(JavaClassImpl@309['Serializable']) = LazyJavaClassDescriptor@74['Serializable']
-    topLevelClasses(JavaClassImpl@349['System']) = LazyJavaClassDescriptor@78['System']
-}
-
-LazyJavaPackageFragment@318['<root>'] {
-    classes('ArrayList': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('Object': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('String': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('System': Name@354) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('items': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('java': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('ArrayList': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('java': Name@359) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@351
-}
-
-LazyJavaPackageFragment@326['java'] {
-    classes('lang': Name@361) = null // through LazyPackageFragmentScopeForJavaPackage@362
-    classes('util': Name@363) = null // through LazyPackageFragmentScopeForJavaPackage@362
-    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@362
-    functions('lang': Name@364) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@362
-    functions('util': Name@365) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@362
-    memberIndex = computeMemberIndex$1@366 // through LazyPackageFragmentScopeForJavaPackage@362
-}
-
-LazyJavaPackageFragment@330['lang'] {
-    classes('ArrayList': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('Object': Name@352) = LazyJavaClassDescriptor@51['Object'] // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('System': Name@354) = LazyJavaClassDescriptor@78['System'] // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('items': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('ArrayList': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    memberIndex = computeMemberIndex$1@368 // through LazyPackageFragmentScopeForJavaPackage@367
-}
-
-LazyJavaPackageFragment@337['util'] {
-    classes('ArrayList': Name@369) = LazyJavaClassDescriptor@24['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('ArrayList': Name@371) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@372 // through LazyPackageFragmentScopeForJavaPackage@370
-}
-
-LazyJavaTypeParameterDescriptor@90['E'] {
-    defaultType = JetTypeImpl@373['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
-    upperBounds = LinkedHashSet@374[1] { NullableType@375 }
-    upperBoundsAsType = NullableType@375
-}
-
-LazyJavaTypeParameterDescriptor@94['E'] {
-    defaultType = JetTypeImpl@376['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-    upperBounds = LinkedHashSet@377[1] { NullableType@378 }
-    upperBoundsAsType = NullableType@378
-}
-
-LazyJavaTypeParameterDescriptor@102['E'] {
-    defaultType = JetTypeImpl@379['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
-    upperBounds = LinkedHashSet@380[1] { NullableType@381 }
-}
-
-LazyJavaTypeParameterResolver@382 {
-    resolve(JavaTypeParameterImpl@383['E']) = LazyJavaTypeParameterDescriptor@94['E']
-}
-
-LazyJavaTypeParameterResolver@384 {
-    resolve(JavaTypeParameterImpl@385['E']) = LazyJavaTypeParameterDescriptor@90['E']
-}
-
-LazyJavaTypeParameterResolver@386 {
-    resolve(JavaTypeParameterImpl@387['E']) = LazyJavaTypeParameterDescriptor@102['E']
-}
-
-LazyJavaTypeParameterResolver@388 {
-    resolve(JavaTypeParameterImpl@194['E']) = null
-}
-
-LazyJavaTypeParameterResolver@389 {
-    resolve(JavaTypeParameterImpl@200['E']) = null
-}
-
-LazyJavaTypeParameterResolver@390 {
-    resolve(JavaTypeParameterImpl@170['E']) = null
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[10] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[3] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@435[10] { ResolutionCandidate@393, ResolutionCandidate@394, ResolutionCandidate@395, ... }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@447[3] { ResolutionCandidate@431, ResolutionCandidate@432, ResolutionCandidate@433 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
deleted file mode 100644
index 3368ebd5240..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
+++ /dev/null
@@ -1,174 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = DeferredType@5
-    <name not found> = DeferredType@6
-    <name not found> = ErrorTypeImpl@7
-    <name not found> = ErrorTypeImpl@8
-    <name not found> = IntValue@9
-    <name not found> = JetTypeImpl@10['A']
-    <name not found> = JetTypeImpl@11['Int']
-    <name not found> = null
-    <name not found> = null
-}
-
-DescriptorResolver@12 {
-    <name not found> = ErrorTypeImpl@8
-    <name not found> = IntValue@13
-    <name not found> = JetTypeImpl@11['Int']
-}
-
-DescriptorResolver@14 {
-    <name not found> = ErrorTypeImpl@7
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('A': FqName@18) = null
-    packageFragments('Test': FqName@19) = null
-    packageFragments('Test2': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('y': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('y': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-null {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.lazy.log b/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.lazy.log
deleted file mode 100644
index d1e6ec53685..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/OrphanStarProjection.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('b': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.B': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.B': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log b/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
deleted file mode 100644
index 3b7e42e7f85..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('G': FqName@3) = null
-    packageFragments('Out': FqName@4) = null
-    packageFragments('Point': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.G': FqName@11) = null
-    packageFragments('java.lang.Out': FqName@12) = null
-    packageFragments('java.lang.Point': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.G': FqName@16) = null
-    packageFragments('kotlin.Out': FqName@17) = null
-    packageFragments('kotlin.Point': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('G': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Out': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Point': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('fout': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('G': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Out': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Point': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('fout': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('G': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Out': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Point': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('fout': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('G': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('Out': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('Point': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('fout': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
deleted file mode 100644
index 24e65f8aeed..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.C': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
deleted file mode 100644
index 8008dbff2a5..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('Boolean': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Boolean': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Boolean': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@46 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
deleted file mode 100644
index 206ac4d3413..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@88[8] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.lazy.log b/compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.lazy.log
deleted file mode 100644
index 8905aa4e53a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/TypeParameterAsASupertype.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.T': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.T': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
deleted file mode 100644
index b30054e654c..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Iterator': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Iterator': FqName@14) = null
-    packageFragments('java.lang.R': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Iterator': FqName@19) = null
-    packageFragments('kotlin.R': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('transform': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('transform': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('transform': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('transform': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
deleted file mode 100644
index c8f9acd2c57..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
+++ /dev/null
@@ -1,59 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Long': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Bar': FqName@12) = null
-    packageFragments('java.lang.Foo': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Long': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Bar': FqName@18) = null
-    packageFragments('kotlin.Foo': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.Long': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Long': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
deleted file mode 100644
index 2de7874d842..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
+++ /dev/null
@@ -1,445 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    defaultType = JetTypeImpl@1['AbstractMap<2>']
-    functions('get': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['get'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
-}
-
-LazyJavaClassDescriptor@11['HashMap'] {
-    constructors = ArrayList@12[4] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], ... } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
-    functionTypeForSamInterface = null
-    functions('get': Name@7) = ArrayList@19[1] { JavaMethodDescriptor@20['get'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@16
-    nestedClasses('get': Name@7) = null // through LazyJavaClassMemberScope@16
-    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['HashMap']
-}
-
-LazyJavaClassDescriptor@25['Serializable'] {
-    functions('get': Name@2) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    properties('get': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Serializable']
-}
-
-LazyJavaClassTypeConstructor@10['AbstractMap'] {
-    parameters = ArrayList@29[2] { LazyJavaTypeParameterDescriptor@30['K'], LazyJavaTypeParameterDescriptor@31['V'] }
-    supertypes = ArrayList@32[1] { LazyJavaClassifierType@33['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@24['HashMap'] {
-    parameters = ArrayList@34[2] { LazyJavaTypeParameterDescriptor@35['K'], LazyJavaTypeParameterDescriptor@36['V'] }
-    supertypes = ArrayList@37[4] { LazyJavaClassifierType@38['AbstractMap<K, V>'], LazyJavaClassifierType@39['Map<K, V>'], LazyJavaClassifierType@40['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@28['Serializable'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[1] { JetTypeImpl@43['Any'] }
-}
-
-LazyJavaClassifierType@38['AbstractMap<K, V>'] {
-    arguments = ArrayList@44[2] { TypeProjectionImpl@45, TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['AbstractMap']
-    memberScope = SubstitutingScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
-}
-
-LazyJavaClassifierType@40['Cloneable'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@50['Cloneable']
-    memberScope = DeserializedClassMemberScope@51
-    typeConstructor = DeserializedClassTypeConstructor@52
-}
-
-LazyJavaClassifierType@53['K'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['K']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@58['K'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['K']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
-}
-
-LazyJavaClassifierType@62['K'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['K']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@65['K'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@67['K']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@68['K'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['K']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@71['K'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@60['K']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
-}
-
-LazyJavaClassifierType@74['K'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@64['K']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@76['K'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@70['K']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@78['K'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@67['K']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@80['K'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@55['K']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@82['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@83[2] { TypeProjectionImpl@84, TypeProjectionImpl@85 }
-    classifier = JavaClassImpl@86['Map']
-    memberScope = SubstitutingScope@87
-    nullable = 'false': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@88
-}
-
-LazyJavaClassifierType@89['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@90[2] { TypeProjectionImpl@91, TypeProjectionImpl@92 }
-    classifier = JavaClassImpl@86['Map']
-    memberScope = SubstitutingScope@93
-    nullable = 'true': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@39['Map<K, V>'] {
-    arguments = ArrayList@95[2] { TypeProjectionImpl@96, TypeProjectionImpl@97 }
-    classifier = JavaClassImpl@98['Map']
-    memberScope = SubstitutingScope@99
-    typeConstructor = DeserializedClassTypeConstructor@88
-}
-
-LazyJavaClassifierType@33['Map<K, V>'] {
-    arguments = ArrayList@100[2] { TypeProjectionImpl@101, TypeProjectionImpl@102 }
-    classifier = JavaClassImpl@103['Map']
-    memberScope = SubstitutingScope@104
-    typeConstructor = DeserializedClassTypeConstructor@88
-}
-
-LazyJavaClassifierType@105['Object'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['Object']
-    memberScope = DeserializedClassMemberScope@108
-    nullable = 'false': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@110['Object'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['Object']
-    memberScope = DeserializedClassMemberScope@108
-    nullable = 'false': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@113['Object'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@112['Object']
-    memberScope = DeserializedClassMemberScope@108
-    nullable = 'true': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@115['Object'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@107['Object']
-    memberScope = DeserializedClassMemberScope@108
-    nullable = 'true': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@117['Object'] {
-    classifier = JavaClassImpl@118['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@119['Object'] {
-    classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@121['Serializable'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['Serializable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Serializable']
-}
-
-LazyJavaClassifierType@124['V'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@128['V'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@131['V'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@134['V'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@137['V'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@139['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@141['V'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@143['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@144['V'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['V']
-    nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@147['V'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@133['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@149['V'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@130['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@151['V'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@126['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@153['V'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@136['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@155['V'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@146['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@157['V'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@143['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaClassifierType@159['V'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@139['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-}
-
-LazyJavaPackageFragmentProvider@161 {
-    packageFragments('<root>': FqName@162) = LazyJavaPackageFragment@163['<root>']
-    packageFragments('Array': FqName@164) = null
-    packageFragments('String': FqName@165) = null
-    packageFragments('checkFiles': FqName@166) = null
-    packageFragments('checkFiles.Array': FqName@167) = null
-    packageFragments('checkFiles.String': FqName@168) = null
-    packageFragments('java': FqName@169) = LazyJavaPackageFragment@170['java']
-    packageFragments('java.io': FqName@171) = LazyJavaPackageFragment@172['io']
-    packageFragments('java.lang': FqName@173) = LazyJavaPackageFragment@174['lang']
-    packageFragments('java.lang.Array': FqName@175) = null
-    packageFragments('java.lang.String': FqName@176) = null
-    packageFragments('java.util': FqName@177) = LazyJavaPackageFragment@178['util']
-    packageFragments('java.util.HashMap': FqName@179) = null
-    packageFragments('kotlin': FqName@180) = null
-    packageFragments('kotlin.Array': FqName@181) = null
-    packageFragments('kotlin.String': FqName@182) = null
-    packageFragments('kotlin.io': FqName@183) = null
-    packageFragments('kotlin.jvm': FqName@184) = null
-    topLevelClasses(JavaClassImpl@47['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@185['HashMap']) = LazyJavaClassDescriptor@11['HashMap']
-    topLevelClasses(JavaClassImpl@123['Serializable']) = LazyJavaClassDescriptor@25['Serializable']
-}
-
-LazyJavaPackageFragment@170['java'] {
-    classes('lang': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('util': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('lang': Name@190) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('util': Name@191) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@187
-}
-
-LazyJavaPackageFragment@174['lang'] {
-    classes('HashMap': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('get': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('HashMap': Name@193) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('get': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@194
-}
-
-LazyJavaPackageFragment@178['util'] {
-    classes('HashMap': Name@196) = LazyJavaClassDescriptor@11['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('HashMap': Name@198) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@197
-}
-
-LazyJavaTypeParameterDescriptor@35['K'] {
-    defaultType = JetTypeImpl@200['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    upperBounds = LinkedHashSet@201[1] { NullableType@202 }
-}
-
-LazyJavaTypeParameterDescriptor@30['K'] {
-    defaultType = JetTypeImpl@203['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
-}
-
-LazyJavaTypeParameterDescriptor@36['V'] {
-    defaultType = JetTypeImpl@204['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@205[1] { NullableType@206 }
-}
-
-LazyJavaTypeParameterDescriptor@31['V'] {
-    defaultType = JetTypeImpl@207['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@140
-    upperBounds = LinkedHashSet@208[1] { NullableType@209 }
-}
-
-LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@211['K']) = LazyJavaTypeParameterDescriptor@35['K']
-    resolve(JavaTypeParameterImpl@212['V']) = LazyJavaTypeParameterDescriptor@36['V']
-}
-
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['K']) = LazyJavaTypeParameterDescriptor@30['K']
-    resolve(JavaTypeParameterImpl@215['V']) = LazyJavaTypeParameterDescriptor@31['V']
-}
-
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@139['V']) = null
-}
-
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@133['V']) = null
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
-
-null {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-    <name not found> = EmptyList@8[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/ea43298.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea43298.lazy.log
deleted file mode 100644
index 0e8863a1d79..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/ea43298.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
deleted file mode 100644
index d0bc697d39d..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Function0': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.Function0': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Array': FqName@17) = null
-    packageFragments('kotlin.Function0': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Function0': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
deleted file mode 100644
index 91188b10fbb..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.Boolean': FqName@14) = null
-    packageFragments('java.lang.Foo': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.Boolean': FqName@20) = null
-    packageFragments('kotlin.Foo': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Boolean': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
deleted file mode 100644
index bfe251c499d..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.String': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.String': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('div': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('div': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('div': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('div': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
deleted file mode 100644
index b0e28437bb4..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
+++ /dev/null
@@ -1,304 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['RuntimeException']
-}
-
-LazyJavaClassDescriptor@6['UnsupportedOperationException'] {
-    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['UnsupportedOperationException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@5['RuntimeException'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@13['UnsupportedOperationException'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['RuntimeException'] }
-}
-
-LazyJavaClassifierType@19['Exception'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@22['RuntimeException'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@5['RuntimeException']
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['String']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@34['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@40['Throwable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@47['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@42['Throwable']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@49['Throwable'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    nullable = 'true': Boolean@37
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaClassifierType@16['Throwable'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@52['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('AutoCloseable': FqName@56) = null
-    packageFragments('Int': FqName@57) = null
-    packageFragments('Resource': FqName@58) = null
-    packageFragments('Unit': FqName@59) = null
-    packageFragments('X': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.AutoCloseable': FqName@65) = null
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.Resource': FqName@67) = null
-    packageFragments('java.lang.Unit': FqName@68) = null
-    packageFragments('java.lang.X': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.AutoCloseable': FqName@71) = null
-    packageFragments('kotlin.Int': FqName@72) = null
-    packageFragments('kotlin.Resource': FqName@73) = null
-    packageFragments('kotlin.Unit': FqName@74) = null
-    packageFragments('kotlin.X': FqName@75) = null
-    packageFragments('kotlin.io': FqName@76) = null
-    packageFragments('kotlin.jvm': FqName@77) = null
-    packageFragments('kt606_dependents': FqName@78) = null
-    packageFragments('kt606_dependents.AutoCloseable': FqName@79) = null
-    packageFragments('kt606_dependents.C': FqName@80) = null
-    packageFragments('kt606_dependents.Int': FqName@81) = null
-    packageFragments('kt606_dependents.Resource': FqName@82) = null
-    packageFragments('kt606_dependents.Unit': FqName@83) = null
-    packageFragments('kt606_dependents.X': FqName@84) = null
-    packageFragments('kt606_dependents.ext': FqName@85) = null
-    packageFragments('kt606_dependents.x': FqName@86) = null
-    topLevelClasses(JavaClassImpl@24['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@26['RuntimeException']) = LazyJavaClassDescriptor@4['RuntimeException']
-    topLevelClasses(JavaClassImpl@87['UnsupportedOperationException']) = LazyJavaClassDescriptor@6['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@64['lang'] {
-    classes('UnsupportedOperationException': Name@94) = LazyJavaClassDescriptor@6['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('ext': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('UnsupportedOperationException': Name@94) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('ext': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@97) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
-
-null {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@125[4] { ResolutionCandidate@116, ResolutionCandidate@117, ResolutionCandidate@118, ... }
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-    <name not found> = EmptyList@92[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
deleted file mode 100644
index c626e4f5992..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
+++ /dev/null
@@ -1,825 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    functions('get': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@11['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    functions('get': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['get'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
-}
-
-LazyJavaClassDescriptor@24['Appendable'] {
-    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Appendable']
-}
-
-LazyJavaClassDescriptor@29['ArrayList'] {
-    constructors = ArrayList@30[3] { JavaConstructorDescriptor@31['<init>'], JavaConstructorDescriptor@32['<init>'], JavaConstructorDescriptor@33['<init>'] } // through LazyJavaClassMemberScope@34
-    defaultType = JetTypeImpl@35['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@34
-    functionTypeForSamInterface = null
-    functions('add': Name@37) = ArrayList@38[2] { JavaMethodDescriptor@39['add'], JavaMethodDescriptor@40['add'] } // through LazyJavaClassMemberScope@34
-    functions('get': Name@41) = ArrayList@42[1] { JavaMethodDescriptor@43['get'] } // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@34
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@34
-    nestedClasses('add': Name@37) = null // through LazyJavaClassMemberScope@34
-    nestedClasses('get': Name@41) = null // through LazyJavaClassMemberScope@34
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@47['ArrayList']
-}
-
-LazyJavaClassDescriptor@48['AutoCloseable'] {
-    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@52['Closeable'] {
-    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
-}
-
-LazyJavaClassDescriptor@56['FilterOutputStream'] {
-    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@57
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@59['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@60['OutputStream'] {
-    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@61
-    memberIndex = computeMemberIndex$1@62 // through LazyJavaClassMemberScope@61
-    typeConstructor = LazyJavaClassTypeConstructor@63['OutputStream']
-}
-
-LazyJavaClassDescriptor@64['PrintStream'] {
-    defaultType = JetTypeImpl@65['PrintStream']
-    enumEntryIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@67
-    functions('println': Name@68) = ArrayList@69[10] { JavaMethodDescriptor@70['println'], JavaMethodDescriptor@71['println'], JavaMethodDescriptor@72['println'], ... } // through LazyJavaClassMemberScope@67
-    memberIndex = computeMemberIndex$1@73 // through LazyJavaClassMemberScope@67
-    nestedClassIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@67
-    nestedClasses('println': Name@68) = null // through LazyJavaClassMemberScope@67
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@75['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@76['PrintStream']
-}
-
-LazyJavaClassDescriptor@77['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
-    functions('get': Name@18) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
-    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@78
-    typeConstructor = LazyJavaClassTypeConstructor@80['RandomAccess']
-}
-
-LazyJavaClassDescriptor@81['Serializable'] {
-    functions('add': Name@13) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
-    functions('get': Name@18) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
-    memberIndex = computeMemberIndex$1@83 // through LazyJavaClassMemberScope@82
-    typeConstructor = LazyJavaClassTypeConstructor@84['Serializable']
-}
-
-LazyJavaClassDescriptor@85['System'] {
-    enumEntryIndex = LinkedHashMap@86 // through LazyJavaClassMemberScope@87
-    memberIndex = computeMemberIndex$1@88 // through LazyJavaClassMemberScope@87
-    memberIndex = computeMemberIndex$1@89 // through LazyJavaStaticClassScope@90
-    nestedClassIndex = LinkedHashMap@91 // through LazyJavaClassMemberScope@87
-    nestedClasses('out': Name@92) = null // through LazyJavaClassMemberScope@87
-    properties('out': Name@92) = ArrayList@93[1] { JavaPropertyDescriptor@94['out'] } // through LazyJavaStaticClassScope@90
-    properties('out': Name@92) = EmptyList@7[empty] // through LazyJavaClassMemberScope@87
-    typeConstructor = LazyJavaClassTypeConstructor@95['System']
-}
-
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
-    parameters = ArrayList@96[1] { LazyJavaTypeParameterDescriptor@97['E'] }
-    supertypes = ArrayList@98[1] { LazyJavaClassifierType@99['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@23['AbstractList'] {
-    parameters = ArrayList@100[1] { LazyJavaTypeParameterDescriptor@101['E'] }
-    supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['AbstractCollection<E>'], LazyJavaClassifierType@104['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@28['Appendable'] {
-    parameters = ArrayList@105[empty]
-    supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@47['ArrayList'] {
-    parameters = ArrayList@108[1] { LazyJavaTypeParameterDescriptor@109['E'] }
-    supertypes = ArrayList@110[5] { LazyJavaClassifierType@111['AbstractList<E>'], LazyJavaClassifierType@112['List<E>'], LazyJavaClassifierType@113['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@51['AutoCloseable'] {
-    parameters = ArrayList@114[empty]
-    supertypes = ArrayList@115[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@55['Closeable'] {
-    parameters = ArrayList@116[empty]
-    supertypes = ArrayList@117[1] { LazyJavaClassifierType@118['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@59['FilterOutputStream'] {
-    parameters = ArrayList@119[empty]
-    supertypes = ArrayList@120[1] { LazyJavaClassifierType@121['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@63['OutputStream'] {
-    parameters = ArrayList@122[empty]
-    supertypes = ArrayList@123[1] { LazyJavaClassifierType@124['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@76['PrintStream'] {
-    parameters = ArrayList@125[empty]
-    supertypes = ArrayList@126[3] { LazyJavaClassifierType@127['FilterOutputStream'], LazyJavaClassifierType@128['Appendable'], LazyJavaClassifierType@129['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@80['RandomAccess'] {
-    parameters = ArrayList@130[empty]
-    supertypes = ArrayList@131[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@84['Serializable'] {
-    parameters = ArrayList@132[empty]
-    supertypes = ArrayList@133[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@95['System'] {
-    supertypes = ArrayList@134[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassifierType@103['AbstractCollection<E>'] {
-    arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
-    classifier = JavaClassImpl@137['AbstractCollection']
-    memberScope = SubstitutingScope@138
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
-}
-
-LazyJavaClassifierType@111['AbstractList<E>'] {
-    arguments = ArrayList@139[1] { TypeProjectionImpl@140 }
-    classifier = JavaClassImpl@141['AbstractList']
-    memberScope = SubstitutingScope@142
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
-}
-
-LazyJavaClassifierType@128['Appendable'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['Appendable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['Appendable']
-}
-
-LazyJavaClassifierType@118['AutoCloseable'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['AutoCloseable']
-}
-
-LazyJavaClassifierType@147['Cloneable'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['Cloneable']
-    memberScope = DeserializedClassMemberScope@150
-    typeConstructor = DeserializedClassTypeConstructor@151
-}
-
-LazyJavaClassifierType@129['Closeable'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@153['Closeable']
-    memberScope = LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
-}
-
-LazyJavaClassifierType@124['Closeable'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['Closeable']
-    memberScope = LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
-}
-
-LazyJavaClassifierType@156['Collection<? extends E>'] {
-    arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
-    classifier = JavaClassImpl@159['Collection']
-    memberScope = SubstitutingScope@160
-    nullable = 'false': Boolean@161
-    typeConstructor = DeserializedClassTypeConstructor@162
-}
-
-LazyJavaClassifierType@163['Collection<? extends E>'] {
-    arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
-    classifier = JavaClassImpl@159['Collection']
-    memberScope = SubstitutingScope@166
-    nullable = 'true': Boolean@167
-    typeConstructor = DeserializedClassTypeConstructor@168
-}
-
-LazyJavaClassifierType@99['Collection<E>'] {
-    arguments = ArrayList@169[1] { TypeProjectionImpl@170 }
-    classifier = JavaClassImpl@171['Collection']
-    memberScope = SubstitutingScope@172
-    typeConstructor = DeserializedClassTypeConstructor@162
-}
-
-LazyJavaClassifierType@173['E'] {
-    arguments = ArrayList@174[empty]
-    classifier = JavaTypeParameterImpl@175['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@177['E'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@179['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@180['E'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@182['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@184['E'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@186['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@187['E'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@189['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@190['E'] {
-    arguments = ArrayList@191[empty]
-    classifier = JavaTypeParameterImpl@192['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
-}
-
-LazyJavaClassifierType@194['E'] {
-    arguments = ArrayList@195[empty]
-    classifier = JavaTypeParameterImpl@196['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
-}
-
-LazyJavaClassifierType@197['E'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@199['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@200['E'] {
-    arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@202['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@203['E'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaTypeParameterImpl@205['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@206['E'] {
-    arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@208['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@209['E'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@211['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@212['E'] {
-    arguments = ArrayList@213[empty]
-    classifier = JavaTypeParameterImpl@214['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@215['E'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@217['E']
-    nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@218['E'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaTypeParameterImpl@182['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@220['E'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@214['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@222['E'] {
-    arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@179['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@224['E'] {
-    arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@196['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
-}
-
-LazyJavaClassifierType@226['E'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@199['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@228['E'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@186['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@230['E'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@211['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@232['E'] {
-    arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@202['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@234['E'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@175['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-}
-
-LazyJavaClassifierType@236['E'] {
-    arguments = ArrayList@237[empty]
-    classifier = JavaTypeParameterImpl@189['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@238['E'] {
-    arguments = ArrayList@239[empty]
-    classifier = JavaTypeParameterImpl@217['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@240['E'] {
-    arguments = ArrayList@241[empty]
-    classifier = JavaTypeParameterImpl@205['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@242['E'] {
-    arguments = ArrayList@243[empty]
-    classifier = JavaTypeParameterImpl@208['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-}
-
-LazyJavaClassifierType@244['E'] {
-    arguments = ArrayList@245[empty]
-    classifier = JavaTypeParameterImpl@192['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
-}
-
-LazyJavaClassifierType@127['FilterOutputStream'] {
-    arguments = ArrayList@246[empty]
-    classifier = JavaClassImpl@247['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@59['FilterOutputStream']
-}
-
-LazyJavaClassifierType@248['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@249
-}
-
-LazyJavaClassifierType@104['List<E>'] {
-    arguments = ArrayList@250[1] { TypeProjectionImpl@251 }
-    classifier = JavaClassImpl@252['List']
-    memberScope = SubstitutingScope@253
-    typeConstructor = DeserializedClassTypeConstructor@254
-}
-
-LazyJavaClassifierType@112['List<E>'] {
-    arguments = ArrayList@255[1] { TypeProjectionImpl@256 }
-    classifier = JavaClassImpl@257['List']
-    memberScope = SubstitutingScope@258
-    typeConstructor = DeserializedClassTypeConstructor@254
-}
-
-LazyJavaClassifierType@259['Object'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaClassImpl@261['Object']
-    nullable = 'false': Boolean@161
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@263['Object'] {
-    arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@261['Object']
-    nullable = 'true': Boolean@167
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@265['Object'] {
-    classifier = JavaClassImpl@266['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@267['Object'] {
-    classifier = JavaClassImpl@268['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@269['Object'] {
-    classifier = JavaClassImpl@270['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@271['Object'] {
-    classifier = JavaClassImpl@272['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@273['Object'] {
-    classifier = JavaClassImpl@274['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@275['Object'] {
-    classifier = JavaClassImpl@276['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@277['Object'] {
-    classifier = JavaClassImpl@278['Object']
-    typeConstructor = DeserializedClassTypeConstructor@262
-}
-
-LazyJavaClassifierType@121['OutputStream'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['OutputStream']
-    memberScope = LazyJavaClassMemberScope@61
-    typeConstructor = LazyJavaClassTypeConstructor@63['OutputStream']
-}
-
-LazyJavaClassifierType@281['PrintStream'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['PrintStream']
-    memberScope = LazyJavaClassMemberScope@67
-    nullable = 'false': Boolean@161
-    typeConstructor = LazyJavaClassTypeConstructor@76['PrintStream']
-}
-
-LazyJavaClassifierType@284['PrintStream'] {
-    arguments = ArrayList@285[empty]
-    classifier = JavaClassImpl@283['PrintStream']
-    nullable = 'true': Boolean@167
-    typeConstructor = LazyJavaClassTypeConstructor@76['PrintStream']
-}
-
-LazyJavaClassifierType@113['RandomAccess'] {
-    arguments = ArrayList@286[empty]
-    classifier = JavaClassImpl@287['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@78
-    typeConstructor = LazyJavaClassTypeConstructor@80['RandomAccess']
-}
-
-LazyJavaClassifierType@288['Serializable'] {
-    arguments = ArrayList@289[empty]
-    classifier = JavaClassImpl@290['Serializable']
-    memberScope = LazyJavaClassMemberScope@82
-    typeConstructor = LazyJavaClassTypeConstructor@84['Serializable']
-}
-
-LazyJavaClassifierType@291['String'] {
-    arguments = ArrayList@292[empty]
-    classifier = JavaClassImpl@293['String']
-    nullable = 'false': Boolean@161
-    typeConstructor = DeserializedClassTypeConstructor@294
-}
-
-LazyJavaClassifierType@295['String'] {
-    arguments = ArrayList@296[empty]
-    classifier = JavaClassImpl@293['String']
-    nullable = 'true': Boolean@167
-    typeConstructor = DeserializedClassTypeConstructor@294
-}
-
-LazyJavaPackageFragmentProvider@297 {
-    packageFragments('<root>': FqName@298) = LazyJavaPackageFragment@299['<root>']
-    packageFragments('Array': FqName@300) = null
-    packageFragments('Int': FqName@301) = null
-    packageFragments('String': FqName@302) = null
-    packageFragments('System': FqName@303) = null
-    packageFragments('foo': FqName@304) = null
-    packageFragments('foo.Array': FqName@305) = null
-    packageFragments('foo.Int': FqName@306) = null
-    packageFragments('foo.String': FqName@307) = null
-    packageFragments('foo.System': FqName@308) = null
-    packageFragments('java': FqName@309) = LazyJavaPackageFragment@310['java']
-    packageFragments('java.io': FqName@311) = LazyJavaPackageFragment@312['io']
-    packageFragments('java.lang': FqName@313) = LazyJavaPackageFragment@314['lang']
-    packageFragments('java.lang.Array': FqName@315) = null
-    packageFragments('java.lang.Int': FqName@316) = null
-    packageFragments('java.lang.String': FqName@317) = null
-    packageFragments('java.lang.System': FqName@318) = null
-    packageFragments('java.util': FqName@319) = LazyJavaPackageFragment@320['util']
-    packageFragments('java.util.Array': FqName@321) = null
-    packageFragments('java.util.Int': FqName@322) = null
-    packageFragments('java.util.String': FqName@323) = null
-    packageFragments('java.util.System': FqName@324) = null
-    packageFragments('kotlin': FqName@325) = null
-    packageFragments('kotlin.Array': FqName@326) = null
-    packageFragments('kotlin.Int': FqName@327) = null
-    packageFragments('kotlin.String': FqName@328) = null
-    packageFragments('kotlin.System': FqName@329) = null
-    packageFragments('kotlin.io': FqName@330) = null
-    packageFragments('kotlin.jvm': FqName@331) = null
-    topLevelClasses(JavaClassImpl@137['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@141['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@144['Appendable']) = LazyJavaClassDescriptor@24['Appendable']
-    topLevelClasses(JavaClassImpl@332['ArrayList']) = LazyJavaClassDescriptor@29['ArrayList']
-    topLevelClasses(JavaClassImpl@146['AutoCloseable']) = LazyJavaClassDescriptor@48['AutoCloseable']
-    topLevelClasses(JavaClassImpl@153['Closeable']) = LazyJavaClassDescriptor@52['Closeable']
-    topLevelClasses(JavaClassImpl@247['FilterOutputStream']) = LazyJavaClassDescriptor@56['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@280['OutputStream']) = LazyJavaClassDescriptor@60['OutputStream']
-    topLevelClasses(JavaClassImpl@283['PrintStream']) = LazyJavaClassDescriptor@64['PrintStream']
-    topLevelClasses(JavaClassImpl@287['RandomAccess']) = LazyJavaClassDescriptor@77['RandomAccess']
-    topLevelClasses(JavaClassImpl@290['Serializable']) = LazyJavaClassDescriptor@81['Serializable']
-    topLevelClasses(JavaClassImpl@333['System']) = LazyJavaClassDescriptor@85['System']
-}
-
-LazyJavaPackageFragment@310['java'] {
-    classes('lang': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@335
-    classes('util': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@335
-    deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('lang': Name@338) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('util': Name@339) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@335
-    memberIndex = computeMemberIndex$1@340 // through LazyPackageFragmentScopeForJavaPackage@335
-}
-
-LazyJavaPackageFragment@314['lang'] {
-    classes('ArrayList': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('System': Name@343) = LazyJavaClassDescriptor@85['System'] // through LazyPackageFragmentScopeForJavaPackage@342
-    deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('ArrayList': Name@341) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    memberIndex = computeMemberIndex$1@344 // through LazyPackageFragmentScopeForJavaPackage@342
-}
-
-LazyJavaPackageFragment@320['util'] {
-    classes('Array': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@346
-    classes('ArrayList': Name@341) = LazyJavaClassDescriptor@29['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@346
-    classes('Int': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@346
-    classes('String': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@346
-    classes('System': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@346
-    deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@346
-    functions('ArrayList': Name@341) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@346
-    memberIndex = computeMemberIndex$1@349 // through LazyPackageFragmentScopeForJavaPackage@346
-}
-
-LazyJavaTypeParameterDescriptor@101['E'] {
-    defaultType = JetTypeImpl@350['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-    upperBounds = LinkedHashSet@351[1] { NullableType@352 }
-    upperBoundsAsType = NullableType@352
-}
-
-LazyJavaTypeParameterDescriptor@109['E'] {
-    defaultType = JetTypeImpl@353['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@183
-    upperBounds = LinkedHashSet@354[1] { NullableType@355 }
-    upperBoundsAsType = NullableType@355
-}
-
-LazyJavaTypeParameterDescriptor@97['E'] {
-    defaultType = JetTypeImpl@356['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
-    upperBounds = LinkedHashSet@357[1] { NullableType@358 }
-    upperBoundsAsType = NullableType@358
-}
-
-LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@109['E']
-}
-
-LazyJavaTypeParameterResolver@361 {
-    resolve(JavaTypeParameterImpl@362['E']) = LazyJavaTypeParameterDescriptor@97['E']
-}
-
-LazyJavaTypeParameterResolver@363 {
-    resolve(JavaTypeParameterImpl@364['E']) = LazyJavaTypeParameterDescriptor@101['E']
-}
-
-LazyJavaTypeParameterResolver@365 {
-    resolve(JavaTypeParameterImpl@199['E']) = null
-}
-
-LazyJavaTypeParameterResolver@366 {
-    resolve(JavaTypeParameterImpl@186['E']) = null
-}
-
-LazyJavaTypeParameterResolver@367 {
-    resolve(JavaTypeParameterImpl@214['E']) = null
-}
-
-LazyJavaTypeParameterResolver@368 {
-    resolve(JavaTypeParameterImpl@175['E']) = null
-}
-
-LazyJavaTypeParameterResolver@369 {
-    resolve(JavaTypeParameterImpl@205['E']) = null
-}
-
-LazyJavaTypeParameterResolver@370 {
-    resolve(JavaTypeParameterImpl@192['E']) = null
-}
-
-LazyJavaTypeParameterResolver@371 {
-    resolve(JavaTypeParameterImpl@217['E']) = null
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[10] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-}
-
-ResolutionTaskHolder@377 {
-    <name not found> = ArrayList@378[10] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[10] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[2] { ResolutionCandidate@425, ResolutionCandidate@426 }
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[3] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431 }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[8] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
-
-null {
-    <name not found> = ArrayList@440[10] { ResolutionCandidate@374, ResolutionCandidate@375, ResolutionCandidate@376, ... }
-    <name not found> = ArrayList@441[10] { ResolutionCandidate@384, ResolutionCandidate@385, ResolutionCandidate@386, ... }
-    <name not found> = ArrayList@442[10] { ResolutionCandidate@379, ResolutionCandidate@380, ResolutionCandidate@381, ... }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@455[2] { ResolutionCandidate@425, ResolutionCandidate@426 }
-    <name not found> = ArrayList@456[3] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431 }
-    <name not found> = ArrayList@457[8] { ResolutionCandidate@434, ResolutionCandidate@435, ResolutionCandidate@436, ... }
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-    <name not found> = EmptyList@7[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
deleted file mode 100644
index d6684d9d9b5..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
+++ /dev/null
@@ -1,10795 +0,0 @@
-LazyJavaClassDescriptor@0['AWTKeyStroke'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassDescriptor@2['BaselineResizeBehavior'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['BaselineResizeBehavior']
-}
-
-LazyJavaClassDescriptor@4['Class'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassDescriptor@6['Component'] {
-    defaultType = JetTypeImpl@7['Component']
-    functionTypeForSamInterface = null
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('action': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['action'] } // through LazyJavaClassMemberScope@10
-    functions('add': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@10
-    functions('addComponentListener': Name@17) = ArrayList@18[1] { JavaMethodDescriptor@19['addComponentListener'] } // through LazyJavaClassMemberScope@10
-    functions('addContainerListener': Name@20) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addDelicately': Name@21) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addFocusListener': Name@22) = ArrayList@23[1] { JavaMethodDescriptor@24['addFocusListener'] } // through LazyJavaClassMemberScope@10
-    functions('addHierarchyBoundsListener': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@27['addHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@10
-    functions('addHierarchyListener': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['addHierarchyListener'] } // through LazyJavaClassMemberScope@10
-    functions('addImpl': Name@31) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addInputMethodListener': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['addInputMethodListener'] } // through LazyJavaClassMemberScope@10
-    functions('addKeyListener': Name@35) = ArrayList@36[1] { JavaMethodDescriptor@37['addKeyListener'] } // through LazyJavaClassMemberScope@10
-    functions('addMouseListener': Name@38) = ArrayList@39[1] { JavaMethodDescriptor@40['addMouseListener'] } // through LazyJavaClassMemberScope@10
-    functions('addMouseMotionListener': Name@41) = ArrayList@42[1] { JavaMethodDescriptor@43['addMouseMotionListener'] } // through LazyJavaClassMemberScope@10
-    functions('addMouseWheelListener': Name@44) = ArrayList@45[1] { JavaMethodDescriptor@46['addMouseWheelListener'] } // through LazyJavaClassMemberScope@10
-    functions('addNotify': Name@47) = ArrayList@48[1] { JavaMethodDescriptor@49['addNotify'] } // through LazyJavaClassMemberScope@10
-    functions('addOwnedWindow': Name@50) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addPropertyChangeListener': Name@51) = ArrayList@52[2] { JavaMethodDescriptor@53['addPropertyChangeListener'], JavaMethodDescriptor@54['addPropertyChangeListener'] } // through LazyJavaClassMemberScope@10
-    functions('addToWindowList': Name@55) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addWindowFocusListener': Name@56) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addWindowListener': Name@57) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('addWindowStateListener': Name@58) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('adjustDecendantsOnParent': Name@59) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('adjustDescendants': Name@60) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('adjustListeningChildren': Name@61) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('adjustListeningChildrenOnParent': Name@62) = ArrayList@63[1] { JavaMethodDescriptor@64['adjustListeningChildrenOnParent'] } // through LazyJavaClassMemberScope@10
-    functions('applyComponentOrientation': Name@65) = ArrayList@66[1] { JavaMethodDescriptor@67['applyComponentOrientation'] } // through LazyJavaClassMemberScope@10
-    functions('applyCompoundShape': Name@68) = ArrayList@69[1] { JavaMethodDescriptor@70['applyCompoundShape'] } // through LazyJavaClassMemberScope@10
-    functions('applyCurrentShape': Name@71) = ArrayList@72[1] { JavaMethodDescriptor@73['applyCurrentShape'] } // through LazyJavaClassMemberScope@10
-    functions('applyCurrentShapeBelowMe': Name@74) = ArrayList@75[1] { JavaMethodDescriptor@76['applyCurrentShapeBelowMe'] } // through LazyJavaClassMemberScope@10
-    functions('applyResourceBundle': Name@77) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('areBoundsValid': Name@78) = ArrayList@79[1] { JavaMethodDescriptor@80['areBoundsValid'] } // through LazyJavaClassMemberScope@10
-    functions('areFocusTraversalKeysSet': Name@81) = ArrayList@82[1] { JavaMethodDescriptor@83['areFocusTraversalKeysSet'] } // through LazyJavaClassMemberScope@10
-    functions('areInputMethodsEnabled': Name@84) = ArrayList@85[1] { JavaMethodDescriptor@86['areInputMethodsEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('autoProcessMouseWheel': Name@87) = ArrayList@88[1] { JavaMethodDescriptor@89['autoProcessMouseWheel'] } // through LazyJavaClassMemberScope@10
-    functions('bounds': Name@90) = ArrayList@91[1] { JavaMethodDescriptor@92['bounds'] } // through LazyJavaClassMemberScope@10
-    functions('calculateCurrentShape': Name@93) = ArrayList@94[1] { JavaMethodDescriptor@95['calculateCurrentShape'] } // through LazyJavaClassMemberScope@10
-    functions('calculateSecurityWarningPosition': Name@96) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('canBeFocusOwner': Name@97) = ArrayList@98[1] { JavaMethodDescriptor@99['canBeFocusOwner'] } // through LazyJavaClassMemberScope@10
-    functions('canBeFocusOwnerRecursively': Name@100) = ArrayList@101[1] { JavaMethodDescriptor@102['canBeFocusOwnerRecursively'] } // through LazyJavaClassMemberScope@10
-    functions('canContainFocusOwner': Name@103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('checkAddToSelf': Name@104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('checkAdding': Name@105) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('checkCoalescing': Name@106) = ArrayList@107[1] { JavaMethodDescriptor@108['checkCoalescing'] } // through LazyJavaClassMemberScope@10
-    functions('checkGD': Name@109) = ArrayList@110[1] { JavaMethodDescriptor@111['checkGD'] } // through LazyJavaClassMemberScope@10
-    functions('checkImage': Name@112) = ArrayList@113[2] { JavaMethodDescriptor@114['checkImage'], JavaMethodDescriptor@115['checkImage'] } // through LazyJavaClassMemberScope@10
-    functions('checkNotAWindow': Name@116) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('checkTreeLock': Name@117) = ArrayList@118[1] { JavaMethodDescriptor@119['checkTreeLock'] } // through LazyJavaClassMemberScope@10
-    functions('checkWindowClosingException': Name@120) = ArrayList@121[1] { JavaMethodDescriptor@122['checkWindowClosingException'] } // through LazyJavaClassMemberScope@10
-    functions('clearCurrentFocusCycleRootOnHide': Name@123) = ArrayList@124[1] { JavaMethodDescriptor@125['clearCurrentFocusCycleRootOnHide'] } // through LazyJavaClassMemberScope@10
-    functions('clearMostRecentFocusOwnerOnHide': Name@126) = ArrayList@127[1] { JavaMethodDescriptor@128['clearMostRecentFocusOwnerOnHide'] } // through LazyJavaClassMemberScope@10
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('closeSplashScreen': Name@130) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('coalesceEvents': Name@131) = ArrayList@132[1] { JavaMethodDescriptor@133['coalesceEvents'] } // through LazyJavaClassMemberScope@10
-    functions('connectOwnedWindow': Name@134) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('constructComponentName': Name@135) = ArrayList@136[1] { JavaMethodDescriptor@137['constructComponentName'] } // through LazyJavaClassMemberScope@10
-    functions('contains': Name@138) = ArrayList@139[2] { JavaMethodDescriptor@140['contains'], JavaMethodDescriptor@141['contains'] } // through LazyJavaClassMemberScope@10
-    functions('containsFocus': Name@142) = ArrayList@143[1] { JavaMethodDescriptor@144['containsFocus'] } // through LazyJavaClassMemberScope@10
-    functions('countComponents': Name@145) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('countHierarchyMembers': Name@146) = ArrayList@147[1] { JavaMethodDescriptor@148['countHierarchyMembers'] } // through LazyJavaClassMemberScope@10
-    functions('createBufferStrategy': Name@149) = ArrayList@150[2] { JavaMethodDescriptor@151['createBufferStrategy'], JavaMethodDescriptor@152['createBufferStrategy'] } // through LazyJavaClassMemberScope@10
-    functions('createChildHierarchyEvents': Name@153) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('createHierarchyEvents': Name@154) = ArrayList@155[1] { JavaMethodDescriptor@156['createHierarchyEvents'] } // through LazyJavaClassMemberScope@10
-    functions('createImage': Name@157) = ArrayList@158[2] { JavaMethodDescriptor@159['createImage'], JavaMethodDescriptor@160['createImage'] } // through LazyJavaClassMemberScope@10
-    functions('createRootPane': Name@161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('createVolatileImage': Name@162) = ArrayList@163[2] { JavaMethodDescriptor@164['createVolatileImage'], JavaMethodDescriptor@165['createVolatileImage'] } // through LazyJavaClassMemberScope@10
-    functions('decreaseComponentCount': Name@166) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('deliverEvent': Name@167) = ArrayList@168[1] { JavaMethodDescriptor@169['deliverEvent'] } // through LazyJavaClassMemberScope@10
-    functions('deliverMouseWheelToAncestor': Name@170) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('deserializeResources': Name@171) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('disable': Name@172) = ArrayList@173[1] { JavaMethodDescriptor@174['disable'] } // through LazyJavaClassMemberScope@10
-    functions('disableEvents': Name@175) = ArrayList@176[1] { JavaMethodDescriptor@177['disableEvents'] } // through LazyJavaClassMemberScope@10
-    functions('dispatchEvent': Name@178) = ArrayList@179[1] { JavaMethodDescriptor@180['dispatchEvent'] } // through LazyJavaClassMemberScope@10
-    functions('dispatchEventImpl': Name@181) = ArrayList@182[1] { JavaMethodDescriptor@183['dispatchEventImpl'] } // through LazyJavaClassMemberScope@10
-    functions('dispatchEventToSelf': Name@184) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('dispatchMouseWheelToAncestor': Name@185) = ArrayList@186[1] { JavaMethodDescriptor@187['dispatchMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@10
-    functions('dispose': Name@188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('disposeImpl': Name@189) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('doDispose': Name@190) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('doLayout': Name@191) = ArrayList@192[1] { JavaMethodDescriptor@193['doLayout'] } // through LazyJavaClassMemberScope@10
-    functions('doSwingSerialization': Name@194) = ArrayList@195[1] { JavaMethodDescriptor@196['doSwingSerialization'] } // through LazyJavaClassMemberScope@10
-    functions('enable': Name@197) = ArrayList@198[2] { JavaMethodDescriptor@199['enable'], JavaMethodDescriptor@200['enable'] } // through LazyJavaClassMemberScope@10
-    functions('enableEvents': Name@201) = ArrayList@202[1] { JavaMethodDescriptor@203['enableEvents'] } // through LazyJavaClassMemberScope@10
-    functions('enableInputMethods': Name@204) = ArrayList@205[1] { JavaMethodDescriptor@206['enableInputMethods'] } // through LazyJavaClassMemberScope@10
-    functions('equals': Name@207) = ArrayList@208[1] { DeserializedSimpleFunctionDescriptor@209['equals'] } // through LazyJavaClassMemberScope@10
-    functions('eventEnabled': Name@210) = ArrayList@211[1] { JavaMethodDescriptor@212['eventEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('eventTypeEnabled': Name@213) = ArrayList@214[1] { JavaMethodDescriptor@215['eventTypeEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('findComponentAt': Name@217) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('findComponentAtImpl': Name@218) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('findTraversalRoot': Name@219) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('findUnderMouseInWindow': Name@220) = ArrayList@221[1] { JavaMethodDescriptor@222['findUnderMouseInWindow'] } // through LazyJavaClassMemberScope@10
-    functions('firePropertyChange': Name@223) = ArrayList@224[9] { JavaMethodDescriptor@225['firePropertyChange'], JavaMethodDescriptor@226['firePropertyChange'], JavaMethodDescriptor@227['firePropertyChange'], ... } // through LazyJavaClassMemberScope@10
-    functions('frameInit': Name@228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getAccessControlContext': Name@229) = ArrayList@230[1] { JavaMethodDescriptor@231['getAccessControlContext'] } // through LazyJavaClassMemberScope@10
-    functions('getAccessibleAt': Name@232) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getAccessibleChild': Name@233) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getAccessibleChildrenCount': Name@234) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getAccessibleContext': Name@235) = ArrayList@236[1] { JavaMethodDescriptor@237['getAccessibleContext'] } // through LazyJavaClassMemberScope@10
-    functions('getAccessibleIndexInParent': Name@238) = ArrayList@239[1] { JavaMethodDescriptor@240['getAccessibleIndexInParent'] } // through LazyJavaClassMemberScope@10
-    functions('getAccessibleStateSet': Name@241) = ArrayList@242[1] { JavaMethodDescriptor@243['getAccessibleStateSet'] } // through LazyJavaClassMemberScope@10
-    functions('getAlignmentX': Name@244) = ArrayList@245[1] { JavaMethodDescriptor@246['getAlignmentX'] } // through LazyJavaClassMemberScope@10
-    functions('getAlignmentY': Name@247) = ArrayList@248[1] { JavaMethodDescriptor@249['getAlignmentY'] } // through LazyJavaClassMemberScope@10
-    functions('getAppliedShape': Name@250) = ArrayList@251[1] { JavaMethodDescriptor@252['getAppliedShape'] } // through LazyJavaClassMemberScope@10
-    functions('getBackBuffer': Name@253) = ArrayList@254[1] { JavaMethodDescriptor@255['getBackBuffer'] } // through LazyJavaClassMemberScope@10
-    functions('getBackground': Name@256) = ArrayList@257[1] { JavaMethodDescriptor@258['getBackground'] } // through LazyJavaClassMemberScope@10
-    functions('getBaseline': Name@259) = ArrayList@260[1] { JavaMethodDescriptor@261['getBaseline'] } // through LazyJavaClassMemberScope@10
-    functions('getBaselineResizeBehavior': Name@262) = ArrayList@263[1] { JavaMethodDescriptor@264['getBaselineResizeBehavior'] } // through LazyJavaClassMemberScope@10
-    functions('getBottommostComponentIndex': Name@265) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getBounds': Name@266) = ArrayList@267[2] { JavaMethodDescriptor@268['getBounds'], JavaMethodDescriptor@269['getBounds'] } // through LazyJavaClassMemberScope@10
-    functions('getBoundsOp': Name@270) = ArrayList@271[1] { JavaMethodDescriptor@272['getBoundsOp'] } // through LazyJavaClassMemberScope@10
-    functions('getBufferStrategy': Name@273) = ArrayList@274[1] { JavaMethodDescriptor@275['getBufferStrategy'] } // through LazyJavaClassMemberScope@10
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getColorModel': Name@277) = ArrayList@278[1] { JavaMethodDescriptor@279['getColorModel'] } // through LazyJavaClassMemberScope@10
-    functions('getComponent': Name@280) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getComponentAt': Name@281) = ArrayList@282[2] { JavaMethodDescriptor@283['getComponentAt'], JavaMethodDescriptor@284['getComponentAt'] } // through LazyJavaClassMemberScope@10
-    functions('getComponentCount': Name@285) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getComponentListeners': Name@286) = ArrayList@287[1] { JavaMethodDescriptor@288['getComponentListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getComponentOrientation': Name@289) = ArrayList@290[1] { JavaMethodDescriptor@291['getComponentOrientation'] } // through LazyJavaClassMemberScope@10
-    functions('getComponentZOrder': Name@292) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getComponents': Name@293) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getComponentsSync': Name@294) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getComponents_NoClientCode': Name@295) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getContainer': Name@296) = ArrayList@297[1] { JavaMethodDescriptor@298['getContainer'] } // through LazyJavaClassMemberScope@10
-    functions('getContainerListeners': Name@299) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getContainingWindow': Name@300) = ArrayList@301[1] { JavaMethodDescriptor@302['getContainingWindow'] } // through LazyJavaClassMemberScope@10
-    functions('getContentPane': Name@303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getCursor': Name@304) = ArrayList@305[1] { JavaMethodDescriptor@306['getCursor'] } // through LazyJavaClassMemberScope@10
-    functions('getCursorType': Name@307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getCursor_NoClientCode': Name@308) = ArrayList@309[1] { JavaMethodDescriptor@310['getCursor_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getDefaultCloseOperation': Name@311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getDocumentRoot': Name@312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getDropTarget': Name@313) = ArrayList@314[1] { JavaMethodDescriptor@315['getDropTarget'] } // through LazyJavaClassMemberScope@10
-    functions('getDropTargetEventTarget': Name@316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getExtendedState': Name@317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getFocusCycleRootAncestor': Name@318) = ArrayList@319[1] { JavaMethodDescriptor@320['getFocusCycleRootAncestor'] } // through LazyJavaClassMemberScope@10
-    functions('getFocusListeners': Name@321) = ArrayList@322[1] { JavaMethodDescriptor@323['getFocusListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getFocusOwner': Name@324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getFocusTraversalKeys': Name@325) = ArrayList@326[1] { JavaMethodDescriptor@327['getFocusTraversalKeys'] } // through LazyJavaClassMemberScope@10
-    functions('getFocusTraversalKeysEnabled': Name@328) = ArrayList@329[1] { JavaMethodDescriptor@330['getFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('getFocusTraversalKeys_NoIDCheck': Name@331) = ArrayList@332[1] { JavaMethodDescriptor@333['getFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@10
-    functions('getFocusTraversalPolicy': Name@334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getFocusableWindowState': Name@335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getFont': Name@336) = ArrayList@337[1] { JavaMethodDescriptor@338['getFont'] } // through LazyJavaClassMemberScope@10
-    functions('getFontMetrics': Name@339) = ArrayList@340[1] { JavaMethodDescriptor@341['getFontMetrics'] } // through LazyJavaClassMemberScope@10
-    functions('getFont_NoClientCode': Name@342) = ArrayList@343[1] { JavaMethodDescriptor@344['getFont_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getForeground': Name@345) = ArrayList@346[1] { JavaMethodDescriptor@347['getForeground'] } // through LazyJavaClassMemberScope@10
-    functions('getGlassPane': Name@348) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getGraphics': Name@349) = ArrayList@350[1] { JavaMethodDescriptor@351['getGraphics'] } // through LazyJavaClassMemberScope@10
-    functions('getGraphicsConfiguration': Name@352) = ArrayList@353[1] { JavaMethodDescriptor@354['getGraphicsConfiguration'] } // through LazyJavaClassMemberScope@10
-    functions('getGraphicsConfiguration_NoClientCode': Name@355) = ArrayList@356[1] { JavaMethodDescriptor@357['getGraphicsConfiguration_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getGraphics_NoClientCode': Name@358) = ArrayList@359[1] { JavaMethodDescriptor@360['getGraphics_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getHWPeerAboveMe': Name@361) = ArrayList@362[1] { JavaMethodDescriptor@363['getHWPeerAboveMe'] } // through LazyJavaClassMemberScope@10
-    functions('getHeavyweightContainer': Name@364) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getHeight': Name@365) = ArrayList@366[1] { JavaMethodDescriptor@367['getHeight'] } // through LazyJavaClassMemberScope@10
-    functions('getHierarchyBoundsListeners': Name@368) = ArrayList@369[1] { JavaMethodDescriptor@370['getHierarchyBoundsListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getHierarchyListeners': Name@371) = ArrayList@372[1] { JavaMethodDescriptor@373['getHierarchyListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getIconImage': Name@374) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getIconImages': Name@375) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getIgnoreRepaint': Name@376) = ArrayList@377[1] { JavaMethodDescriptor@378['getIgnoreRepaint'] } // through LazyJavaClassMemberScope@10
-    functions('getInputContext': Name@379) = ArrayList@380[1] { JavaMethodDescriptor@381['getInputContext'] } // through LazyJavaClassMemberScope@10
-    functions('getInputMethodListeners': Name@382) = ArrayList@383[1] { JavaMethodDescriptor@384['getInputMethodListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getInputMethodRequests': Name@385) = ArrayList@386[1] { JavaMethodDescriptor@387['getInputMethodRequests'] } // through LazyJavaClassMemberScope@10
-    functions('getInsets': Name@388) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getInsets_NoClientCode': Name@389) = ArrayList@390[1] { JavaMethodDescriptor@391['getInsets_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getJMenuBar': Name@392) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getKeyListeners': Name@393) = ArrayList@394[1] { JavaMethodDescriptor@395['getKeyListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getLayeredPane': Name@396) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getLayout': Name@397) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getListeners': Name@398) = ArrayList@399[1] { JavaMethodDescriptor@400['getListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getListenersCount': Name@401) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getLocale': Name@402) = ArrayList@403[1] { JavaMethodDescriptor@404['getLocale'] } // through LazyJavaClassMemberScope@10
-    functions('getLocation': Name@405) = ArrayList@406[2] { JavaMethodDescriptor@407['getLocation'], JavaMethodDescriptor@408['getLocation'] } // through LazyJavaClassMemberScope@10
-    functions('getLocationOnScreen': Name@409) = ArrayList@410[1] { JavaMethodDescriptor@411['getLocationOnScreen'] } // through LazyJavaClassMemberScope@10
-    functions('getLocationOnScreen_NoTreeLock': Name@412) = ArrayList@413[1] { JavaMethodDescriptor@414['getLocationOnScreen_NoTreeLock'] } // through LazyJavaClassMemberScope@10
-    functions('getLocationOnWindow': Name@415) = ArrayList@416[1] { JavaMethodDescriptor@417['getLocationOnWindow'] } // through LazyJavaClassMemberScope@10
-    functions('getMaximizedBounds': Name@418) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMaximumSize': Name@419) = ArrayList@420[1] { JavaMethodDescriptor@421['getMaximumSize'] } // through LazyJavaClassMemberScope@10
-    functions('getMenuBar': Name@422) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMinimumSize': Name@423) = ArrayList@424[1] { JavaMethodDescriptor@425['getMinimumSize'] } // through LazyJavaClassMemberScope@10
-    functions('getModalBlocker': Name@426) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getModalExclusionType': Name@427) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMostRecentFocusOwner': Name@428) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMouseEventTarget': Name@429) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMouseEventTargetImpl': Name@430) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getMouseListeners': Name@431) = ArrayList@432[1] { JavaMethodDescriptor@433['getMouseListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getMouseMotionListeners': Name@434) = ArrayList@435[1] { JavaMethodDescriptor@436['getMouseMotionListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getMousePosition': Name@437) = ArrayList@438[1] { JavaMethodDescriptor@439['getMousePosition'] } // through LazyJavaClassMemberScope@10
-    functions('getMouseWheelListeners': Name@440) = ArrayList@441[1] { JavaMethodDescriptor@442['getMouseWheelListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getName': Name@443) = ArrayList@444[1] { JavaMethodDescriptor@445['getName'] } // through LazyJavaClassMemberScope@10
-    functions('getNativeContainer': Name@446) = ArrayList@447[1] { JavaMethodDescriptor@448['getNativeContainer'] } // through LazyJavaClassMemberScope@10
-    functions('getNextFocusCandidate': Name@449) = ArrayList@450[1] { JavaMethodDescriptor@451['getNextFocusCandidate'] } // through LazyJavaClassMemberScope@10
-    functions('getNormalShape': Name@452) = ArrayList@453[1] { JavaMethodDescriptor@454['getNormalShape'] } // through LazyJavaClassMemberScope@10
-    functions('getObjectLock': Name@455) = ArrayList@456[1] { JavaMethodDescriptor@457['getObjectLock'] } // through LazyJavaClassMemberScope@10
-    functions('getOpacity': Name@458) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getOpaqueShape': Name@459) = ArrayList@460[1] { JavaMethodDescriptor@461['getOpaqueShape'] } // through LazyJavaClassMemberScope@10
-    functions('getOwnedWindows': Name@462) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getOwnedWindows_NoClientCode': Name@463) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getOwner': Name@464) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getOwner_NoClientCode': Name@465) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getParent': Name@466) = ArrayList@467[1] { JavaMethodDescriptor@468['getParent'] } // through LazyJavaClassMemberScope@10
-    functions('getParent_NoClientCode': Name@469) = ArrayList@470[1] { JavaMethodDescriptor@471['getParent_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('getPeer': Name@472) = ArrayList@473[1] { JavaMethodDescriptor@474['getPeer'] } // through LazyJavaClassMemberScope@10
-    functions('getPreferredSize': Name@475) = ArrayList@476[1] { JavaMethodDescriptor@477['getPreferredSize'] } // through LazyJavaClassMemberScope@10
-    functions('getPropertyChangeListeners': Name@478) = ArrayList@479[2] { JavaMethodDescriptor@480['getPropertyChangeListeners'], JavaMethodDescriptor@481['getPropertyChangeListeners'] } // through LazyJavaClassMemberScope@10
-    functions('getRootPane': Name@482) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getShape': Name@483) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getSiblingIndexAbove': Name@484) = ArrayList@485[1] { JavaMethodDescriptor@486['getSiblingIndexAbove'] } // through LazyJavaClassMemberScope@10
-    functions('getSiblingIndexBelow': Name@487) = ArrayList@488[1] { JavaMethodDescriptor@489['getSiblingIndexBelow'] } // through LazyJavaClassMemberScope@10
-    functions('getSize': Name@490) = ArrayList@491[2] { JavaMethodDescriptor@492['getSize'], JavaMethodDescriptor@493['getSize'] } // through LazyJavaClassMemberScope@10
-    functions('getState': Name@494) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getTemporaryLostComponent': Name@495) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getTitle': Name@496) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getToolkit': Name@497) = ArrayList@498[1] { JavaMethodDescriptor@499['getToolkit'] } // through LazyJavaClassMemberScope@10
-    functions('getToolkitImpl': Name@500) = ArrayList@501[1] { JavaMethodDescriptor@502['getToolkitImpl'] } // through LazyJavaClassMemberScope@10
-    functions('getTopmostComponentIndex': Name@503) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getTransferHandler': Name@504) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getTraversalRoot': Name@505) = ArrayList@506[1] { JavaMethodDescriptor@507['getTraversalRoot'] } // through LazyJavaClassMemberScope@10
-    functions('getTreeLock': Name@508) = ArrayList@509[1] { JavaMethodDescriptor@510['getTreeLock'] } // through LazyJavaClassMemberScope@10
-    functions('getType': Name@511) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getWarningString': Name@512) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getWidth': Name@513) = ArrayList@514[1] { JavaMethodDescriptor@515['getWidth'] } // through LazyJavaClassMemberScope@10
-    functions('getWindowFocusListeners': Name@516) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getWindowListeners': Name@517) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getWindowStateListeners': Name@518) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('getX': Name@519) = ArrayList@520[1] { JavaMethodDescriptor@521['getX'] } // through LazyJavaClassMemberScope@10
-    functions('getY': Name@522) = ArrayList@523[1] { JavaMethodDescriptor@524['getY'] } // through LazyJavaClassMemberScope@10
-    functions('gotFocus': Name@525) = ArrayList@526[1] { JavaMethodDescriptor@527['gotFocus'] } // through LazyJavaClassMemberScope@10
-    functions('handleEvent': Name@528) = ArrayList@529[1] { JavaMethodDescriptor@530['handleEvent'] } // through LazyJavaClassMemberScope@10
-    functions('hasFocus': Name@531) = ArrayList@532[1] { JavaMethodDescriptor@533['hasFocus'] } // through LazyJavaClassMemberScope@10
-    functions('hasHeavyweightDescendants': Name@534) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('hasLightweightDescendants': Name@535) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('hashCode': Name@536) = ArrayList@537[1] { DeserializedSimpleFunctionDescriptor@538['hashCode'] } // through LazyJavaClassMemberScope@10
-    functions('hide': Name@539) = ArrayList@540[1] { JavaMethodDescriptor@541['hide'] } // through LazyJavaClassMemberScope@10
-    functions('imageUpdate': Name@542) = ArrayList@543[1] { JavaMethodDescriptor@544['imageUpdate'] } // through LazyJavaClassMemberScope@10
-    functions('increaseComponentCount': Name@545) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('init': Name@546) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('initDeserializedWindow': Name@547) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('initGC': Name@548) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('initializeFocusTraversalKeys': Name@549) = ArrayList@550[1] { JavaMethodDescriptor@551['initializeFocusTraversalKeys'] } // through LazyJavaClassMemberScope@10
-    functions('insets': Name@552) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('inside': Name@553) = ArrayList@554[1] { JavaMethodDescriptor@555['inside'] } // through LazyJavaClassMemberScope@10
-    functions('invalidate': Name@556) = ArrayList@557[1] { JavaMethodDescriptor@558['invalidate'] } // through LazyJavaClassMemberScope@10
-    functions('invalidateIfValid': Name@559) = ArrayList@560[1] { JavaMethodDescriptor@561['invalidateIfValid'] } // through LazyJavaClassMemberScope@10
-    functions('invalidateParent': Name@562) = ArrayList@563[1] { JavaMethodDescriptor@564['invalidateParent'] } // through LazyJavaClassMemberScope@10
-    functions('invalidateTree': Name@565) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isActive': Name@566) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isAlwaysOnTop': Name@567) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isAlwaysOnTopSupported': Name@568) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isAncestorOf': Name@569) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isAutoFocusTransferOnDisposal': Name@570) = ArrayList@571[1] { JavaMethodDescriptor@572['isAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@10
-    functions('isAutoRequestFocus': Name@573) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isBackgroundSet': Name@574) = ArrayList@575[1] { JavaMethodDescriptor@576['isBackgroundSet'] } // through LazyJavaClassMemberScope@10
-    functions('isCoalescingEnabled': Name@577) = ArrayList@578[1] { JavaMethodDescriptor@579['isCoalescingEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('isCursorSet': Name@580) = ArrayList@581[1] { JavaMethodDescriptor@582['isCursorSet'] } // through LazyJavaClassMemberScope@10
-    functions('isDisplayable': Name@583) = ArrayList@584[1] { JavaMethodDescriptor@585['isDisplayable'] } // through LazyJavaClassMemberScope@10
-    functions('isDisposing': Name@586) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isDoubleBuffered': Name@587) = ArrayList@588[1] { JavaMethodDescriptor@589['isDoubleBuffered'] } // through LazyJavaClassMemberScope@10
-    functions('isEnabled': Name@590) = ArrayList@591[1] { JavaMethodDescriptor@592['isEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('isEnabledImpl': Name@593) = ArrayList@594[1] { JavaMethodDescriptor@595['isEnabledImpl'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusCycleRoot': Name@596) = ArrayList@597[1] { JavaMethodDescriptor@598['isFocusCycleRoot'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusOwner': Name@599) = ArrayList@600[1] { JavaMethodDescriptor@601['isFocusOwner'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusTraversable': Name@602) = ArrayList@603[1] { JavaMethodDescriptor@604['isFocusTraversable'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusTraversableOverridden': Name@605) = ArrayList@606[1] { JavaMethodDescriptor@607['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusTraversalPolicyProvider': Name@608) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isFocusTraversalPolicySet': Name@609) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isFocusable': Name@610) = ArrayList@611[1] { JavaMethodDescriptor@612['isFocusable'] } // through LazyJavaClassMemberScope@10
-    functions('isFocusableWindow': Name@613) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isFocused': Name@614) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isFontSet': Name@615) = ArrayList@616[1] { JavaMethodDescriptor@617['isFontSet'] } // through LazyJavaClassMemberScope@10
-    functions('isForegroundSet': Name@618) = ArrayList@619[1] { JavaMethodDescriptor@620['isForegroundSet'] } // through LazyJavaClassMemberScope@10
-    functions('isFrameStateSupported': Name@621) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isLightweight': Name@622) = ArrayList@623[1] { JavaMethodDescriptor@624['isLightweight'] } // through LazyJavaClassMemberScope@10
-    functions('isLocationByPlatform': Name@625) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isMaximumSizeSet': Name@626) = ArrayList@627[1] { JavaMethodDescriptor@628['isMaximumSizeSet'] } // through LazyJavaClassMemberScope@10
-    functions('isMinimumSizeSet': Name@629) = ArrayList@630[1] { JavaMethodDescriptor@631['isMinimumSizeSet'] } // through LazyJavaClassMemberScope@10
-    functions('isMixingNeeded': Name@632) = ArrayList@633[1] { JavaMethodDescriptor@634['isMixingNeeded'] } // through LazyJavaClassMemberScope@10
-    functions('isModalBlocked': Name@635) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isModalExcluded': Name@636) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isNonOpaqueForMixing': Name@637) = ArrayList@638[1] { JavaMethodDescriptor@639['isNonOpaqueForMixing'] } // through LazyJavaClassMemberScope@10
-    functions('isOpaque': Name@640) = ArrayList@641[1] { JavaMethodDescriptor@642['isOpaque'] } // through LazyJavaClassMemberScope@10
-    functions('isParentOf': Name@643) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isPreferredSizeSet': Name@644) = ArrayList@645[1] { JavaMethodDescriptor@646['isPreferredSizeSet'] } // through LazyJavaClassMemberScope@10
-    functions('isRecursivelyVisible': Name@647) = ArrayList@648[1] { JavaMethodDescriptor@649['isRecursivelyVisible'] } // through LazyJavaClassMemberScope@10
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@650) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isRequestFocusAccepted': Name@651) = ArrayList@652[1] { JavaMethodDescriptor@653['isRequestFocusAccepted'] } // through LazyJavaClassMemberScope@10
-    functions('isResizable': Name@654) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isRootPaneCheckingEnabled': Name@655) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isSameOrAncestorOf': Name@656) = ArrayList@657[1] { JavaMethodDescriptor@658['isSameOrAncestorOf'] } // through LazyJavaClassMemberScope@10
-    functions('isShowing': Name@659) = ArrayList@660[1] { JavaMethodDescriptor@661['isShowing'] } // through LazyJavaClassMemberScope@10
-    functions('isUndecorated': Name@662) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isValid': Name@663) = ArrayList@664[1] { JavaMethodDescriptor@665['isValid'] } // through LazyJavaClassMemberScope@10
-    functions('isValidateRoot': Name@666) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('isVisible': Name@667) = ArrayList@668[1] { JavaMethodDescriptor@669['isVisible'] } // through LazyJavaClassMemberScope@10
-    functions('isVisible_NoClientCode': Name@670) = ArrayList@671[1] { JavaMethodDescriptor@672['isVisible_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('keyDown': Name@673) = ArrayList@674[1] { JavaMethodDescriptor@675['keyDown'] } // through LazyJavaClassMemberScope@10
-    functions('keyUp': Name@676) = ArrayList@677[1] { JavaMethodDescriptor@678['keyUp'] } // through LazyJavaClassMemberScope@10
-    functions('layout': Name@679) = ArrayList@680[1] { JavaMethodDescriptor@681['layout'] } // through LazyJavaClassMemberScope@10
-    functions('lightweightPaint': Name@682) = ArrayList@683[1] { JavaMethodDescriptor@684['lightweightPaint'] } // through LazyJavaClassMemberScope@10
-    functions('lightweightPrint': Name@685) = ArrayList@686[1] { JavaMethodDescriptor@687['lightweightPrint'] } // through LazyJavaClassMemberScope@10
-    functions('list': Name@688) = ArrayList@689[5] { JavaMethodDescriptor@690['list'], JavaMethodDescriptor@691['list'], JavaMethodDescriptor@692['list'], ... } // through LazyJavaClassMemberScope@10
-    functions('locate': Name@693) = ArrayList@694[1] { JavaMethodDescriptor@695['locate'] } // through LazyJavaClassMemberScope@10
-    functions('location': Name@696) = ArrayList@697[1] { JavaMethodDescriptor@698['location'] } // through LazyJavaClassMemberScope@10
-    functions('location_NoClientCode': Name@699) = ArrayList@700[1] { JavaMethodDescriptor@701['location_NoClientCode'] } // through LazyJavaClassMemberScope@10
-    functions('lostFocus': Name@702) = ArrayList@703[1] { JavaMethodDescriptor@704['lostFocus'] } // through LazyJavaClassMemberScope@10
-    functions('minimumSize': Name@705) = ArrayList@706[1] { JavaMethodDescriptor@707['minimumSize'] } // through LazyJavaClassMemberScope@10
-    functions('mixOnHiding': Name@708) = ArrayList@709[1] { JavaMethodDescriptor@710['mixOnHiding'] } // through LazyJavaClassMemberScope@10
-    functions('mixOnReshaping': Name@711) = ArrayList@712[1] { JavaMethodDescriptor@713['mixOnReshaping'] } // through LazyJavaClassMemberScope@10
-    functions('mixOnShowing': Name@714) = ArrayList@715[1] { JavaMethodDescriptor@716['mixOnShowing'] } // through LazyJavaClassMemberScope@10
-    functions('mixOnValidating': Name@717) = ArrayList@718[1] { JavaMethodDescriptor@719['mixOnValidating'] } // through LazyJavaClassMemberScope@10
-    functions('mixOnZOrderChanging': Name@720) = ArrayList@721[1] { JavaMethodDescriptor@722['mixOnZOrderChanging'] } // through LazyJavaClassMemberScope@10
-    functions('mouseDown': Name@723) = ArrayList@724[1] { JavaMethodDescriptor@725['mouseDown'] } // through LazyJavaClassMemberScope@10
-    functions('mouseDrag': Name@726) = ArrayList@727[1] { JavaMethodDescriptor@728['mouseDrag'] } // through LazyJavaClassMemberScope@10
-    functions('mouseEnter': Name@729) = ArrayList@730[1] { JavaMethodDescriptor@731['mouseEnter'] } // through LazyJavaClassMemberScope@10
-    functions('mouseExit': Name@732) = ArrayList@733[1] { JavaMethodDescriptor@734['mouseExit'] } // through LazyJavaClassMemberScope@10
-    functions('mouseMove': Name@735) = ArrayList@736[1] { JavaMethodDescriptor@737['mouseMove'] } // through LazyJavaClassMemberScope@10
-    functions('mouseUp': Name@738) = ArrayList@739[1] { JavaMethodDescriptor@740['mouseUp'] } // through LazyJavaClassMemberScope@10
-    functions('move': Name@741) = ArrayList@742[1] { JavaMethodDescriptor@743['move'] } // through LazyJavaClassMemberScope@10
-    functions('nextFocus': Name@744) = ArrayList@745[1] { JavaMethodDescriptor@746['nextFocus'] } // through LazyJavaClassMemberScope@10
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('notifyNewBounds': Name@749) = ArrayList@750[1] { JavaMethodDescriptor@751['notifyNewBounds'] } // through LazyJavaClassMemberScope@10
-    functions('numListening': Name@752) = ArrayList@753[1] { JavaMethodDescriptor@754['numListening'] } // through LazyJavaClassMemberScope@10
-    functions('ownedInit': Name@755) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('pack': Name@756) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('paint': Name@757) = ArrayList@758[1] { JavaMethodDescriptor@759['paint'] } // through LazyJavaClassMemberScope@10
-    functions('paintAll': Name@760) = ArrayList@761[1] { JavaMethodDescriptor@762['paintAll'] } // through LazyJavaClassMemberScope@10
-    functions('paintComponents': Name@763) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('paintHeavyweightComponents': Name@764) = ArrayList@765[1] { JavaMethodDescriptor@766['paintHeavyweightComponents'] } // through LazyJavaClassMemberScope@10
-    functions('paramString': Name@767) = ArrayList@768[1] { JavaMethodDescriptor@769['paramString'] } // through LazyJavaClassMemberScope@10
-    functions('pointRelativeToComponent': Name@770) = ArrayList@771[1] { JavaMethodDescriptor@772['pointRelativeToComponent'] } // through LazyJavaClassMemberScope@10
-    functions('postEvent': Name@773) = ArrayList@774[1] { JavaMethodDescriptor@775['postEvent'] } // through LazyJavaClassMemberScope@10
-    functions('postProcessKeyEvent': Name@776) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('postWindowEvent': Name@777) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('postsOldMouseEvents': Name@778) = ArrayList@779[1] { JavaMethodDescriptor@780['postsOldMouseEvents'] } // through LazyJavaClassMemberScope@10
-    functions('preProcessKeyEvent': Name@781) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('preferredSize': Name@782) = ArrayList@783[1] { JavaMethodDescriptor@784['preferredSize'] } // through LazyJavaClassMemberScope@10
-    functions('prepareImage': Name@785) = ArrayList@786[2] { JavaMethodDescriptor@787['prepareImage'], JavaMethodDescriptor@788['prepareImage'] } // through LazyJavaClassMemberScope@10
-    functions('print': Name@789) = ArrayList@790[1] { JavaMethodDescriptor@791['print'] } // through LazyJavaClassMemberScope@10
-    functions('printAll': Name@792) = ArrayList@793[1] { JavaMethodDescriptor@794['printAll'] } // through LazyJavaClassMemberScope@10
-    functions('printComponents': Name@795) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('printHeavyweightComponents': Name@796) = ArrayList@797[1] { JavaMethodDescriptor@798['printHeavyweightComponents'] } // through LazyJavaClassMemberScope@10
-    functions('processComponentEvent': Name@799) = ArrayList@800[1] { JavaMethodDescriptor@801['processComponentEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processContainerEvent': Name@802) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('processEvent': Name@803) = ArrayList@804[1] { JavaMethodDescriptor@805['processEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processFocusEvent': Name@806) = ArrayList@807[1] { JavaMethodDescriptor@808['processFocusEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processHierarchyBoundsEvent': Name@809) = ArrayList@810[1] { JavaMethodDescriptor@811['processHierarchyBoundsEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processHierarchyEvent': Name@812) = ArrayList@813[1] { JavaMethodDescriptor@814['processHierarchyEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processInputMethodEvent': Name@815) = ArrayList@816[1] { JavaMethodDescriptor@817['processInputMethodEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processKeyEvent': Name@818) = ArrayList@819[1] { JavaMethodDescriptor@820['processKeyEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processMouseEvent': Name@821) = ArrayList@822[1] { JavaMethodDescriptor@823['processMouseEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processMouseMotionEvent': Name@824) = ArrayList@825[1] { JavaMethodDescriptor@826['processMouseMotionEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processMouseWheelEvent': Name@827) = ArrayList@828[1] { JavaMethodDescriptor@829['processMouseWheelEvent'] } // through LazyJavaClassMemberScope@10
-    functions('processWindowEvent': Name@830) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('processWindowFocusEvent': Name@831) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('processWindowStateEvent': Name@832) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('proxyEnableEvents': Name@833) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('readObject': Name@834) = ArrayList@835[1] { JavaMethodDescriptor@836['readObject'] } // through LazyJavaClassMemberScope@10
-    functions('recursiveApplyCurrentShape': Name@837) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('recursiveHideHeavyweightChildren': Name@838) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('recursiveRelocateHeavyweightChildren': Name@839) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('recursiveShowHeavyweightChildren': Name@840) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('recursiveSubtractAndApplyShape': Name@841) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('relocateComponent': Name@842) = ArrayList@843[1] { JavaMethodDescriptor@844['relocateComponent'] } // through LazyJavaClassMemberScope@10
-    functions('remove': Name@845) = ArrayList@846[1] { JavaMethodDescriptor@847['remove'] } // through LazyJavaClassMemberScope@10
-    functions('removeAll': Name@848) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeComponentListener': Name@849) = ArrayList@850[1] { JavaMethodDescriptor@851['removeComponentListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeContainerListener': Name@852) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeDelicately': Name@853) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeFocusListener': Name@854) = ArrayList@855[1] { JavaMethodDescriptor@856['removeFocusListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeFromWindowList': Name@857) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeHierarchyBoundsListener': Name@858) = ArrayList@859[1] { JavaMethodDescriptor@860['removeHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeHierarchyListener': Name@861) = ArrayList@862[1] { JavaMethodDescriptor@863['removeHierarchyListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeInputMethodListener': Name@864) = ArrayList@865[1] { JavaMethodDescriptor@866['removeInputMethodListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeKeyListener': Name@867) = ArrayList@868[1] { JavaMethodDescriptor@869['removeKeyListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeMouseListener': Name@870) = ArrayList@871[1] { JavaMethodDescriptor@872['removeMouseListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeMouseMotionListener': Name@873) = ArrayList@874[1] { JavaMethodDescriptor@875['removeMouseMotionListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeMouseWheelListener': Name@876) = ArrayList@877[1] { JavaMethodDescriptor@878['removeMouseWheelListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeNotify': Name@879) = ArrayList@880[1] { JavaMethodDescriptor@881['removeNotify'] } // through LazyJavaClassMemberScope@10
-    functions('removeOwnedWindow': Name@882) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removePropertyChangeListener': Name@883) = ArrayList@884[2] { JavaMethodDescriptor@885['removePropertyChangeListener'], JavaMethodDescriptor@886['removePropertyChangeListener'] } // through LazyJavaClassMemberScope@10
-    functions('removeWindowFocusListener': Name@887) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeWindowListener': Name@888) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('removeWindowStateListener': Name@889) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('repaint': Name@890) = ArrayList@891[4] { JavaMethodDescriptor@892['repaint'], JavaMethodDescriptor@893['repaint'], JavaMethodDescriptor@894['repaint'], ... } // through LazyJavaClassMemberScope@10
-    functions('repaintParentIfNeeded': Name@895) = ArrayList@896[1] { JavaMethodDescriptor@897['repaintParentIfNeeded'] } // through LazyJavaClassMemberScope@10
-    functions('reparentChild': Name@898) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('reparentTraverse': Name@899) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('requestFocus': Name@900) = ArrayList@901[4] { JavaMethodDescriptor@902['requestFocus'], JavaMethodDescriptor@903['requestFocus'], JavaMethodDescriptor@904['requestFocus'], ... } // through LazyJavaClassMemberScope@10
-    functions('requestFocusHelper': Name@905) = ArrayList@906[2] { JavaMethodDescriptor@907['requestFocusHelper'], JavaMethodDescriptor@908['requestFocusHelper'] } // through LazyJavaClassMemberScope@10
-    functions('requestFocusInWindow': Name@909) = ArrayList@910[4] { JavaMethodDescriptor@911['requestFocusInWindow'], JavaMethodDescriptor@912['requestFocusInWindow'], JavaMethodDescriptor@913['requestFocusInWindow'], ... } // through LazyJavaClassMemberScope@10
-    functions('reshape': Name@914) = ArrayList@915[1] { JavaMethodDescriptor@916['reshape'] } // through LazyJavaClassMemberScope@10
-    functions('reshapeNativePeer': Name@917) = ArrayList@918[1] { JavaMethodDescriptor@919['reshapeNativePeer'] } // through LazyJavaClassMemberScope@10
-    functions('resize': Name@920) = ArrayList@921[2] { JavaMethodDescriptor@922['resize'], JavaMethodDescriptor@923['resize'] } // through LazyJavaClassMemberScope@10
-    functions('revalidate': Name@924) = ArrayList@925[1] { JavaMethodDescriptor@926['revalidate'] } // through LazyJavaClassMemberScope@10
-    functions('setAlwaysOnTop': Name@927) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setAutoFocusTransferOnDisposal': Name@928) = ArrayList@929[1] { JavaMethodDescriptor@930['setAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@10
-    functions('setAutoRequestFocus': Name@931) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setBackground': Name@932) = ArrayList@933[1] { JavaMethodDescriptor@934['setBackground'] } // through LazyJavaClassMemberScope@10
-    functions('setBounds': Name@935) = ArrayList@936[2] { JavaMethodDescriptor@937['setBounds'], JavaMethodDescriptor@938['setBounds'] } // through LazyJavaClassMemberScope@10
-    functions('setBoundsOp': Name@939) = ArrayList@940[1] { JavaMethodDescriptor@941['setBoundsOp'] } // through LazyJavaClassMemberScope@10
-    functions('setClientSize': Name@942) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setComponentOrientation': Name@943) = ArrayList@944[1] { JavaMethodDescriptor@945['setComponentOrientation'] } // through LazyJavaClassMemberScope@10
-    functions('setComponentZOrder': Name@946) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setContentPane': Name@947) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setCursor': Name@948) = ArrayList@949[1] { JavaMethodDescriptor@950['setCursor'] } // through LazyJavaClassMemberScope@10
-    functions('setDefaultCloseOperation': Name@951) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setDropTarget': Name@952) = ArrayList@953[1] { JavaMethodDescriptor@954['setDropTarget'] } // through LazyJavaClassMemberScope@10
-    functions('setEnabled': Name@955) = ArrayList@956[1] { JavaMethodDescriptor@957['setEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('setExtendedState': Name@958) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setFocusCycleRoot': Name@959) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setFocusTraversalKeys': Name@960) = ArrayList@961[1] { JavaMethodDescriptor@962['setFocusTraversalKeys'] } // through LazyJavaClassMemberScope@10
-    functions('setFocusTraversalKeysEnabled': Name@963) = ArrayList@964[1] { JavaMethodDescriptor@965['setFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@10
-    functions('setFocusTraversalKeys_NoIDCheck': Name@966) = ArrayList@967[1] { JavaMethodDescriptor@968['setFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@10
-    functions('setFocusTraversalPolicy': Name@969) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setFocusTraversalPolicyProvider': Name@970) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setFocusable': Name@971) = ArrayList@972[1] { JavaMethodDescriptor@973['setFocusable'] } // through LazyJavaClassMemberScope@10
-    functions('setFocusableWindowState': Name@974) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setFont': Name@975) = ArrayList@976[1] { JavaMethodDescriptor@977['setFont'] } // through LazyJavaClassMemberScope@10
-    functions('setForeground': Name@978) = ArrayList@979[1] { JavaMethodDescriptor@980['setForeground'] } // through LazyJavaClassMemberScope@10
-    functions('setGlassPane': Name@981) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setGraphicsConfiguration': Name@982) = ArrayList@983[1] { JavaMethodDescriptor@984['setGraphicsConfiguration'] } // through LazyJavaClassMemberScope@10
-    functions('setIconImage': Name@985) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setIconImages': Name@986) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setIgnoreRepaint': Name@987) = ArrayList@988[1] { JavaMethodDescriptor@989['setIgnoreRepaint'] } // through LazyJavaClassMemberScope@10
-    functions('setJMenuBar': Name@990) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setLayeredPane': Name@991) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setLayout': Name@992) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setLocale': Name@993) = ArrayList@994[1] { JavaMethodDescriptor@995['setLocale'] } // through LazyJavaClassMemberScope@10
-    functions('setLocation': Name@996) = ArrayList@997[2] { JavaMethodDescriptor@998['setLocation'], JavaMethodDescriptor@999['setLocation'] } // through LazyJavaClassMemberScope@10
-    functions('setLocationByPlatform': Name@1000) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setLocationRelativeTo': Name@1001) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setMaximizedBounds': Name@1002) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setMaximumSize': Name@1003) = ArrayList@1004[1] { JavaMethodDescriptor@1005['setMaximumSize'] } // through LazyJavaClassMemberScope@10
-    functions('setMenuBar': Name@1006) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setMinimumSize': Name@1007) = ArrayList@1008[1] { JavaMethodDescriptor@1009['setMinimumSize'] } // through LazyJavaClassMemberScope@10
-    functions('setModalBlocked': Name@1010) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setModalExclusionType': Name@1011) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setName': Name@1012) = ArrayList@1013[1] { JavaMethodDescriptor@1014['setName'] } // through LazyJavaClassMemberScope@10
-    functions('setOpacity': Name@1015) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setPreferredSize': Name@1016) = ArrayList@1017[1] { JavaMethodDescriptor@1018['setPreferredSize'] } // through LazyJavaClassMemberScope@10
-    functions('setResizable': Name@1019) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setRootPane': Name@1020) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setRootPaneCheckingEnabled': Name@1021) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setShape': Name@1022) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setSize': Name@1023) = ArrayList@1024[2] { JavaMethodDescriptor@1025['setSize'], JavaMethodDescriptor@1026['setSize'] } // through LazyJavaClassMemberScope@10
-    functions('setState': Name@1027) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setTemporaryLostComponent': Name@1028) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setTitle': Name@1029) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setTransferHandler': Name@1030) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setType': Name@1031) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setUndecorated': Name@1032) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('setVisible': Name@1033) = ArrayList@1034[1] { JavaMethodDescriptor@1035['setVisible'] } // through LazyJavaClassMemberScope@10
-    functions('setWarningString': Name@1036) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('show': Name@1037) = ArrayList@1038[2] { JavaMethodDescriptor@1039['show'], JavaMethodDescriptor@1040['show'] } // through LazyJavaClassMemberScope@10
-    functions('size': Name@1041) = ArrayList@1042[1] { JavaMethodDescriptor@1043['size'] } // through LazyJavaClassMemberScope@10
-    functions('startLWModal': Name@1044) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('stopLWModal': Name@1045) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('subtractAndApplyShape': Name@1046) = ArrayList@1047[1] { JavaMethodDescriptor@1048['subtractAndApplyShape'] } // through LazyJavaClassMemberScope@10
-    functions('subtractAndApplyShapeBelowMe': Name@1049) = ArrayList@1050[1] { JavaMethodDescriptor@1051['subtractAndApplyShapeBelowMe'] } // through LazyJavaClassMemberScope@10
-    functions('toBack': Name@1052) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('toBack_NoClientCode': Name@1053) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('toFront': Name@1054) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('toFront_NoClientCode': Name@1055) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('toString': Name@1056) = ArrayList@1057[1] { JavaMethodDescriptor@1058['toString'] } // through LazyJavaClassMemberScope@10
-    functions('transferFocus': Name@1059) = ArrayList@1060[2] { JavaMethodDescriptor@1061['transferFocus'], JavaMethodDescriptor@1062['transferFocus'] } // through LazyJavaClassMemberScope@10
-    functions('transferFocusBackward': Name@1063) = ArrayList@1064[2] { JavaMethodDescriptor@1065['transferFocusBackward'], JavaMethodDescriptor@1066['transferFocusBackward'] } // through LazyJavaClassMemberScope@10
-    functions('transferFocusDownCycle': Name@1067) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('transferFocusUpCycle': Name@1068) = ArrayList@1069[1] { JavaMethodDescriptor@1070['transferFocusUpCycle'] } // through LazyJavaClassMemberScope@10
-    functions('update': Name@1071) = ArrayList@1072[1] { JavaMethodDescriptor@1073['update'] } // through LazyJavaClassMemberScope@10
-    functions('updateChildrenBlocking': Name@1074) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('updateCursorImmediately': Name@1075) = ArrayList@1076[1] { JavaMethodDescriptor@1077['updateCursorImmediately'] } // through LazyJavaClassMemberScope@10
-    functions('updateGraphicsData': Name@1078) = ArrayList@1079[1] { JavaMethodDescriptor@1080['updateGraphicsData'] } // through LazyJavaClassMemberScope@10
-    functions('updateWindow': Name@1081) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('updateZOrder': Name@1082) = ArrayList@1083[1] { JavaMethodDescriptor@1084['updateZOrder'] } // through LazyJavaClassMemberScope@10
-    functions('validate': Name@1085) = ArrayList@1086[1] { JavaMethodDescriptor@1087['validate'] } // through LazyJavaClassMemberScope@10
-    functions('validateTree': Name@1088) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('validateUnconditionally': Name@1089) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    functions('writeObject': Name@1091) = ArrayList@1092[1] { JavaMethodDescriptor@1093['writeObject'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@1094 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@1095 // through LazyJavaClassMemberScope@10
-    nestedClasses('BaselineResizeBehavior': Name@1096) = LazyJavaClassDescriptor@2['BaselineResizeBehavior'] // through LazyJavaClassMemberScope@10
-    properties('acc': Name@1097) = ArrayList@1098[1] { JavaPropertyDescriptor@1099['acc'] } // through LazyJavaClassMemberScope@10
-    properties('accessibleContext': Name@1100) = ArrayList@1101[1] { JavaPropertyDescriptor@1102['accessibleContext'] } // through LazyJavaClassMemberScope@10
-    properties('alwaysOnTop': Name@1103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('anchor': Name@1104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('appContext': Name@1105) = ArrayList@1106[1] { JavaPropertyDescriptor@1107['appContext'] } // through LazyJavaClassMemberScope@10
-    properties('autoFocusTransferOnDisposal': Name@1108) = ArrayList@1109[1] { JavaPropertyDescriptor@1110['autoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@10
-    properties('autoRequestFocus': Name@1111) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('background': Name@1112) = ArrayList@1113[1] { JavaPropertyDescriptor@1114['background'] } // through LazyJavaClassMemberScope@10
-    properties('backgroundEraseDisabled': Name@1115) = ArrayList@1116[1] { JavaPropertyDescriptor@1117['backgroundEraseDisabled'] } // through LazyJavaClassMemberScope@10
-    properties('beforeFirstShow': Name@1118) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('boundsOp': Name@1119) = ArrayList@1120[1] { JavaPropertyDescriptor@1121['boundsOp'] } // through LazyJavaClassMemberScope@10
-    properties('bufferStrategy': Name@1122) = ArrayList@1123[1] { JavaPropertyDescriptor@1124['bufferStrategy'] } // through LazyJavaClassMemberScope@10
-    properties('changeSupport': Name@1125) = ArrayList@1126[1] { JavaPropertyDescriptor@1127['changeSupport'] } // through LazyJavaClassMemberScope@10
-    properties('coalescingEnabled': Name@1128) = ArrayList@1129[1] { JavaPropertyDescriptor@1130['coalescingEnabled'] } // through LazyJavaClassMemberScope@10
-    properties('component': Name@1131) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('componentListener': Name@1132) = ArrayList@1133[1] { JavaPropertyDescriptor@1134['componentListener'] } // through LazyJavaClassMemberScope@10
-    properties('componentOrientation': Name@1135) = ArrayList@1136[1] { JavaPropertyDescriptor@1137['componentOrientation'] } // through LazyJavaClassMemberScope@10
-    properties('componentSerializedDataVersion': Name@1138) = ArrayList@1139[1] { JavaPropertyDescriptor@1140['componentSerializedDataVersion'] } // through LazyJavaClassMemberScope@10
-    properties('compoundShape': Name@1141) = ArrayList@1142[1] { JavaPropertyDescriptor@1143['compoundShape'] } // through LazyJavaClassMemberScope@10
-    properties('containerListener': Name@1144) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('containerSerializedDataVersion': Name@1145) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('cursor': Name@1146) = ArrayList@1147[1] { JavaPropertyDescriptor@1148['cursor'] } // through LazyJavaClassMemberScope@10
-    properties('defaultCloseOperation': Name@1149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('descendantsCount': Name@1150) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('dispatcher': Name@1151) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('disposing': Name@1152) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('dropTarget': Name@1153) = ArrayList@1154[1] { JavaPropertyDescriptor@1155['dropTarget'] } // through LazyJavaClassMemberScope@10
-    properties('enabled': Name@1156) = ArrayList@1157[1] { JavaPropertyDescriptor@1158['enabled'] } // through LazyJavaClassMemberScope@10
-    properties('eventCache': Name@1159) = ArrayList@1160[1] { JavaPropertyDescriptor@1161['eventCache'] } // through LazyJavaClassMemberScope@10
-    properties('eventMask': Name@1162) = ArrayList@1163[1] { JavaPropertyDescriptor@1164['eventMask'] } // through LazyJavaClassMemberScope@10
-    properties('focusCycleRoot': Name@1165) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('focusListener': Name@1166) = ArrayList@1167[1] { JavaPropertyDescriptor@1168['focusListener'] } // through LazyJavaClassMemberScope@10
-    properties('focusMgr': Name@1169) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('focusTraversalKeys': Name@1170) = ArrayList@1171[1] { JavaPropertyDescriptor@1172['focusTraversalKeys'] } // through LazyJavaClassMemberScope@10
-    properties('focusTraversalKeysEnabled': Name@1173) = ArrayList@1174[1] { JavaPropertyDescriptor@1175['focusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@10
-    properties('focusTraversalPolicy': Name@1176) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('focusTraversalPolicyProvider': Name@1177) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('focusable': Name@1178) = ArrayList@1179[1] { JavaPropertyDescriptor@1180['focusable'] } // through LazyJavaClassMemberScope@10
-    properties('focusableWindowState': Name@1181) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('font': Name@1182) = ArrayList@1183[1] { JavaPropertyDescriptor@1184['font'] } // through LazyJavaClassMemberScope@10
-    properties('foreground': Name@1185) = ArrayList@1186[1] { JavaPropertyDescriptor@1187['foreground'] } // through LazyJavaClassMemberScope@10
-    properties('frameSerializedDataVersion': Name@1188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('graphicsConfig': Name@1189) = ArrayList@1190[1] { JavaPropertyDescriptor@1191['graphicsConfig'] } // through LazyJavaClassMemberScope@10
-    properties('height': Name@1192) = ArrayList@1193[1] { JavaPropertyDescriptor@1194['height'] } // through LazyJavaClassMemberScope@10
-    properties('hierarchyBoundsListener': Name@1195) = ArrayList@1196[1] { JavaPropertyDescriptor@1197['hierarchyBoundsListener'] } // through LazyJavaClassMemberScope@10
-    properties('hierarchyListener': Name@1198) = ArrayList@1199[1] { JavaPropertyDescriptor@1200['hierarchyListener'] } // through LazyJavaClassMemberScope@10
-    properties('icons': Name@1201) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('ignoreRepaint': Name@1202) = ArrayList@1203[1] { JavaPropertyDescriptor@1204['ignoreRepaint'] } // through LazyJavaClassMemberScope@10
-    properties('inputContext': Name@1205) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('inputContextLock': Name@1206) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('inputMethodListener': Name@1207) = ArrayList@1208[1] { JavaPropertyDescriptor@1209['inputMethodListener'] } // through LazyJavaClassMemberScope@10
-    properties('isAddNotifyComplete': Name@1210) = ArrayList@1211[1] { JavaPropertyDescriptor@1212['isAddNotifyComplete'] } // through LazyJavaClassMemberScope@10
-    properties('isFocusTraversableOverridden': Name@1213) = ArrayList@1214[1] { JavaPropertyDescriptor@1215['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@10
-    properties('isInShow': Name@1216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('isPacked': Name@1217) = ArrayList@1218[1] { JavaPropertyDescriptor@1219['isPacked'] } // through LazyJavaClassMemberScope@10
-    properties('isTrayIconWindow': Name@1220) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('keyListener': Name@1221) = ArrayList@1222[1] { JavaPropertyDescriptor@1223['keyListener'] } // through LazyJavaClassMemberScope@10
-    properties('layoutMgr': Name@1224) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('listeningBoundsChildren': Name@1225) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('listeningChildren': Name@1226) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('locale': Name@1227) = ArrayList@1228[1] { JavaPropertyDescriptor@1229['locale'] } // through LazyJavaClassMemberScope@10
-    properties('locationByPlatform': Name@1230) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('maxSize': Name@1231) = ArrayList@1232[1] { JavaPropertyDescriptor@1233['maxSize'] } // through LazyJavaClassMemberScope@10
-    properties('maxSizeSet': Name@1234) = ArrayList@1235[1] { JavaPropertyDescriptor@1236['maxSizeSet'] } // through LazyJavaClassMemberScope@10
-    properties('maximizedBounds': Name@1237) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('mbManagement': Name@1238) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('menuBar': Name@1239) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('minSize': Name@1240) = ArrayList@1241[1] { JavaPropertyDescriptor@1242['minSize'] } // through LazyJavaClassMemberScope@10
-    properties('minSizeSet': Name@1243) = ArrayList@1244[1] { JavaPropertyDescriptor@1245['minSizeSet'] } // through LazyJavaClassMemberScope@10
-    properties('mixingCutoutRegion': Name@1246) = ArrayList@1247[1] { JavaPropertyDescriptor@1248['mixingCutoutRegion'] } // through LazyJavaClassMemberScope@10
-    properties('modalAppContext': Name@1249) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('modalBlocker': Name@1250) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('modalComp': Name@1251) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('modalExclusionType': Name@1252) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('mouseListener': Name@1253) = ArrayList@1254[1] { JavaPropertyDescriptor@1255['mouseListener'] } // through LazyJavaClassMemberScope@10
-    properties('mouseMotionListener': Name@1256) = ArrayList@1257[1] { JavaPropertyDescriptor@1258['mouseMotionListener'] } // through LazyJavaClassMemberScope@10
-    properties('mouseWheelListener': Name@1259) = ArrayList@1260[1] { JavaPropertyDescriptor@1261['mouseWheelListener'] } // through LazyJavaClassMemberScope@10
-    properties('name': Name@1262) = ArrayList@1263[1] { JavaPropertyDescriptor@1264['name'] } // through LazyJavaClassMemberScope@10
-    properties('nameExplicitlySet': Name@1265) = ArrayList@1266[1] { JavaPropertyDescriptor@1267['nameExplicitlySet'] } // through LazyJavaClassMemberScope@10
-    properties('newEventsOnly': Name@1268) = ArrayList@1269[1] { JavaPropertyDescriptor@1270['newEventsOnly'] } // through LazyJavaClassMemberScope@10
-    properties('numOfHWComponents': Name@1271) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('numOfLWComponents': Name@1272) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('objectLock': Name@1273) = ArrayList@1274[1] { JavaPropertyDescriptor@1275['objectLock'] } // through LazyJavaClassMemberScope@10
-    properties('opacity': Name@1276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('ownedWindowList': Name@1277) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('ownedWindows': Name@1278) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('parent': Name@1279) = ArrayList@1280[1] { JavaPropertyDescriptor@1281['parent'] } // through LazyJavaClassMemberScope@10
-    properties('peer': Name@1282) = ArrayList@1283[1] { JavaPropertyDescriptor@1284['peer'] } // through LazyJavaClassMemberScope@10
-    properties('peerFont': Name@1285) = ArrayList@1286[1] { JavaPropertyDescriptor@1287['peerFont'] } // through LazyJavaClassMemberScope@10
-    properties('popups': Name@1288) = ArrayList@1289[1] { JavaPropertyDescriptor@1290['popups'] } // through LazyJavaClassMemberScope@10
-    properties('prefSize': Name@1291) = ArrayList@1292[1] { JavaPropertyDescriptor@1293['prefSize'] } // through LazyJavaClassMemberScope@10
-    properties('prefSizeSet': Name@1294) = ArrayList@1295[1] { JavaPropertyDescriptor@1296['prefSizeSet'] } // through LazyJavaClassMemberScope@10
-    properties('preserveBackgroundColor': Name@1297) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('printing': Name@1298) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('printingThreads': Name@1299) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('resizable': Name@1300) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('rootPane': Name@1301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('rootPaneCheckingEnabled': Name@1302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningAlignmentX': Name@1303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningAlignmentY': Name@1304) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningHeight': Name@1305) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningPointX': Name@1306) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningPointY': Name@1307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('securityWarningWidth': Name@1308) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('shape': Name@1309) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('showWithParent': Name@1310) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('state': Name@1311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('syncLWRequests': Name@1312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('temporaryLostComponent': Name@1313) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('title': Name@1314) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('transferHandler': Name@1315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('type': Name@1316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('undecorated': Name@1317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('valid': Name@1318) = ArrayList@1319[1] { JavaPropertyDescriptor@1320['valid'] } // through LazyJavaClassMemberScope@10
-    properties('visible': Name@1321) = ArrayList@1322[1] { JavaPropertyDescriptor@1323['visible'] } // through LazyJavaClassMemberScope@10
-    properties('warningString': Name@1324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('weakThis': Name@1325) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('width': Name@1326) = ArrayList@1327[1] { JavaPropertyDescriptor@1328['width'] } // through LazyJavaClassMemberScope@10
-    properties('windowClosingException': Name@1329) = ArrayList@1330[1] { JavaPropertyDescriptor@1331['windowClosingException'] } // through LazyJavaClassMemberScope@10
-    properties('windowFocusListener': Name@1332) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('windowListener': Name@1333) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('windowSerializedDataVersion': Name@1334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('windowStateListener': Name@1335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@10
-    properties('x': Name@1336) = ArrayList@1337[1] { JavaPropertyDescriptor@1338['x'] } // through LazyJavaClassMemberScope@10
-    properties('y': Name@1339) = ArrayList@1340[1] { JavaPropertyDescriptor@1341['y'] } // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@1342['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassDescriptor@1344['Container'] {
-    defaultType = JetTypeImpl@1345['Container']
-    functionTypeForSamInterface = null
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('action': Name@11) = ArrayList@1347[1] { JavaMethodDescriptor@1348['action'] } // through LazyJavaClassMemberScope@1346
-    functions('add': Name@1349) = ArrayList@1350[6] { JavaMethodDescriptor@1351['add'], JavaMethodDescriptor@1352['add'], JavaMethodDescriptor@1353['add'], ... } // through LazyJavaClassMemberScope@1346
-    functions('addComponentListener': Name@17) = ArrayList@1354[1] { JavaMethodDescriptor@1355['addComponentListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addContainerListener': Name@1356) = ArrayList@1357[1] { JavaMethodDescriptor@1358['addContainerListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addDelicately': Name@1359) = ArrayList@1360[1] { JavaMethodDescriptor@1361['addDelicately'] } // through LazyJavaClassMemberScope@1346
-    functions('addFocusListener': Name@22) = ArrayList@1362[1] { JavaMethodDescriptor@1363['addFocusListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addHierarchyBoundsListener': Name@25) = ArrayList@1364[1] { JavaMethodDescriptor@1365['addHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addHierarchyListener': Name@28) = ArrayList@1366[1] { JavaMethodDescriptor@1367['addHierarchyListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addImpl': Name@1368) = ArrayList@1369[1] { JavaMethodDescriptor@1370['addImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('addInputMethodListener': Name@32) = ArrayList@1371[1] { JavaMethodDescriptor@1372['addInputMethodListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addKeyListener': Name@35) = ArrayList@1373[1] { JavaMethodDescriptor@1374['addKeyListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addMouseListener': Name@38) = ArrayList@1375[1] { JavaMethodDescriptor@1376['addMouseListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addMouseMotionListener': Name@41) = ArrayList@1377[1] { JavaMethodDescriptor@1378['addMouseMotionListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addMouseWheelListener': Name@44) = ArrayList@1379[1] { JavaMethodDescriptor@1380['addMouseWheelListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addNotify': Name@1381) = ArrayList@1382[1] { JavaMethodDescriptor@1383['addNotify'] } // through LazyJavaClassMemberScope@1346
-    functions('addOwnedWindow': Name@50) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('addPropertyChangeListener': Name@1384) = ArrayList@1385[2] { JavaMethodDescriptor@1386['addPropertyChangeListener'], JavaMethodDescriptor@1387['addPropertyChangeListener'] } // through LazyJavaClassMemberScope@1346
-    functions('addToWindowList': Name@55) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('addWindowFocusListener': Name@56) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('addWindowListener': Name@57) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('addWindowStateListener': Name@58) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('adjustDecendantsOnParent': Name@1388) = ArrayList@1389[1] { JavaMethodDescriptor@1390['adjustDecendantsOnParent'] } // through LazyJavaClassMemberScope@1346
-    functions('adjustDescendants': Name@1391) = ArrayList@1392[1] { JavaMethodDescriptor@1393['adjustDescendants'] } // through LazyJavaClassMemberScope@1346
-    functions('adjustListeningChildren': Name@1394) = ArrayList@1395[1] { JavaMethodDescriptor@1396['adjustListeningChildren'] } // through LazyJavaClassMemberScope@1346
-    functions('adjustListeningChildrenOnParent': Name@62) = ArrayList@1397[1] { JavaMethodDescriptor@1398['adjustListeningChildrenOnParent'] } // through LazyJavaClassMemberScope@1346
-    functions('applyComponentOrientation': Name@1399) = ArrayList@1400[1] { JavaMethodDescriptor@1401['applyComponentOrientation'] } // through LazyJavaClassMemberScope@1346
-    functions('applyCompoundShape': Name@68) = ArrayList@1402[1] { JavaMethodDescriptor@1403['applyCompoundShape'] } // through LazyJavaClassMemberScope@1346
-    functions('applyCurrentShape': Name@71) = ArrayList@1404[1] { JavaMethodDescriptor@1405['applyCurrentShape'] } // through LazyJavaClassMemberScope@1346
-    functions('applyCurrentShapeBelowMe': Name@74) = ArrayList@1406[1] { JavaMethodDescriptor@1407['applyCurrentShapeBelowMe'] } // through LazyJavaClassMemberScope@1346
-    functions('applyResourceBundle': Name@77) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('areBoundsValid': Name@78) = ArrayList@1408[1] { JavaMethodDescriptor@1409['areBoundsValid'] } // through LazyJavaClassMemberScope@1346
-    functions('areFocusTraversalKeysSet': Name@1410) = ArrayList@1411[1] { JavaMethodDescriptor@1412['areFocusTraversalKeysSet'] } // through LazyJavaClassMemberScope@1346
-    functions('areInputMethodsEnabled': Name@84) = ArrayList@1413[1] { JavaMethodDescriptor@1414['areInputMethodsEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('autoProcessMouseWheel': Name@87) = ArrayList@1415[1] { JavaMethodDescriptor@1416['autoProcessMouseWheel'] } // through LazyJavaClassMemberScope@1346
-    functions('bounds': Name@90) = ArrayList@1417[1] { JavaMethodDescriptor@1418['bounds'] } // through LazyJavaClassMemberScope@1346
-    functions('calculateCurrentShape': Name@93) = ArrayList@1419[1] { JavaMethodDescriptor@1420['calculateCurrentShape'] } // through LazyJavaClassMemberScope@1346
-    functions('calculateSecurityWarningPosition': Name@96) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('canBeFocusOwner': Name@97) = ArrayList@1421[1] { JavaMethodDescriptor@1422['canBeFocusOwner'] } // through LazyJavaClassMemberScope@1346
-    functions('canBeFocusOwnerRecursively': Name@100) = ArrayList@1423[1] { JavaMethodDescriptor@1424['canBeFocusOwnerRecursively'] } // through LazyJavaClassMemberScope@1346
-    functions('canContainFocusOwner': Name@1425) = ArrayList@1426[1] { JavaMethodDescriptor@1427['canContainFocusOwner'] } // through LazyJavaClassMemberScope@1346
-    functions('checkAddToSelf': Name@1428) = ArrayList@1429[1] { JavaMethodDescriptor@1430['checkAddToSelf'] } // through LazyJavaClassMemberScope@1346
-    functions('checkAdding': Name@1431) = ArrayList@1432[1] { JavaMethodDescriptor@1433['checkAdding'] } // through LazyJavaClassMemberScope@1346
-    functions('checkCoalescing': Name@106) = ArrayList@1434[1] { JavaMethodDescriptor@1435['checkCoalescing'] } // through LazyJavaClassMemberScope@1346
-    functions('checkGD': Name@1436) = ArrayList@1437[1] { JavaMethodDescriptor@1438['checkGD'] } // through LazyJavaClassMemberScope@1346
-    functions('checkImage': Name@112) = ArrayList@1439[2] { JavaMethodDescriptor@1440['checkImage'], JavaMethodDescriptor@1441['checkImage'] } // through LazyJavaClassMemberScope@1346
-    functions('checkNotAWindow': Name@1442) = ArrayList@1443[1] { JavaMethodDescriptor@1444['checkNotAWindow'] } // through LazyJavaClassMemberScope@1346
-    functions('checkTreeLock': Name@117) = ArrayList@1445[1] { JavaMethodDescriptor@1446['checkTreeLock'] } // through LazyJavaClassMemberScope@1346
-    functions('checkWindowClosingException': Name@120) = ArrayList@1447[1] { JavaMethodDescriptor@1448['checkWindowClosingException'] } // through LazyJavaClassMemberScope@1346
-    functions('clearCurrentFocusCycleRootOnHide': Name@1449) = ArrayList@1450[1] { JavaMethodDescriptor@1451['clearCurrentFocusCycleRootOnHide'] } // through LazyJavaClassMemberScope@1346
-    functions('clearMostRecentFocusOwnerOnHide': Name@1452) = ArrayList@1453[1] { JavaMethodDescriptor@1454['clearMostRecentFocusOwnerOnHide'] } // through LazyJavaClassMemberScope@1346
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('closeSplashScreen': Name@130) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('coalesceEvents': Name@131) = ArrayList@1455[1] { JavaMethodDescriptor@1456['coalesceEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('connectOwnedWindow': Name@134) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('constructComponentName': Name@135) = ArrayList@1457[1] { JavaMethodDescriptor@1458['constructComponentName'] } // through LazyJavaClassMemberScope@1346
-    functions('contains': Name@138) = ArrayList@1459[2] { JavaMethodDescriptor@1460['contains'], JavaMethodDescriptor@1461['contains'] } // through LazyJavaClassMemberScope@1346
-    functions('containsFocus': Name@1462) = ArrayList@1463[1] { JavaMethodDescriptor@1464['containsFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('countComponents': Name@1465) = ArrayList@1466[1] { JavaMethodDescriptor@1467['countComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('countHierarchyMembers': Name@1468) = ArrayList@1469[1] { JavaMethodDescriptor@1470['countHierarchyMembers'] } // through LazyJavaClassMemberScope@1346
-    functions('createBufferStrategy': Name@149) = ArrayList@1471[2] { JavaMethodDescriptor@1472['createBufferStrategy'], JavaMethodDescriptor@1473['createBufferStrategy'] } // through LazyJavaClassMemberScope@1346
-    functions('createChildHierarchyEvents': Name@1474) = ArrayList@1475[1] { JavaMethodDescriptor@1476['createChildHierarchyEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('createHierarchyEvents': Name@1477) = ArrayList@1478[1] { JavaMethodDescriptor@1479['createHierarchyEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('createImage': Name@157) = ArrayList@1480[2] { JavaMethodDescriptor@1481['createImage'], JavaMethodDescriptor@1482['createImage'] } // through LazyJavaClassMemberScope@1346
-    functions('createRootPane': Name@161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('createVolatileImage': Name@162) = ArrayList@1483[2] { JavaMethodDescriptor@1484['createVolatileImage'], JavaMethodDescriptor@1485['createVolatileImage'] } // through LazyJavaClassMemberScope@1346
-    functions('decreaseComponentCount': Name@1486) = ArrayList@1487[1] { JavaMethodDescriptor@1488['decreaseComponentCount'] } // through LazyJavaClassMemberScope@1346
-    functions('deliverEvent': Name@1489) = ArrayList@1490[1] { JavaMethodDescriptor@1491['deliverEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('deliverMouseWheelToAncestor': Name@170) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('deserializeResources': Name@171) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('disable': Name@172) = ArrayList@1492[1] { JavaMethodDescriptor@1493['disable'] } // through LazyJavaClassMemberScope@1346
-    functions('disableEvents': Name@175) = ArrayList@1494[1] { JavaMethodDescriptor@1495['disableEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('dispatchEvent': Name@178) = ArrayList@1496[1] { JavaMethodDescriptor@1497['dispatchEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('dispatchEventImpl': Name@1498) = ArrayList@1499[1] { JavaMethodDescriptor@1500['dispatchEventImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('dispatchEventToSelf': Name@1501) = ArrayList@1502[1] { JavaMethodDescriptor@1503['dispatchEventToSelf'] } // through LazyJavaClassMemberScope@1346
-    functions('dispatchMouseWheelToAncestor': Name@185) = ArrayList@1504[1] { JavaMethodDescriptor@1505['dispatchMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@1346
-    functions('dispose': Name@188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('disposeImpl': Name@189) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('doDispose': Name@190) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('doLayout': Name@1506) = ArrayList@1507[1] { JavaMethodDescriptor@1508['doLayout'] } // through LazyJavaClassMemberScope@1346
-    functions('doSwingSerialization': Name@194) = ArrayList@1509[1] { JavaMethodDescriptor@1510['doSwingSerialization'] } // through LazyJavaClassMemberScope@1346
-    functions('enable': Name@197) = ArrayList@1511[2] { JavaMethodDescriptor@1512['enable'], JavaMethodDescriptor@1513['enable'] } // through LazyJavaClassMemberScope@1346
-    functions('enableEvents': Name@201) = ArrayList@1514[1] { JavaMethodDescriptor@1515['enableEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('enableInputMethods': Name@204) = ArrayList@1516[1] { JavaMethodDescriptor@1517['enableInputMethods'] } // through LazyJavaClassMemberScope@1346
-    functions('equals': Name@207) = ArrayList@1518[1] { DeserializedSimpleFunctionDescriptor@1519['equals'] } // through LazyJavaClassMemberScope@1346
-    functions('eventEnabled': Name@1520) = ArrayList@1521[1] { JavaMethodDescriptor@1522['eventEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('eventTypeEnabled': Name@213) = ArrayList@1523[1] { JavaMethodDescriptor@1524['eventTypeEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('findComponentAt': Name@1525) = ArrayList@1526[3] { JavaMethodDescriptor@1527['findComponentAt'], JavaMethodDescriptor@1528['findComponentAt'], JavaMethodDescriptor@1529['findComponentAt'] } // through LazyJavaClassMemberScope@1346
-    functions('findComponentAtImpl': Name@1530) = ArrayList@1531[1] { JavaMethodDescriptor@1532['findComponentAtImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('findTraversalRoot': Name@1533) = ArrayList@1534[1] { JavaMethodDescriptor@1535['findTraversalRoot'] } // through LazyJavaClassMemberScope@1346
-    functions('findUnderMouseInWindow': Name@220) = ArrayList@1536[1] { JavaMethodDescriptor@1537['findUnderMouseInWindow'] } // through LazyJavaClassMemberScope@1346
-    functions('firePropertyChange': Name@223) = ArrayList@1538[9] { JavaMethodDescriptor@1539['firePropertyChange'], JavaMethodDescriptor@1540['firePropertyChange'], JavaMethodDescriptor@1541['firePropertyChange'], ... } // through LazyJavaClassMemberScope@1346
-    functions('frameInit': Name@228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getAccessControlContext': Name@229) = ArrayList@1542[1] { JavaMethodDescriptor@1543['getAccessControlContext'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleAt': Name@1544) = ArrayList@1545[1] { JavaMethodDescriptor@1546['getAccessibleAt'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleChild': Name@1547) = ArrayList@1548[1] { JavaMethodDescriptor@1549['getAccessibleChild'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleChildrenCount': Name@1550) = ArrayList@1551[1] { JavaMethodDescriptor@1552['getAccessibleChildrenCount'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleContext': Name@235) = ArrayList@1553[1] { JavaMethodDescriptor@1554['getAccessibleContext'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleIndexInParent': Name@238) = ArrayList@1555[1] { JavaMethodDescriptor@1556['getAccessibleIndexInParent'] } // through LazyJavaClassMemberScope@1346
-    functions('getAccessibleStateSet': Name@241) = ArrayList@1557[1] { JavaMethodDescriptor@1558['getAccessibleStateSet'] } // through LazyJavaClassMemberScope@1346
-    functions('getAlignmentX': Name@1559) = ArrayList@1560[1] { JavaMethodDescriptor@1561['getAlignmentX'] } // through LazyJavaClassMemberScope@1346
-    functions('getAlignmentY': Name@1562) = ArrayList@1563[1] { JavaMethodDescriptor@1564['getAlignmentY'] } // through LazyJavaClassMemberScope@1346
-    functions('getAppliedShape': Name@250) = ArrayList@1565[1] { JavaMethodDescriptor@1566['getAppliedShape'] } // through LazyJavaClassMemberScope@1346
-    functions('getBackBuffer': Name@253) = ArrayList@1567[1] { JavaMethodDescriptor@1568['getBackBuffer'] } // through LazyJavaClassMemberScope@1346
-    functions('getBackground': Name@256) = ArrayList@1569[1] { JavaMethodDescriptor@1570['getBackground'] } // through LazyJavaClassMemberScope@1346
-    functions('getBaseline': Name@259) = ArrayList@1571[1] { JavaMethodDescriptor@1572['getBaseline'] } // through LazyJavaClassMemberScope@1346
-    functions('getBaselineResizeBehavior': Name@262) = ArrayList@1573[1] { JavaMethodDescriptor@1574['getBaselineResizeBehavior'] } // through LazyJavaClassMemberScope@1346
-    functions('getBottommostComponentIndex': Name@1575) = ArrayList@1576[1] { JavaMethodDescriptor@1577['getBottommostComponentIndex'] } // through LazyJavaClassMemberScope@1346
-    functions('getBounds': Name@266) = ArrayList@1578[2] { JavaMethodDescriptor@1579['getBounds'], JavaMethodDescriptor@1580['getBounds'] } // through LazyJavaClassMemberScope@1346
-    functions('getBoundsOp': Name@270) = ArrayList@1581[1] { JavaMethodDescriptor@1582['getBoundsOp'] } // through LazyJavaClassMemberScope@1346
-    functions('getBufferStrategy': Name@273) = ArrayList@1583[1] { JavaMethodDescriptor@1584['getBufferStrategy'] } // through LazyJavaClassMemberScope@1346
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getColorModel': Name@277) = ArrayList@1585[1] { JavaMethodDescriptor@1586['getColorModel'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponent': Name@1587) = ArrayList@1588[1] { JavaMethodDescriptor@1589['getComponent'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentAt': Name@1590) = ArrayList@1591[2] { JavaMethodDescriptor@1592['getComponentAt'], JavaMethodDescriptor@1593['getComponentAt'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentCount': Name@1594) = ArrayList@1595[1] { JavaMethodDescriptor@1596['getComponentCount'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentListeners': Name@286) = ArrayList@1597[1] { JavaMethodDescriptor@1598['getComponentListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentOrientation': Name@289) = ArrayList@1599[1] { JavaMethodDescriptor@1600['getComponentOrientation'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentZOrder': Name@1601) = ArrayList@1602[1] { JavaMethodDescriptor@1603['getComponentZOrder'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponents': Name@1604) = ArrayList@1605[1] { JavaMethodDescriptor@1606['getComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponentsSync': Name@1607) = ArrayList@1608[1] { JavaMethodDescriptor@1609['getComponentsSync'] } // through LazyJavaClassMemberScope@1346
-    functions('getComponents_NoClientCode': Name@1610) = ArrayList@1611[1] { JavaMethodDescriptor@1612['getComponents_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getContainer': Name@296) = ArrayList@1613[1] { JavaMethodDescriptor@1614['getContainer'] } // through LazyJavaClassMemberScope@1346
-    functions('getContainerListeners': Name@1615) = ArrayList@1616[1] { JavaMethodDescriptor@1617['getContainerListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getContainingWindow': Name@300) = ArrayList@1618[1] { JavaMethodDescriptor@1619['getContainingWindow'] } // through LazyJavaClassMemberScope@1346
-    functions('getContentPane': Name@303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getCursor': Name@304) = ArrayList@1620[1] { JavaMethodDescriptor@1621['getCursor'] } // through LazyJavaClassMemberScope@1346
-    functions('getCursorType': Name@307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getCursor_NoClientCode': Name@308) = ArrayList@1622[1] { JavaMethodDescriptor@1623['getCursor_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getDefaultCloseOperation': Name@311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getDocumentRoot': Name@312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getDropTarget': Name@313) = ArrayList@1624[1] { JavaMethodDescriptor@1625['getDropTarget'] } // through LazyJavaClassMemberScope@1346
-    functions('getDropTargetEventTarget': Name@1626) = ArrayList@1627[1] { JavaMethodDescriptor@1628['getDropTargetEventTarget'] } // through LazyJavaClassMemberScope@1346
-    functions('getExtendedState': Name@317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getFocusCycleRootAncestor': Name@318) = ArrayList@1629[1] { JavaMethodDescriptor@1630['getFocusCycleRootAncestor'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusListeners': Name@321) = ArrayList@1631[1] { JavaMethodDescriptor@1632['getFocusListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusOwner': Name@324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getFocusTraversalKeys': Name@1633) = ArrayList@1634[1] { JavaMethodDescriptor@1635['getFocusTraversalKeys'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusTraversalKeysEnabled': Name@328) = ArrayList@1636[1] { JavaMethodDescriptor@1637['getFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusTraversalKeys_NoIDCheck': Name@331) = ArrayList@1638[1] { JavaMethodDescriptor@1639['getFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusTraversalPolicy': Name@1640) = ArrayList@1641[1] { JavaMethodDescriptor@1642['getFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@1346
-    functions('getFocusableWindowState': Name@335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getFont': Name@336) = ArrayList@1643[1] { JavaMethodDescriptor@1644['getFont'] } // through LazyJavaClassMemberScope@1346
-    functions('getFontMetrics': Name@339) = ArrayList@1645[1] { JavaMethodDescriptor@1646['getFontMetrics'] } // through LazyJavaClassMemberScope@1346
-    functions('getFont_NoClientCode': Name@342) = ArrayList@1647[1] { JavaMethodDescriptor@1648['getFont_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getForeground': Name@345) = ArrayList@1649[1] { JavaMethodDescriptor@1650['getForeground'] } // through LazyJavaClassMemberScope@1346
-    functions('getGlassPane': Name@348) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getGraphics': Name@349) = ArrayList@1651[1] { JavaMethodDescriptor@1652['getGraphics'] } // through LazyJavaClassMemberScope@1346
-    functions('getGraphicsConfiguration': Name@352) = ArrayList@1653[1] { JavaMethodDescriptor@1654['getGraphicsConfiguration'] } // through LazyJavaClassMemberScope@1346
-    functions('getGraphicsConfiguration_NoClientCode': Name@355) = ArrayList@1655[1] { JavaMethodDescriptor@1656['getGraphicsConfiguration_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getGraphics_NoClientCode': Name@358) = ArrayList@1657[1] { JavaMethodDescriptor@1658['getGraphics_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getHWPeerAboveMe': Name@361) = ArrayList@1659[1] { JavaMethodDescriptor@1660['getHWPeerAboveMe'] } // through LazyJavaClassMemberScope@1346
-    functions('getHeavyweightContainer': Name@1661) = ArrayList@1662[1] { JavaMethodDescriptor@1663['getHeavyweightContainer'] } // through LazyJavaClassMemberScope@1346
-    functions('getHeight': Name@365) = ArrayList@1664[1] { JavaMethodDescriptor@1665['getHeight'] } // through LazyJavaClassMemberScope@1346
-    functions('getHierarchyBoundsListeners': Name@368) = ArrayList@1666[1] { JavaMethodDescriptor@1667['getHierarchyBoundsListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getHierarchyListeners': Name@371) = ArrayList@1668[1] { JavaMethodDescriptor@1669['getHierarchyListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getIconImage': Name@374) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getIconImages': Name@375) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getIgnoreRepaint': Name@376) = ArrayList@1670[1] { JavaMethodDescriptor@1671['getIgnoreRepaint'] } // through LazyJavaClassMemberScope@1346
-    functions('getInputContext': Name@379) = ArrayList@1672[1] { JavaMethodDescriptor@1673['getInputContext'] } // through LazyJavaClassMemberScope@1346
-    functions('getInputMethodListeners': Name@382) = ArrayList@1674[1] { JavaMethodDescriptor@1675['getInputMethodListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getInputMethodRequests': Name@385) = ArrayList@1676[1] { JavaMethodDescriptor@1677['getInputMethodRequests'] } // through LazyJavaClassMemberScope@1346
-    functions('getInsets': Name@1678) = ArrayList@1679[1] { JavaMethodDescriptor@1680['getInsets'] } // through LazyJavaClassMemberScope@1346
-    functions('getInsets_NoClientCode': Name@389) = ArrayList@1681[1] { JavaMethodDescriptor@1682['getInsets_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getJMenuBar': Name@392) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getKeyListeners': Name@393) = ArrayList@1683[1] { JavaMethodDescriptor@1684['getKeyListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getLayeredPane': Name@396) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getLayout': Name@1685) = ArrayList@1686[1] { JavaMethodDescriptor@1687['getLayout'] } // through LazyJavaClassMemberScope@1346
-    functions('getListeners': Name@1688) = ArrayList@1689[1] { JavaMethodDescriptor@1690['getListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getListenersCount': Name@1691) = ArrayList@1692[1] { JavaMethodDescriptor@1693['getListenersCount'] } // through LazyJavaClassMemberScope@1346
-    functions('getLocale': Name@402) = ArrayList@1694[1] { JavaMethodDescriptor@1695['getLocale'] } // through LazyJavaClassMemberScope@1346
-    functions('getLocation': Name@405) = ArrayList@1696[2] { JavaMethodDescriptor@1697['getLocation'], JavaMethodDescriptor@1698['getLocation'] } // through LazyJavaClassMemberScope@1346
-    functions('getLocationOnScreen': Name@409) = ArrayList@1699[1] { JavaMethodDescriptor@1700['getLocationOnScreen'] } // through LazyJavaClassMemberScope@1346
-    functions('getLocationOnScreen_NoTreeLock': Name@412) = ArrayList@1701[1] { JavaMethodDescriptor@1702['getLocationOnScreen_NoTreeLock'] } // through LazyJavaClassMemberScope@1346
-    functions('getLocationOnWindow': Name@415) = ArrayList@1703[1] { JavaMethodDescriptor@1704['getLocationOnWindow'] } // through LazyJavaClassMemberScope@1346
-    functions('getMaximizedBounds': Name@418) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getMaximumSize': Name@1705) = ArrayList@1706[1] { JavaMethodDescriptor@1707['getMaximumSize'] } // through LazyJavaClassMemberScope@1346
-    functions('getMenuBar': Name@422) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getMinimumSize': Name@1708) = ArrayList@1709[1] { JavaMethodDescriptor@1710['getMinimumSize'] } // through LazyJavaClassMemberScope@1346
-    functions('getModalBlocker': Name@426) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getModalExclusionType': Name@427) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getMostRecentFocusOwner': Name@428) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getMouseEventTarget': Name@1711) = ArrayList@1712[3] { JavaMethodDescriptor@1713['getMouseEventTarget'], JavaMethodDescriptor@1714['getMouseEventTarget'], SamAdapterFunctionDescriptor@1715['getMouseEventTarget'] } // through LazyJavaClassMemberScope@1346
-    functions('getMouseEventTargetImpl': Name@1716) = ArrayList@1717[2] { JavaMethodDescriptor@1718['getMouseEventTargetImpl'], SamAdapterFunctionDescriptor@1719['getMouseEventTargetImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('getMouseListeners': Name@431) = ArrayList@1720[1] { JavaMethodDescriptor@1721['getMouseListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getMouseMotionListeners': Name@434) = ArrayList@1722[1] { JavaMethodDescriptor@1723['getMouseMotionListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getMousePosition': Name@1724) = ArrayList@1725[2] { JavaMethodDescriptor@1726['getMousePosition'], JavaMethodDescriptor@1727['getMousePosition'] } // through LazyJavaClassMemberScope@1346
-    functions('getMouseWheelListeners': Name@440) = ArrayList@1728[1] { JavaMethodDescriptor@1729['getMouseWheelListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getName': Name@443) = ArrayList@1730[1] { JavaMethodDescriptor@1731['getName'] } // through LazyJavaClassMemberScope@1346
-    functions('getNativeContainer': Name@446) = ArrayList@1732[1] { JavaMethodDescriptor@1733['getNativeContainer'] } // through LazyJavaClassMemberScope@1346
-    functions('getNextFocusCandidate': Name@449) = ArrayList@1734[1] { JavaMethodDescriptor@1735['getNextFocusCandidate'] } // through LazyJavaClassMemberScope@1346
-    functions('getNormalShape': Name@452) = ArrayList@1736[1] { JavaMethodDescriptor@1737['getNormalShape'] } // through LazyJavaClassMemberScope@1346
-    functions('getObjectLock': Name@455) = ArrayList@1738[1] { JavaMethodDescriptor@1739['getObjectLock'] } // through LazyJavaClassMemberScope@1346
-    functions('getOpacity': Name@458) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getOpaqueShape': Name@1740) = ArrayList@1741[1] { JavaMethodDescriptor@1742['getOpaqueShape'] } // through LazyJavaClassMemberScope@1346
-    functions('getOwnedWindows': Name@462) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getOwnedWindows_NoClientCode': Name@463) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getOwner': Name@464) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getOwner_NoClientCode': Name@465) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getParent': Name@466) = ArrayList@1743[1] { JavaMethodDescriptor@1744['getParent'] } // through LazyJavaClassMemberScope@1346
-    functions('getParent_NoClientCode': Name@469) = ArrayList@1745[1] { JavaMethodDescriptor@1746['getParent_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('getPeer': Name@472) = ArrayList@1747[1] { JavaMethodDescriptor@1748['getPeer'] } // through LazyJavaClassMemberScope@1346
-    functions('getPreferredSize': Name@1749) = ArrayList@1750[1] { JavaMethodDescriptor@1751['getPreferredSize'] } // through LazyJavaClassMemberScope@1346
-    functions('getPropertyChangeListeners': Name@478) = ArrayList@1752[2] { JavaMethodDescriptor@1753['getPropertyChangeListeners'], JavaMethodDescriptor@1754['getPropertyChangeListeners'] } // through LazyJavaClassMemberScope@1346
-    functions('getRootPane': Name@482) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getShape': Name@483) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getSiblingIndexAbove': Name@484) = ArrayList@1755[1] { JavaMethodDescriptor@1756['getSiblingIndexAbove'] } // through LazyJavaClassMemberScope@1346
-    functions('getSiblingIndexBelow': Name@487) = ArrayList@1757[1] { JavaMethodDescriptor@1758['getSiblingIndexBelow'] } // through LazyJavaClassMemberScope@1346
-    functions('getSize': Name@490) = ArrayList@1759[2] { JavaMethodDescriptor@1760['getSize'], JavaMethodDescriptor@1761['getSize'] } // through LazyJavaClassMemberScope@1346
-    functions('getState': Name@494) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getTemporaryLostComponent': Name@495) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getTitle': Name@496) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getToolkit': Name@497) = ArrayList@1762[1] { JavaMethodDescriptor@1763['getToolkit'] } // through LazyJavaClassMemberScope@1346
-    functions('getToolkitImpl': Name@500) = ArrayList@1764[1] { JavaMethodDescriptor@1765['getToolkitImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('getTopmostComponentIndex': Name@1766) = ArrayList@1767[1] { JavaMethodDescriptor@1768['getTopmostComponentIndex'] } // through LazyJavaClassMemberScope@1346
-    functions('getTransferHandler': Name@504) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getTraversalRoot': Name@1769) = ArrayList@1770[1] { JavaMethodDescriptor@1771['getTraversalRoot'] } // through LazyJavaClassMemberScope@1346
-    functions('getTreeLock': Name@508) = ArrayList@1772[1] { JavaMethodDescriptor@1773['getTreeLock'] } // through LazyJavaClassMemberScope@1346
-    functions('getType': Name@511) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getWarningString': Name@512) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getWidth': Name@513) = ArrayList@1774[1] { JavaMethodDescriptor@1775['getWidth'] } // through LazyJavaClassMemberScope@1346
-    functions('getWindowFocusListeners': Name@516) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getWindowListeners': Name@517) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getWindowStateListeners': Name@518) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('getX': Name@519) = ArrayList@1776[1] { JavaMethodDescriptor@1777['getX'] } // through LazyJavaClassMemberScope@1346
-    functions('getY': Name@522) = ArrayList@1778[1] { JavaMethodDescriptor@1779['getY'] } // through LazyJavaClassMemberScope@1346
-    functions('gotFocus': Name@525) = ArrayList@1780[1] { JavaMethodDescriptor@1781['gotFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('handleEvent': Name@528) = ArrayList@1782[1] { JavaMethodDescriptor@1783['handleEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('hasFocus': Name@531) = ArrayList@1784[1] { JavaMethodDescriptor@1785['hasFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('hasHeavyweightDescendants': Name@1786) = ArrayList@1787[1] { JavaMethodDescriptor@1788['hasHeavyweightDescendants'] } // through LazyJavaClassMemberScope@1346
-    functions('hasLightweightDescendants': Name@1789) = ArrayList@1790[1] { JavaMethodDescriptor@1791['hasLightweightDescendants'] } // through LazyJavaClassMemberScope@1346
-    functions('hashCode': Name@536) = ArrayList@1792[1] { DeserializedSimpleFunctionDescriptor@1793['hashCode'] } // through LazyJavaClassMemberScope@1346
-    functions('hide': Name@539) = ArrayList@1794[1] { JavaMethodDescriptor@1795['hide'] } // through LazyJavaClassMemberScope@1346
-    functions('imageUpdate': Name@542) = ArrayList@1796[1] { JavaMethodDescriptor@1797['imageUpdate'] } // through LazyJavaClassMemberScope@1346
-    functions('increaseComponentCount': Name@1798) = ArrayList@1799[1] { JavaMethodDescriptor@1800['increaseComponentCount'] } // through LazyJavaClassMemberScope@1346
-    functions('init': Name@546) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('initDeserializedWindow': Name@547) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('initGC': Name@548) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('initializeFocusTraversalKeys': Name@1801) = ArrayList@1802[1] { JavaMethodDescriptor@1803['initializeFocusTraversalKeys'] } // through LazyJavaClassMemberScope@1346
-    functions('insets': Name@1804) = ArrayList@1805[1] { JavaMethodDescriptor@1806['insets'] } // through LazyJavaClassMemberScope@1346
-    functions('inside': Name@553) = ArrayList@1807[1] { JavaMethodDescriptor@1808['inside'] } // through LazyJavaClassMemberScope@1346
-    functions('invalidate': Name@1809) = ArrayList@1810[1] { JavaMethodDescriptor@1811['invalidate'] } // through LazyJavaClassMemberScope@1346
-    functions('invalidateIfValid': Name@559) = ArrayList@1812[1] { JavaMethodDescriptor@1813['invalidateIfValid'] } // through LazyJavaClassMemberScope@1346
-    functions('invalidateParent': Name@1814) = ArrayList@1815[1] { JavaMethodDescriptor@1816['invalidateParent'] } // through LazyJavaClassMemberScope@1346
-    functions('invalidateTree': Name@1817) = ArrayList@1818[1] { JavaMethodDescriptor@1819['invalidateTree'] } // through LazyJavaClassMemberScope@1346
-    functions('isActive': Name@566) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isAlwaysOnTop': Name@567) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isAlwaysOnTopSupported': Name@568) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isAncestorOf': Name@1820) = ArrayList@1821[1] { JavaMethodDescriptor@1822['isAncestorOf'] } // through LazyJavaClassMemberScope@1346
-    functions('isAutoFocusTransferOnDisposal': Name@570) = ArrayList@1823[1] { JavaMethodDescriptor@1824['isAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@1346
-    functions('isAutoRequestFocus': Name@573) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isBackgroundSet': Name@574) = ArrayList@1825[1] { JavaMethodDescriptor@1826['isBackgroundSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isCoalescingEnabled': Name@577) = ArrayList@1827[1] { JavaMethodDescriptor@1828['isCoalescingEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('isCursorSet': Name@580) = ArrayList@1829[1] { JavaMethodDescriptor@1830['isCursorSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isDisplayable': Name@583) = ArrayList@1831[1] { JavaMethodDescriptor@1832['isDisplayable'] } // through LazyJavaClassMemberScope@1346
-    functions('isDisposing': Name@586) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isDoubleBuffered': Name@587) = ArrayList@1833[1] { JavaMethodDescriptor@1834['isDoubleBuffered'] } // through LazyJavaClassMemberScope@1346
-    functions('isEnabled': Name@590) = ArrayList@1835[1] { JavaMethodDescriptor@1836['isEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('isEnabledImpl': Name@593) = ArrayList@1837[1] { JavaMethodDescriptor@1838['isEnabledImpl'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusCycleRoot': Name@1839) = ArrayList@1840[2] { JavaMethodDescriptor@1841['isFocusCycleRoot'], JavaMethodDescriptor@1842['isFocusCycleRoot'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusOwner': Name@599) = ArrayList@1843[1] { JavaMethodDescriptor@1844['isFocusOwner'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusTraversable': Name@602) = ArrayList@1845[1] { JavaMethodDescriptor@1846['isFocusTraversable'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusTraversableOverridden': Name@605) = ArrayList@1847[1] { JavaMethodDescriptor@1848['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusTraversalPolicyProvider': Name@1849) = ArrayList@1850[1] { JavaMethodDescriptor@1851['isFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusTraversalPolicySet': Name@1852) = ArrayList@1853[1] { JavaMethodDescriptor@1854['isFocusTraversalPolicySet'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusable': Name@610) = ArrayList@1855[1] { JavaMethodDescriptor@1856['isFocusable'] } // through LazyJavaClassMemberScope@1346
-    functions('isFocusableWindow': Name@613) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isFocused': Name@614) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isFontSet': Name@615) = ArrayList@1857[1] { JavaMethodDescriptor@1858['isFontSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isForegroundSet': Name@618) = ArrayList@1859[1] { JavaMethodDescriptor@1860['isForegroundSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isFrameStateSupported': Name@621) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isLightweight': Name@622) = ArrayList@1861[1] { JavaMethodDescriptor@1862['isLightweight'] } // through LazyJavaClassMemberScope@1346
-    functions('isLocationByPlatform': Name@625) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isMaximumSizeSet': Name@626) = ArrayList@1863[1] { JavaMethodDescriptor@1864['isMaximumSizeSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isMinimumSizeSet': Name@629) = ArrayList@1865[1] { JavaMethodDescriptor@1866['isMinimumSizeSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isMixingNeeded': Name@632) = ArrayList@1867[1] { JavaMethodDescriptor@1868['isMixingNeeded'] } // through LazyJavaClassMemberScope@1346
-    functions('isModalBlocked': Name@635) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isModalExcluded': Name@636) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isNonOpaqueForMixing': Name@637) = ArrayList@1869[1] { JavaMethodDescriptor@1870['isNonOpaqueForMixing'] } // through LazyJavaClassMemberScope@1346
-    functions('isOpaque': Name@640) = ArrayList@1871[1] { JavaMethodDescriptor@1872['isOpaque'] } // through LazyJavaClassMemberScope@1346
-    functions('isParentOf': Name@1873) = ArrayList@1874[1] { JavaMethodDescriptor@1875['isParentOf'] } // through LazyJavaClassMemberScope@1346
-    functions('isPreferredSizeSet': Name@644) = ArrayList@1876[1] { JavaMethodDescriptor@1877['isPreferredSizeSet'] } // through LazyJavaClassMemberScope@1346
-    functions('isRecursivelyVisible': Name@647) = ArrayList@1878[1] { JavaMethodDescriptor@1879['isRecursivelyVisible'] } // through LazyJavaClassMemberScope@1346
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@1880) = ArrayList@1881[1] { JavaMethodDescriptor@1882['isRecursivelyVisibleUpToHeavyweightContainer'] } // through LazyJavaClassMemberScope@1346
-    functions('isRequestFocusAccepted': Name@651) = ArrayList@1883[1] { JavaMethodDescriptor@1884['isRequestFocusAccepted'] } // through LazyJavaClassMemberScope@1346
-    functions('isResizable': Name@654) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isRootPaneCheckingEnabled': Name@655) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isSameOrAncestorOf': Name@1885) = ArrayList@1886[1] { JavaMethodDescriptor@1887['isSameOrAncestorOf'] } // through LazyJavaClassMemberScope@1346
-    functions('isShowing': Name@659) = ArrayList@1888[1] { JavaMethodDescriptor@1889['isShowing'] } // through LazyJavaClassMemberScope@1346
-    functions('isUndecorated': Name@662) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('isValid': Name@663) = ArrayList@1890[1] { JavaMethodDescriptor@1891['isValid'] } // through LazyJavaClassMemberScope@1346
-    functions('isValidateRoot': Name@1892) = ArrayList@1893[1] { JavaMethodDescriptor@1894['isValidateRoot'] } // through LazyJavaClassMemberScope@1346
-    functions('isVisible': Name@667) = ArrayList@1895[1] { JavaMethodDescriptor@1896['isVisible'] } // through LazyJavaClassMemberScope@1346
-    functions('isVisible_NoClientCode': Name@670) = ArrayList@1897[1] { JavaMethodDescriptor@1898['isVisible_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('keyDown': Name@673) = ArrayList@1899[1] { JavaMethodDescriptor@1900['keyDown'] } // through LazyJavaClassMemberScope@1346
-    functions('keyUp': Name@676) = ArrayList@1901[1] { JavaMethodDescriptor@1902['keyUp'] } // through LazyJavaClassMemberScope@1346
-    functions('layout': Name@1903) = ArrayList@1904[1] { JavaMethodDescriptor@1905['layout'] } // through LazyJavaClassMemberScope@1346
-    functions('lightweightPaint': Name@1906) = ArrayList@1907[1] { JavaMethodDescriptor@1908['lightweightPaint'] } // through LazyJavaClassMemberScope@1346
-    functions('lightweightPrint': Name@1909) = ArrayList@1910[1] { JavaMethodDescriptor@1911['lightweightPrint'] } // through LazyJavaClassMemberScope@1346
-    functions('list': Name@1912) = ArrayList@1913[5] { JavaMethodDescriptor@1914['list'], JavaMethodDescriptor@1915['list'], JavaMethodDescriptor@1916['list'], ... } // through LazyJavaClassMemberScope@1346
-    functions('locate': Name@1917) = ArrayList@1918[1] { JavaMethodDescriptor@1919['locate'] } // through LazyJavaClassMemberScope@1346
-    functions('location': Name@696) = ArrayList@1920[1] { JavaMethodDescriptor@1921['location'] } // through LazyJavaClassMemberScope@1346
-    functions('location_NoClientCode': Name@699) = ArrayList@1922[1] { JavaMethodDescriptor@1923['location_NoClientCode'] } // through LazyJavaClassMemberScope@1346
-    functions('lostFocus': Name@702) = ArrayList@1924[1] { JavaMethodDescriptor@1925['lostFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('minimumSize': Name@1926) = ArrayList@1927[1] { JavaMethodDescriptor@1928['minimumSize'] } // through LazyJavaClassMemberScope@1346
-    functions('mixOnHiding': Name@1929) = ArrayList@1930[1] { JavaMethodDescriptor@1931['mixOnHiding'] } // through LazyJavaClassMemberScope@1346
-    functions('mixOnReshaping': Name@1932) = ArrayList@1933[1] { JavaMethodDescriptor@1934['mixOnReshaping'] } // through LazyJavaClassMemberScope@1346
-    functions('mixOnShowing': Name@1935) = ArrayList@1936[1] { JavaMethodDescriptor@1937['mixOnShowing'] } // through LazyJavaClassMemberScope@1346
-    functions('mixOnValidating': Name@1938) = ArrayList@1939[1] { JavaMethodDescriptor@1940['mixOnValidating'] } // through LazyJavaClassMemberScope@1346
-    functions('mixOnZOrderChanging': Name@1941) = ArrayList@1942[1] { JavaMethodDescriptor@1943['mixOnZOrderChanging'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseDown': Name@723) = ArrayList@1944[1] { JavaMethodDescriptor@1945['mouseDown'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseDrag': Name@726) = ArrayList@1946[1] { JavaMethodDescriptor@1947['mouseDrag'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseEnter': Name@729) = ArrayList@1948[1] { JavaMethodDescriptor@1949['mouseEnter'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseExit': Name@732) = ArrayList@1950[1] { JavaMethodDescriptor@1951['mouseExit'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseMove': Name@735) = ArrayList@1952[1] { JavaMethodDescriptor@1953['mouseMove'] } // through LazyJavaClassMemberScope@1346
-    functions('mouseUp': Name@738) = ArrayList@1954[1] { JavaMethodDescriptor@1955['mouseUp'] } // through LazyJavaClassMemberScope@1346
-    functions('move': Name@741) = ArrayList@1956[1] { JavaMethodDescriptor@1957['move'] } // through LazyJavaClassMemberScope@1346
-    functions('nextFocus': Name@744) = ArrayList@1958[1] { JavaMethodDescriptor@1959['nextFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('notifyNewBounds': Name@749) = ArrayList@1960[1] { JavaMethodDescriptor@1961['notifyNewBounds'] } // through LazyJavaClassMemberScope@1346
-    functions('numListening': Name@1962) = ArrayList@1963[1] { JavaMethodDescriptor@1964['numListening'] } // through LazyJavaClassMemberScope@1346
-    functions('ownedInit': Name@755) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('pack': Name@756) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('paint': Name@1965) = ArrayList@1966[1] { JavaMethodDescriptor@1967['paint'] } // through LazyJavaClassMemberScope@1346
-    functions('paintAll': Name@760) = ArrayList@1968[1] { JavaMethodDescriptor@1969['paintAll'] } // through LazyJavaClassMemberScope@1346
-    functions('paintComponents': Name@1970) = ArrayList@1971[1] { JavaMethodDescriptor@1972['paintComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('paintHeavyweightComponents': Name@1973) = ArrayList@1974[1] { JavaMethodDescriptor@1975['paintHeavyweightComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('paramString': Name@1976) = ArrayList@1977[1] { JavaMethodDescriptor@1978['paramString'] } // through LazyJavaClassMemberScope@1346
-    functions('pointRelativeToComponent': Name@770) = ArrayList@1979[1] { JavaMethodDescriptor@1980['pointRelativeToComponent'] } // through LazyJavaClassMemberScope@1346
-    functions('postEvent': Name@773) = ArrayList@1981[1] { JavaMethodDescriptor@1982['postEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('postProcessKeyEvent': Name@1983) = ArrayList@1984[1] { JavaMethodDescriptor@1985['postProcessKeyEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('postWindowEvent': Name@777) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('postsOldMouseEvents': Name@1986) = ArrayList@1987[1] { JavaMethodDescriptor@1988['postsOldMouseEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('preProcessKeyEvent': Name@1989) = ArrayList@1990[1] { JavaMethodDescriptor@1991['preProcessKeyEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('preferredSize': Name@1992) = ArrayList@1993[1] { JavaMethodDescriptor@1994['preferredSize'] } // through LazyJavaClassMemberScope@1346
-    functions('prepareImage': Name@785) = ArrayList@1995[2] { JavaMethodDescriptor@1996['prepareImage'], JavaMethodDescriptor@1997['prepareImage'] } // through LazyJavaClassMemberScope@1346
-    functions('print': Name@1998) = ArrayList@1999[1] { JavaMethodDescriptor@2000['print'] } // through LazyJavaClassMemberScope@1346
-    functions('printAll': Name@792) = ArrayList@2001[1] { JavaMethodDescriptor@2002['printAll'] } // through LazyJavaClassMemberScope@1346
-    functions('printComponents': Name@2003) = ArrayList@2004[1] { JavaMethodDescriptor@2005['printComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('printHeavyweightComponents': Name@2006) = ArrayList@2007[1] { JavaMethodDescriptor@2008['printHeavyweightComponents'] } // through LazyJavaClassMemberScope@1346
-    functions('processComponentEvent': Name@799) = ArrayList@2009[1] { JavaMethodDescriptor@2010['processComponentEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processContainerEvent': Name@2011) = ArrayList@2012[1] { JavaMethodDescriptor@2013['processContainerEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processEvent': Name@2014) = ArrayList@2015[1] { JavaMethodDescriptor@2016['processEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processFocusEvent': Name@806) = ArrayList@2017[1] { JavaMethodDescriptor@2018['processFocusEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processHierarchyBoundsEvent': Name@809) = ArrayList@2019[1] { JavaMethodDescriptor@2020['processHierarchyBoundsEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processHierarchyEvent': Name@812) = ArrayList@2021[1] { JavaMethodDescriptor@2022['processHierarchyEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processInputMethodEvent': Name@815) = ArrayList@2023[1] { JavaMethodDescriptor@2024['processInputMethodEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processKeyEvent': Name@818) = ArrayList@2025[1] { JavaMethodDescriptor@2026['processKeyEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processMouseEvent': Name@821) = ArrayList@2027[1] { JavaMethodDescriptor@2028['processMouseEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processMouseMotionEvent': Name@824) = ArrayList@2029[1] { JavaMethodDescriptor@2030['processMouseMotionEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processMouseWheelEvent': Name@827) = ArrayList@2031[1] { JavaMethodDescriptor@2032['processMouseWheelEvent'] } // through LazyJavaClassMemberScope@1346
-    functions('processWindowEvent': Name@830) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('processWindowFocusEvent': Name@831) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('processWindowStateEvent': Name@832) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('proxyEnableEvents': Name@2033) = ArrayList@2034[1] { JavaMethodDescriptor@2035['proxyEnableEvents'] } // through LazyJavaClassMemberScope@1346
-    functions('readObject': Name@2036) = ArrayList@2037[1] { JavaMethodDescriptor@2038['readObject'] } // through LazyJavaClassMemberScope@1346
-    functions('recursiveApplyCurrentShape': Name@2039) = ArrayList@2040[3] { JavaMethodDescriptor@2041['recursiveApplyCurrentShape'], JavaMethodDescriptor@2042['recursiveApplyCurrentShape'], JavaMethodDescriptor@2043['recursiveApplyCurrentShape'] } // through LazyJavaClassMemberScope@1346
-    functions('recursiveHideHeavyweightChildren': Name@2044) = ArrayList@2045[1] { JavaMethodDescriptor@2046['recursiveHideHeavyweightChildren'] } // through LazyJavaClassMemberScope@1346
-    functions('recursiveRelocateHeavyweightChildren': Name@2047) = ArrayList@2048[1] { JavaMethodDescriptor@2049['recursiveRelocateHeavyweightChildren'] } // through LazyJavaClassMemberScope@1346
-    functions('recursiveShowHeavyweightChildren': Name@2050) = ArrayList@2051[1] { JavaMethodDescriptor@2052['recursiveShowHeavyweightChildren'] } // through LazyJavaClassMemberScope@1346
-    functions('recursiveSubtractAndApplyShape': Name@2053) = ArrayList@2054[3] { JavaMethodDescriptor@2055['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@2056['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@2057['recursiveSubtractAndApplyShape'] } // through LazyJavaClassMemberScope@1346
-    functions('relocateComponent': Name@842) = ArrayList@2058[1] { JavaMethodDescriptor@2059['relocateComponent'] } // through LazyJavaClassMemberScope@1346
-    functions('remove': Name@2060) = ArrayList@2061[2] { JavaMethodDescriptor@2062['remove'], JavaMethodDescriptor@2063['remove'] } // through LazyJavaClassMemberScope@1346
-    functions('removeAll': Name@2064) = ArrayList@2065[1] { JavaMethodDescriptor@2066['removeAll'] } // through LazyJavaClassMemberScope@1346
-    functions('removeComponentListener': Name@849) = ArrayList@2067[1] { JavaMethodDescriptor@2068['removeComponentListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeContainerListener': Name@2069) = ArrayList@2070[1] { JavaMethodDescriptor@2071['removeContainerListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeDelicately': Name@2072) = ArrayList@2073[1] { JavaMethodDescriptor@2074['removeDelicately'] } // through LazyJavaClassMemberScope@1346
-    functions('removeFocusListener': Name@854) = ArrayList@2075[1] { JavaMethodDescriptor@2076['removeFocusListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeFromWindowList': Name@857) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('removeHierarchyBoundsListener': Name@858) = ArrayList@2077[1] { JavaMethodDescriptor@2078['removeHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeHierarchyListener': Name@861) = ArrayList@2079[1] { JavaMethodDescriptor@2080['removeHierarchyListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeInputMethodListener': Name@864) = ArrayList@2081[1] { JavaMethodDescriptor@2082['removeInputMethodListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeKeyListener': Name@867) = ArrayList@2083[1] { JavaMethodDescriptor@2084['removeKeyListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeMouseListener': Name@870) = ArrayList@2085[1] { JavaMethodDescriptor@2086['removeMouseListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeMouseMotionListener': Name@873) = ArrayList@2087[1] { JavaMethodDescriptor@2088['removeMouseMotionListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeMouseWheelListener': Name@876) = ArrayList@2089[1] { JavaMethodDescriptor@2090['removeMouseWheelListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeNotify': Name@2091) = ArrayList@2092[1] { JavaMethodDescriptor@2093['removeNotify'] } // through LazyJavaClassMemberScope@1346
-    functions('removeOwnedWindow': Name@882) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('removePropertyChangeListener': Name@883) = ArrayList@2094[2] { JavaMethodDescriptor@2095['removePropertyChangeListener'], JavaMethodDescriptor@2096['removePropertyChangeListener'] } // through LazyJavaClassMemberScope@1346
-    functions('removeWindowFocusListener': Name@887) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('removeWindowListener': Name@888) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('removeWindowStateListener': Name@889) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('repaint': Name@890) = ArrayList@2097[4] { JavaMethodDescriptor@2098['repaint'], JavaMethodDescriptor@2099['repaint'], JavaMethodDescriptor@2100['repaint'], ... } // through LazyJavaClassMemberScope@1346
-    functions('repaintParentIfNeeded': Name@895) = ArrayList@2101[1] { JavaMethodDescriptor@2102['repaintParentIfNeeded'] } // through LazyJavaClassMemberScope@1346
-    functions('reparentChild': Name@2103) = ArrayList@2104[1] { JavaMethodDescriptor@2105['reparentChild'] } // through LazyJavaClassMemberScope@1346
-    functions('reparentTraverse': Name@2106) = ArrayList@2107[1] { JavaMethodDescriptor@2108['reparentTraverse'] } // through LazyJavaClassMemberScope@1346
-    functions('requestFocus': Name@900) = ArrayList@2109[3] { JavaMethodDescriptor@2110['requestFocus'], JavaMethodDescriptor@2111['requestFocus'], JavaMethodDescriptor@2112['requestFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('requestFocusHelper': Name@905) = ArrayList@2113[2] { JavaMethodDescriptor@2114['requestFocusHelper'], JavaMethodDescriptor@2115['requestFocusHelper'] } // through LazyJavaClassMemberScope@1346
-    functions('requestFocusInWindow': Name@909) = ArrayList@2116[3] { JavaMethodDescriptor@2117['requestFocusInWindow'], JavaMethodDescriptor@2118['requestFocusInWindow'], JavaMethodDescriptor@2119['requestFocusInWindow'] } // through LazyJavaClassMemberScope@1346
-    functions('reshape': Name@914) = ArrayList@2120[1] { JavaMethodDescriptor@2121['reshape'] } // through LazyJavaClassMemberScope@1346
-    functions('reshapeNativePeer': Name@917) = ArrayList@2122[1] { JavaMethodDescriptor@2123['reshapeNativePeer'] } // through LazyJavaClassMemberScope@1346
-    functions('resize': Name@920) = ArrayList@2124[2] { JavaMethodDescriptor@2125['resize'], JavaMethodDescriptor@2126['resize'] } // through LazyJavaClassMemberScope@1346
-    functions('revalidate': Name@924) = ArrayList@2127[1] { JavaMethodDescriptor@2128['revalidate'] } // through LazyJavaClassMemberScope@1346
-    functions('setAlwaysOnTop': Name@927) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setAutoFocusTransferOnDisposal': Name@928) = ArrayList@2129[1] { JavaMethodDescriptor@2130['setAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@1346
-    functions('setAutoRequestFocus': Name@931) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setBackground': Name@932) = ArrayList@2131[1] { JavaMethodDescriptor@2132['setBackground'] } // through LazyJavaClassMemberScope@1346
-    functions('setBounds': Name@935) = ArrayList@2133[2] { JavaMethodDescriptor@2134['setBounds'], JavaMethodDescriptor@2135['setBounds'] } // through LazyJavaClassMemberScope@1346
-    functions('setBoundsOp': Name@939) = ArrayList@2136[1] { JavaMethodDescriptor@2137['setBoundsOp'] } // through LazyJavaClassMemberScope@1346
-    functions('setClientSize': Name@942) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setComponentOrientation': Name@943) = ArrayList@2138[1] { JavaMethodDescriptor@2139['setComponentOrientation'] } // through LazyJavaClassMemberScope@1346
-    functions('setComponentZOrder': Name@2140) = ArrayList@2141[1] { JavaMethodDescriptor@2142['setComponentZOrder'] } // through LazyJavaClassMemberScope@1346
-    functions('setContentPane': Name@947) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setCursor': Name@948) = ArrayList@2143[1] { JavaMethodDescriptor@2144['setCursor'] } // through LazyJavaClassMemberScope@1346
-    functions('setDefaultCloseOperation': Name@951) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setDropTarget': Name@952) = ArrayList@2145[1] { JavaMethodDescriptor@2146['setDropTarget'] } // through LazyJavaClassMemberScope@1346
-    functions('setEnabled': Name@955) = ArrayList@2147[1] { JavaMethodDescriptor@2148['setEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('setExtendedState': Name@958) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setFocusCycleRoot': Name@2149) = ArrayList@2150[1] { JavaMethodDescriptor@2151['setFocusCycleRoot'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusTraversalKeys': Name@2152) = ArrayList@2153[1] { JavaMethodDescriptor@2154['setFocusTraversalKeys'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusTraversalKeysEnabled': Name@963) = ArrayList@2155[1] { JavaMethodDescriptor@2156['setFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusTraversalKeys_NoIDCheck': Name@966) = ArrayList@2157[1] { JavaMethodDescriptor@2158['setFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusTraversalPolicy': Name@2159) = ArrayList@2160[1] { JavaMethodDescriptor@2161['setFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusTraversalPolicyProvider': Name@2162) = ArrayList@2163[1] { JavaMethodDescriptor@2164['setFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusable': Name@971) = ArrayList@2165[1] { JavaMethodDescriptor@2166['setFocusable'] } // through LazyJavaClassMemberScope@1346
-    functions('setFocusableWindowState': Name@974) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setFont': Name@2167) = ArrayList@2168[1] { JavaMethodDescriptor@2169['setFont'] } // through LazyJavaClassMemberScope@1346
-    functions('setForeground': Name@978) = ArrayList@2170[1] { JavaMethodDescriptor@2171['setForeground'] } // through LazyJavaClassMemberScope@1346
-    functions('setGlassPane': Name@981) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setGraphicsConfiguration': Name@982) = ArrayList@2172[1] { JavaMethodDescriptor@2173['setGraphicsConfiguration'] } // through LazyJavaClassMemberScope@1346
-    functions('setIconImage': Name@985) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setIconImages': Name@986) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setIgnoreRepaint': Name@987) = ArrayList@2174[1] { JavaMethodDescriptor@2175['setIgnoreRepaint'] } // through LazyJavaClassMemberScope@1346
-    functions('setJMenuBar': Name@990) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setLayeredPane': Name@991) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setLayout': Name@2176) = ArrayList@2177[1] { JavaMethodDescriptor@2178['setLayout'] } // through LazyJavaClassMemberScope@1346
-    functions('setLocale': Name@993) = ArrayList@2179[1] { JavaMethodDescriptor@2180['setLocale'] } // through LazyJavaClassMemberScope@1346
-    functions('setLocation': Name@996) = ArrayList@2181[2] { JavaMethodDescriptor@2182['setLocation'], JavaMethodDescriptor@2183['setLocation'] } // through LazyJavaClassMemberScope@1346
-    functions('setLocationByPlatform': Name@1000) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setLocationRelativeTo': Name@1001) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setMaximizedBounds': Name@1002) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setMaximumSize': Name@1003) = ArrayList@2184[1] { JavaMethodDescriptor@2185['setMaximumSize'] } // through LazyJavaClassMemberScope@1346
-    functions('setMenuBar': Name@1006) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setMinimumSize': Name@1007) = ArrayList@2186[1] { JavaMethodDescriptor@2187['setMinimumSize'] } // through LazyJavaClassMemberScope@1346
-    functions('setModalBlocked': Name@1010) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setModalExclusionType': Name@1011) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setName': Name@1012) = ArrayList@2188[1] { JavaMethodDescriptor@2189['setName'] } // through LazyJavaClassMemberScope@1346
-    functions('setOpacity': Name@1015) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setPreferredSize': Name@1016) = ArrayList@2190[1] { JavaMethodDescriptor@2191['setPreferredSize'] } // through LazyJavaClassMemberScope@1346
-    functions('setResizable': Name@1019) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setRootPane': Name@1020) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setRootPaneCheckingEnabled': Name@1021) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setShape': Name@1022) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setSize': Name@1023) = ArrayList@2192[2] { JavaMethodDescriptor@2193['setSize'], JavaMethodDescriptor@2194['setSize'] } // through LazyJavaClassMemberScope@1346
-    functions('setState': Name@1027) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setTemporaryLostComponent': Name@1028) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setTitle': Name@1029) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setTransferHandler': Name@1030) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setType': Name@1031) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setUndecorated': Name@1032) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('setVisible': Name@1033) = ArrayList@2195[1] { JavaMethodDescriptor@2196['setVisible'] } // through LazyJavaClassMemberScope@1346
-    functions('setWarningString': Name@1036) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('show': Name@1037) = ArrayList@2197[2] { JavaMethodDescriptor@2198['show'], JavaMethodDescriptor@2199['show'] } // through LazyJavaClassMemberScope@1346
-    functions('size': Name@1041) = ArrayList@2200[1] { JavaMethodDescriptor@2201['size'] } // through LazyJavaClassMemberScope@1346
-    functions('startLWModal': Name@2202) = ArrayList@2203[1] { JavaMethodDescriptor@2204['startLWModal'] } // through LazyJavaClassMemberScope@1346
-    functions('stopLWModal': Name@2205) = ArrayList@2206[1] { JavaMethodDescriptor@2207['stopLWModal'] } // through LazyJavaClassMemberScope@1346
-    functions('subtractAndApplyShape': Name@1046) = ArrayList@2208[1] { JavaMethodDescriptor@2209['subtractAndApplyShape'] } // through LazyJavaClassMemberScope@1346
-    functions('subtractAndApplyShapeBelowMe': Name@1049) = ArrayList@2210[1] { JavaMethodDescriptor@2211['subtractAndApplyShapeBelowMe'] } // through LazyJavaClassMemberScope@1346
-    functions('toBack': Name@1052) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('toBack_NoClientCode': Name@1053) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('toFront': Name@1054) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('toFront_NoClientCode': Name@1055) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('toString': Name@1056) = ArrayList@2212[1] { JavaMethodDescriptor@2213['toString'] } // through LazyJavaClassMemberScope@1346
-    functions('transferFocus': Name@1059) = ArrayList@2214[2] { JavaMethodDescriptor@2215['transferFocus'], JavaMethodDescriptor@2216['transferFocus'] } // through LazyJavaClassMemberScope@1346
-    functions('transferFocusBackward': Name@1063) = ArrayList@2217[2] { JavaMethodDescriptor@2218['transferFocusBackward'], JavaMethodDescriptor@2219['transferFocusBackward'] } // through LazyJavaClassMemberScope@1346
-    functions('transferFocusDownCycle': Name@2220) = ArrayList@2221[1] { JavaMethodDescriptor@2222['transferFocusDownCycle'] } // through LazyJavaClassMemberScope@1346
-    functions('transferFocusUpCycle': Name@1068) = ArrayList@2223[1] { JavaMethodDescriptor@2224['transferFocusUpCycle'] } // through LazyJavaClassMemberScope@1346
-    functions('update': Name@2225) = ArrayList@2226[1] { JavaMethodDescriptor@2227['update'] } // through LazyJavaClassMemberScope@1346
-    functions('updateChildrenBlocking': Name@1074) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('updateCursorImmediately': Name@1075) = ArrayList@2228[1] { JavaMethodDescriptor@2229['updateCursorImmediately'] } // through LazyJavaClassMemberScope@1346
-    functions('updateGraphicsData': Name@2230) = ArrayList@2231[1] { JavaMethodDescriptor@2232['updateGraphicsData'] } // through LazyJavaClassMemberScope@1346
-    functions('updateWindow': Name@1081) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('updateZOrder': Name@1082) = ArrayList@2233[1] { JavaMethodDescriptor@2234['updateZOrder'] } // through LazyJavaClassMemberScope@1346
-    functions('validate': Name@2235) = ArrayList@2236[1] { JavaMethodDescriptor@2237['validate'] } // through LazyJavaClassMemberScope@1346
-    functions('validateTree': Name@2238) = ArrayList@2239[1] { JavaMethodDescriptor@2240['validateTree'] } // through LazyJavaClassMemberScope@1346
-    functions('validateUnconditionally': Name@2241) = ArrayList@2242[1] { JavaMethodDescriptor@2243['validateUnconditionally'] } // through LazyJavaClassMemberScope@1346
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    functions('writeObject': Name@2244) = ArrayList@2245[1] { JavaMethodDescriptor@2246['writeObject'] } // through LazyJavaClassMemberScope@1346
-    memberIndex = computeMemberIndex$1@2247 // through LazyJavaClassMemberScope@1346
-    nestedClassIndex = LinkedHashMap@2248 // through LazyJavaClassMemberScope@1346
-    nestedClasses('EventTargetFilter': Name@2249) = LazyJavaClassDescriptor@2250['EventTargetFilter'] // through LazyJavaClassMemberScope@1346
-    properties('acc': Name@1097) = ArrayList@2251[1] { PropertyDescriptorImpl@2252['acc'] } // through LazyJavaClassMemberScope@1346
-    properties('accessibleContext': Name@1100) = ArrayList@2253[1] { PropertyDescriptorImpl@2254['accessibleContext'] } // through LazyJavaClassMemberScope@1346
-    properties('alwaysOnTop': Name@1103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('anchor': Name@1104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('appContext': Name@1105) = ArrayList@2255[1] { PropertyDescriptorImpl@2256['appContext'] } // through LazyJavaClassMemberScope@1346
-    properties('autoFocusTransferOnDisposal': Name@1108) = ArrayList@2257[1] { PropertyDescriptorImpl@2258['autoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@1346
-    properties('autoRequestFocus': Name@1111) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('background': Name@1112) = ArrayList@2259[1] { PropertyDescriptorImpl@2260['background'] } // through LazyJavaClassMemberScope@1346
-    properties('backgroundEraseDisabled': Name@1115) = ArrayList@2261[1] { PropertyDescriptorImpl@2262['backgroundEraseDisabled'] } // through LazyJavaClassMemberScope@1346
-    properties('beforeFirstShow': Name@1118) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('boundsOp': Name@1119) = ArrayList@2263[1] { PropertyDescriptorImpl@2264['boundsOp'] } // through LazyJavaClassMemberScope@1346
-    properties('bufferStrategy': Name@1122) = ArrayList@2265[1] { PropertyDescriptorImpl@2266['bufferStrategy'] } // through LazyJavaClassMemberScope@1346
-    properties('changeSupport': Name@1125) = ArrayList@2267[1] { PropertyDescriptorImpl@2268['changeSupport'] } // through LazyJavaClassMemberScope@1346
-    properties('coalescingEnabled': Name@1128) = ArrayList@2269[1] { PropertyDescriptorImpl@2270['coalescingEnabled'] } // through LazyJavaClassMemberScope@1346
-    properties('component': Name@1131) = ArrayList@2271[1] { JavaPropertyDescriptor@2272['component'] } // through LazyJavaClassMemberScope@1346
-    properties('componentListener': Name@1132) = ArrayList@2273[1] { PropertyDescriptorImpl@2274['componentListener'] } // through LazyJavaClassMemberScope@1346
-    properties('componentOrientation': Name@1135) = ArrayList@2275[1] { PropertyDescriptorImpl@2276['componentOrientation'] } // through LazyJavaClassMemberScope@1346
-    properties('componentSerializedDataVersion': Name@1138) = ArrayList@2277[1] { PropertyDescriptorImpl@2278['componentSerializedDataVersion'] } // through LazyJavaClassMemberScope@1346
-    properties('compoundShape': Name@1141) = ArrayList@2279[1] { PropertyDescriptorImpl@2280['compoundShape'] } // through LazyJavaClassMemberScope@1346
-    properties('containerListener': Name@1144) = ArrayList@2281[1] { JavaPropertyDescriptor@2282['containerListener'] } // through LazyJavaClassMemberScope@1346
-    properties('containerSerializedDataVersion': Name@1145) = ArrayList@2283[1] { JavaPropertyDescriptor@2284['containerSerializedDataVersion'] } // through LazyJavaClassMemberScope@1346
-    properties('cursor': Name@1146) = ArrayList@2285[1] { PropertyDescriptorImpl@2286['cursor'] } // through LazyJavaClassMemberScope@1346
-    properties('defaultCloseOperation': Name@1149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('descendantsCount': Name@1150) = ArrayList@2287[1] { JavaPropertyDescriptor@2288['descendantsCount'] } // through LazyJavaClassMemberScope@1346
-    properties('dispatcher': Name@1151) = ArrayList@2289[1] { JavaPropertyDescriptor@2290['dispatcher'] } // through LazyJavaClassMemberScope@1346
-    properties('disposing': Name@1152) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('dropTarget': Name@1153) = ArrayList@2291[1] { PropertyDescriptorImpl@2292['dropTarget'] } // through LazyJavaClassMemberScope@1346
-    properties('enabled': Name@1156) = ArrayList@2293[1] { PropertyDescriptorImpl@2294['enabled'] } // through LazyJavaClassMemberScope@1346
-    properties('eventCache': Name@1159) = ArrayList@2295[1] { PropertyDescriptorImpl@2296['eventCache'] } // through LazyJavaClassMemberScope@1346
-    properties('eventMask': Name@1162) = ArrayList@2297[1] { PropertyDescriptorImpl@2298['eventMask'] } // through LazyJavaClassMemberScope@1346
-    properties('focusCycleRoot': Name@1165) = ArrayList@2299[1] { JavaPropertyDescriptor@2300['focusCycleRoot'] } // through LazyJavaClassMemberScope@1346
-    properties('focusListener': Name@1166) = ArrayList@2301[1] { PropertyDescriptorImpl@2302['focusListener'] } // through LazyJavaClassMemberScope@1346
-    properties('focusMgr': Name@1169) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('focusTraversalKeys': Name@1170) = ArrayList@2303[1] { PropertyDescriptorImpl@2304['focusTraversalKeys'] } // through LazyJavaClassMemberScope@1346
-    properties('focusTraversalKeysEnabled': Name@1173) = ArrayList@2305[1] { PropertyDescriptorImpl@2306['focusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@1346
-    properties('focusTraversalPolicy': Name@1176) = ArrayList@2307[1] { JavaPropertyDescriptor@2308['focusTraversalPolicy'] } // through LazyJavaClassMemberScope@1346
-    properties('focusTraversalPolicyProvider': Name@1177) = ArrayList@2309[1] { JavaPropertyDescriptor@2310['focusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@1346
-    properties('focusable': Name@1178) = ArrayList@2311[1] { PropertyDescriptorImpl@2312['focusable'] } // through LazyJavaClassMemberScope@1346
-    properties('focusableWindowState': Name@1181) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('font': Name@1182) = ArrayList@2313[1] { PropertyDescriptorImpl@2314['font'] } // through LazyJavaClassMemberScope@1346
-    properties('foreground': Name@1185) = ArrayList@2315[1] { PropertyDescriptorImpl@2316['foreground'] } // through LazyJavaClassMemberScope@1346
-    properties('frameSerializedDataVersion': Name@1188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('graphicsConfig': Name@1189) = ArrayList@2317[1] { PropertyDescriptorImpl@2318['graphicsConfig'] } // through LazyJavaClassMemberScope@1346
-    properties('height': Name@1192) = ArrayList@2319[1] { PropertyDescriptorImpl@2320['height'] } // through LazyJavaClassMemberScope@1346
-    properties('hierarchyBoundsListener': Name@1195) = ArrayList@2321[1] { PropertyDescriptorImpl@2322['hierarchyBoundsListener'] } // through LazyJavaClassMemberScope@1346
-    properties('hierarchyListener': Name@1198) = ArrayList@2323[1] { PropertyDescriptorImpl@2324['hierarchyListener'] } // through LazyJavaClassMemberScope@1346
-    properties('icons': Name@1201) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('ignoreRepaint': Name@1202) = ArrayList@2325[1] { PropertyDescriptorImpl@2326['ignoreRepaint'] } // through LazyJavaClassMemberScope@1346
-    properties('inputContext': Name@1205) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('inputContextLock': Name@1206) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('inputMethodListener': Name@1207) = ArrayList@2327[1] { PropertyDescriptorImpl@2328['inputMethodListener'] } // through LazyJavaClassMemberScope@1346
-    properties('isAddNotifyComplete': Name@1210) = ArrayList@2329[1] { PropertyDescriptorImpl@2330['isAddNotifyComplete'] } // through LazyJavaClassMemberScope@1346
-    properties('isFocusTraversableOverridden': Name@1213) = ArrayList@2331[1] { PropertyDescriptorImpl@2332['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@1346
-    properties('isInShow': Name@1216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('isPacked': Name@1217) = ArrayList@2333[1] { PropertyDescriptorImpl@2334['isPacked'] } // through LazyJavaClassMemberScope@1346
-    properties('isTrayIconWindow': Name@1220) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('keyListener': Name@1221) = ArrayList@2335[1] { PropertyDescriptorImpl@2336['keyListener'] } // through LazyJavaClassMemberScope@1346
-    properties('layoutMgr': Name@1224) = ArrayList@2337[1] { JavaPropertyDescriptor@2338['layoutMgr'] } // through LazyJavaClassMemberScope@1346
-    properties('listeningBoundsChildren': Name@1225) = ArrayList@2339[1] { JavaPropertyDescriptor@2340['listeningBoundsChildren'] } // through LazyJavaClassMemberScope@1346
-    properties('listeningChildren': Name@1226) = ArrayList@2341[1] { JavaPropertyDescriptor@2342['listeningChildren'] } // through LazyJavaClassMemberScope@1346
-    properties('locale': Name@1227) = ArrayList@2343[1] { PropertyDescriptorImpl@2344['locale'] } // through LazyJavaClassMemberScope@1346
-    properties('locationByPlatform': Name@1230) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('maxSize': Name@1231) = ArrayList@2345[1] { PropertyDescriptorImpl@2346['maxSize'] } // through LazyJavaClassMemberScope@1346
-    properties('maxSizeSet': Name@1234) = ArrayList@2347[1] { PropertyDescriptorImpl@2348['maxSizeSet'] } // through LazyJavaClassMemberScope@1346
-    properties('maximizedBounds': Name@1237) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('mbManagement': Name@1238) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('menuBar': Name@1239) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('minSize': Name@1240) = ArrayList@2349[1] { PropertyDescriptorImpl@2350['minSize'] } // through LazyJavaClassMemberScope@1346
-    properties('minSizeSet': Name@1243) = ArrayList@2351[1] { PropertyDescriptorImpl@2352['minSizeSet'] } // through LazyJavaClassMemberScope@1346
-    properties('mixingCutoutRegion': Name@1246) = ArrayList@2353[1] { PropertyDescriptorImpl@2354['mixingCutoutRegion'] } // through LazyJavaClassMemberScope@1346
-    properties('modalAppContext': Name@1249) = ArrayList@2355[1] { JavaPropertyDescriptor@2356['modalAppContext'] } // through LazyJavaClassMemberScope@1346
-    properties('modalBlocker': Name@1250) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('modalComp': Name@1251) = ArrayList@2357[1] { JavaPropertyDescriptor@2358['modalComp'] } // through LazyJavaClassMemberScope@1346
-    properties('modalExclusionType': Name@1252) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('mouseListener': Name@1253) = ArrayList@2359[1] { PropertyDescriptorImpl@2360['mouseListener'] } // through LazyJavaClassMemberScope@1346
-    properties('mouseMotionListener': Name@1256) = ArrayList@2361[1] { PropertyDescriptorImpl@2362['mouseMotionListener'] } // through LazyJavaClassMemberScope@1346
-    properties('mouseWheelListener': Name@1259) = ArrayList@2363[1] { PropertyDescriptorImpl@2364['mouseWheelListener'] } // through LazyJavaClassMemberScope@1346
-    properties('name': Name@1262) = ArrayList@2365[1] { PropertyDescriptorImpl@2366['name'] } // through LazyJavaClassMemberScope@1346
-    properties('nameExplicitlySet': Name@1265) = ArrayList@2367[1] { PropertyDescriptorImpl@2368['nameExplicitlySet'] } // through LazyJavaClassMemberScope@1346
-    properties('newEventsOnly': Name@1268) = ArrayList@2369[1] { PropertyDescriptorImpl@2370['newEventsOnly'] } // through LazyJavaClassMemberScope@1346
-    properties('numOfHWComponents': Name@1271) = ArrayList@2371[1] { JavaPropertyDescriptor@2372['numOfHWComponents'] } // through LazyJavaClassMemberScope@1346
-    properties('numOfLWComponents': Name@1272) = ArrayList@2373[1] { JavaPropertyDescriptor@2374['numOfLWComponents'] } // through LazyJavaClassMemberScope@1346
-    properties('objectLock': Name@1273) = ArrayList@2375[1] { PropertyDescriptorImpl@2376['objectLock'] } // through LazyJavaClassMemberScope@1346
-    properties('opacity': Name@1276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('ownedWindowList': Name@1277) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('ownedWindows': Name@1278) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('parent': Name@1279) = ArrayList@2377[1] { PropertyDescriptorImpl@2378['parent'] } // through LazyJavaClassMemberScope@1346
-    properties('peer': Name@1282) = ArrayList@2379[1] { PropertyDescriptorImpl@2380['peer'] } // through LazyJavaClassMemberScope@1346
-    properties('peerFont': Name@1285) = ArrayList@2381[1] { PropertyDescriptorImpl@2382['peerFont'] } // through LazyJavaClassMemberScope@1346
-    properties('popups': Name@1288) = ArrayList@2383[1] { PropertyDescriptorImpl@2384['popups'] } // through LazyJavaClassMemberScope@1346
-    properties('prefSize': Name@1291) = ArrayList@2385[1] { PropertyDescriptorImpl@2386['prefSize'] } // through LazyJavaClassMemberScope@1346
-    properties('prefSizeSet': Name@1294) = ArrayList@2387[1] { PropertyDescriptorImpl@2388['prefSizeSet'] } // through LazyJavaClassMemberScope@1346
-    properties('preserveBackgroundColor': Name@1297) = ArrayList@2389[1] { JavaPropertyDescriptor@2390['preserveBackgroundColor'] } // through LazyJavaClassMemberScope@1346
-    properties('printing': Name@1298) = ArrayList@2391[1] { JavaPropertyDescriptor@2392['printing'] } // through LazyJavaClassMemberScope@1346
-    properties('printingThreads': Name@1299) = ArrayList@2393[1] { JavaPropertyDescriptor@2394['printingThreads'] } // through LazyJavaClassMemberScope@1346
-    properties('resizable': Name@1300) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('rootPane': Name@1301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('rootPaneCheckingEnabled': Name@1302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningAlignmentX': Name@1303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningAlignmentY': Name@1304) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningHeight': Name@1305) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningPointX': Name@1306) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningPointY': Name@1307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('securityWarningWidth': Name@1308) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('shape': Name@1309) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('showWithParent': Name@1310) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('state': Name@1311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('syncLWRequests': Name@1312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('temporaryLostComponent': Name@1313) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('title': Name@1314) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('transferHandler': Name@1315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('type': Name@1316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('undecorated': Name@1317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('valid': Name@1318) = ArrayList@2395[1] { PropertyDescriptorImpl@2396['valid'] } // through LazyJavaClassMemberScope@1346
-    properties('visible': Name@1321) = ArrayList@2397[1] { PropertyDescriptorImpl@2398['visible'] } // through LazyJavaClassMemberScope@1346
-    properties('warningString': Name@1324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('weakThis': Name@1325) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('width': Name@1326) = ArrayList@2399[1] { PropertyDescriptorImpl@2400['width'] } // through LazyJavaClassMemberScope@1346
-    properties('windowClosingException': Name@1329) = ArrayList@2401[1] { PropertyDescriptorImpl@2402['windowClosingException'] } // through LazyJavaClassMemberScope@1346
-    properties('windowFocusListener': Name@1332) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('windowListener': Name@1333) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('windowSerializedDataVersion': Name@1334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('windowStateListener': Name@1335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@1346
-    properties('x': Name@1336) = ArrayList@2403[1] { PropertyDescriptorImpl@2404['x'] } // through LazyJavaClassMemberScope@1346
-    properties('y': Name@1339) = ArrayList@2405[1] { PropertyDescriptorImpl@2406['y'] } // through LazyJavaClassMemberScope@1346
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@2407['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassDescriptor@2409['Dimension'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassDescriptor@2411['EventListener'] {
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassDescriptor@2250['EventTargetFilter'] {
-    functionTypeForSamInterface = JetTypeImpl@2413['Function1<2>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@2414['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
-}
-
-LazyJavaClassDescriptor@2416['Frame'] {
-    defaultType = JetTypeImpl@2417['Frame']
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('action': Name@11) = ArrayList@2419[1] { JavaMethodDescriptor@2420['action'] } // through LazyJavaClassMemberScope@2418
-    functions('add': Name@1349) = ArrayList@2421[6] { JavaMethodDescriptor@2422['add'], JavaMethodDescriptor@2423['add'], JavaMethodDescriptor@2424['add'], ... } // through LazyJavaClassMemberScope@2418
-    functions('addComponentListener': Name@17) = ArrayList@2425[1] { JavaMethodDescriptor@2426['addComponentListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addContainerListener': Name@1356) = ArrayList@2427[1] { JavaMethodDescriptor@2428['addContainerListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addDelicately': Name@1359) = ArrayList@2429[1] { JavaMethodDescriptor@2430['addDelicately'] } // through LazyJavaClassMemberScope@2418
-    functions('addFocusListener': Name@22) = ArrayList@2431[1] { JavaMethodDescriptor@2432['addFocusListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addHierarchyBoundsListener': Name@25) = ArrayList@2433[1] { JavaMethodDescriptor@2434['addHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addHierarchyListener': Name@28) = ArrayList@2435[1] { JavaMethodDescriptor@2436['addHierarchyListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addImpl': Name@1368) = ArrayList@2437[1] { JavaMethodDescriptor@2438['addImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('addInputMethodListener': Name@32) = ArrayList@2439[1] { JavaMethodDescriptor@2440['addInputMethodListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addKeyListener': Name@35) = ArrayList@2441[1] { JavaMethodDescriptor@2442['addKeyListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addMouseListener': Name@38) = ArrayList@2443[1] { JavaMethodDescriptor@2444['addMouseListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addMouseMotionListener': Name@41) = ArrayList@2445[1] { JavaMethodDescriptor@2446['addMouseMotionListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addMouseWheelListener': Name@44) = ArrayList@2447[1] { JavaMethodDescriptor@2448['addMouseWheelListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addNotify': Name@2449) = ArrayList@2450[1] { JavaMethodDescriptor@2451['addNotify'] } // through LazyJavaClassMemberScope@2418
-    functions('addOwnedWindow': Name@2452) = ArrayList@2453[1] { JavaMethodDescriptor@2454['addOwnedWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('addPropertyChangeListener': Name@2455) = ArrayList@2456[2] { JavaMethodDescriptor@2457['addPropertyChangeListener'], JavaMethodDescriptor@2458['addPropertyChangeListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addToWindowList': Name@2459) = ArrayList@2460[1] { JavaMethodDescriptor@2461['addToWindowList'] } // through LazyJavaClassMemberScope@2418
-    functions('addWindowFocusListener': Name@2462) = ArrayList@2463[1] { JavaMethodDescriptor@2464['addWindowFocusListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addWindowListener': Name@2465) = ArrayList@2466[1] { JavaMethodDescriptor@2467['addWindowListener'] } // through LazyJavaClassMemberScope@2418
-    functions('addWindowStateListener': Name@2468) = ArrayList@2469[1] { JavaMethodDescriptor@2470['addWindowStateListener'] } // through LazyJavaClassMemberScope@2418
-    functions('adjustDecendantsOnParent': Name@2471) = ArrayList@2472[1] { JavaMethodDescriptor@2473['adjustDecendantsOnParent'] } // through LazyJavaClassMemberScope@2418
-    functions('adjustDescendants': Name@1391) = ArrayList@2474[1] { JavaMethodDescriptor@2475['adjustDescendants'] } // through LazyJavaClassMemberScope@2418
-    functions('adjustListeningChildren': Name@1394) = ArrayList@2476[1] { JavaMethodDescriptor@2477['adjustListeningChildren'] } // through LazyJavaClassMemberScope@2418
-    functions('adjustListeningChildrenOnParent': Name@2478) = ArrayList@2479[1] { JavaMethodDescriptor@2480['adjustListeningChildrenOnParent'] } // through LazyJavaClassMemberScope@2418
-    functions('applyComponentOrientation': Name@1399) = ArrayList@2481[1] { JavaMethodDescriptor@2482['applyComponentOrientation'] } // through LazyJavaClassMemberScope@2418
-    functions('applyCompoundShape': Name@2483) = ArrayList@2484[1] { JavaMethodDescriptor@2485['applyCompoundShape'] } // through LazyJavaClassMemberScope@2418
-    functions('applyCurrentShape': Name@2486) = ArrayList@2487[1] { JavaMethodDescriptor@2488['applyCurrentShape'] } // through LazyJavaClassMemberScope@2418
-    functions('applyCurrentShapeBelowMe': Name@74) = ArrayList@2489[1] { JavaMethodDescriptor@2490['applyCurrentShapeBelowMe'] } // through LazyJavaClassMemberScope@2418
-    functions('applyResourceBundle': Name@2491) = ArrayList@2492[2] { JavaMethodDescriptor@2493['applyResourceBundle'], JavaMethodDescriptor@2494['applyResourceBundle'] } // through LazyJavaClassMemberScope@2418
-    functions('areBoundsValid': Name@78) = ArrayList@2495[1] { JavaMethodDescriptor@2496['areBoundsValid'] } // through LazyJavaClassMemberScope@2418
-    functions('areFocusTraversalKeysSet': Name@1410) = ArrayList@2497[1] { JavaMethodDescriptor@2498['areFocusTraversalKeysSet'] } // through LazyJavaClassMemberScope@2418
-    functions('areInputMethodsEnabled': Name@84) = ArrayList@2499[1] { JavaMethodDescriptor@2500['areInputMethodsEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('autoProcessMouseWheel': Name@87) = ArrayList@2501[1] { JavaMethodDescriptor@2502['autoProcessMouseWheel'] } // through LazyJavaClassMemberScope@2418
-    functions('bounds': Name@90) = ArrayList@2503[1] { JavaMethodDescriptor@2504['bounds'] } // through LazyJavaClassMemberScope@2418
-    functions('calculateCurrentShape': Name@93) = ArrayList@2505[1] { JavaMethodDescriptor@2506['calculateCurrentShape'] } // through LazyJavaClassMemberScope@2418
-    functions('calculateSecurityWarningPosition': Name@2507) = ArrayList@2508[1] { JavaMethodDescriptor@2509['calculateSecurityWarningPosition'] } // through LazyJavaClassMemberScope@2418
-    functions('canBeFocusOwner': Name@97) = ArrayList@2510[1] { JavaMethodDescriptor@2511['canBeFocusOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('canBeFocusOwnerRecursively': Name@100) = ArrayList@2512[1] { JavaMethodDescriptor@2513['canBeFocusOwnerRecursively'] } // through LazyJavaClassMemberScope@2418
-    functions('canContainFocusOwner': Name@2514) = ArrayList@2515[1] { JavaMethodDescriptor@2516['canContainFocusOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('checkAddToSelf': Name@1428) = ArrayList@2517[1] { JavaMethodDescriptor@2518['checkAddToSelf'] } // through LazyJavaClassMemberScope@2418
-    functions('checkAdding': Name@1431) = ArrayList@2519[1] { JavaMethodDescriptor@2520['checkAdding'] } // through LazyJavaClassMemberScope@2418
-    functions('checkCoalescing': Name@106) = ArrayList@2521[1] { JavaMethodDescriptor@2522['checkCoalescing'] } // through LazyJavaClassMemberScope@2418
-    functions('checkGD': Name@1436) = ArrayList@2523[1] { JavaMethodDescriptor@2524['checkGD'] } // through LazyJavaClassMemberScope@2418
-    functions('checkImage': Name@112) = ArrayList@2525[2] { JavaMethodDescriptor@2526['checkImage'], JavaMethodDescriptor@2527['checkImage'] } // through LazyJavaClassMemberScope@2418
-    functions('checkNotAWindow': Name@1442) = ArrayList@2528[1] { JavaMethodDescriptor@2529['checkNotAWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('checkTreeLock': Name@117) = ArrayList@2530[1] { JavaMethodDescriptor@2531['checkTreeLock'] } // through LazyJavaClassMemberScope@2418
-    functions('checkWindowClosingException': Name@120) = ArrayList@2532[1] { JavaMethodDescriptor@2533['checkWindowClosingException'] } // through LazyJavaClassMemberScope@2418
-    functions('clearCurrentFocusCycleRootOnHide': Name@1449) = ArrayList@2534[1] { JavaMethodDescriptor@2535['clearCurrentFocusCycleRootOnHide'] } // through LazyJavaClassMemberScope@2418
-    functions('clearMostRecentFocusOwnerOnHide': Name@2536) = ArrayList@2537[1] { JavaMethodDescriptor@2538['clearMostRecentFocusOwnerOnHide'] } // through LazyJavaClassMemberScope@2418
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('closeSplashScreen': Name@2539) = ArrayList@2540[1] { JavaMethodDescriptor@2541['closeSplashScreen'] } // through LazyJavaClassMemberScope@2418
-    functions('coalesceEvents': Name@131) = ArrayList@2542[1] { JavaMethodDescriptor@2543['coalesceEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('connectOwnedWindow': Name@2544) = ArrayList@2545[1] { JavaMethodDescriptor@2546['connectOwnedWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('constructComponentName': Name@2547) = ArrayList@2548[1] { JavaMethodDescriptor@2549['constructComponentName'] } // through LazyJavaClassMemberScope@2418
-    functions('contains': Name@138) = ArrayList@2550[2] { JavaMethodDescriptor@2551['contains'], JavaMethodDescriptor@2552['contains'] } // through LazyJavaClassMemberScope@2418
-    functions('containsFocus': Name@1462) = ArrayList@2553[1] { JavaMethodDescriptor@2554['containsFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('countComponents': Name@1465) = ArrayList@2555[1] { JavaMethodDescriptor@2556['countComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('countHierarchyMembers': Name@1468) = ArrayList@2557[1] { JavaMethodDescriptor@2558['countHierarchyMembers'] } // through LazyJavaClassMemberScope@2418
-    functions('createBufferStrategy': Name@2559) = ArrayList@2560[2] { JavaMethodDescriptor@2561['createBufferStrategy'], JavaMethodDescriptor@2562['createBufferStrategy'] } // through LazyJavaClassMemberScope@2418
-    functions('createChildHierarchyEvents': Name@1474) = ArrayList@2563[1] { JavaMethodDescriptor@2564['createChildHierarchyEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('createHierarchyEvents': Name@1477) = ArrayList@2565[1] { JavaMethodDescriptor@2566['createHierarchyEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('createImage': Name@157) = ArrayList@2567[2] { JavaMethodDescriptor@2568['createImage'], JavaMethodDescriptor@2569['createImage'] } // through LazyJavaClassMemberScope@2418
-    functions('createRootPane': Name@161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('createVolatileImage': Name@162) = ArrayList@2570[2] { JavaMethodDescriptor@2571['createVolatileImage'], JavaMethodDescriptor@2572['createVolatileImage'] } // through LazyJavaClassMemberScope@2418
-    functions('decreaseComponentCount': Name@1486) = ArrayList@2573[1] { JavaMethodDescriptor@2574['decreaseComponentCount'] } // through LazyJavaClassMemberScope@2418
-    functions('deliverEvent': Name@1489) = ArrayList@2575[1] { JavaMethodDescriptor@2576['deliverEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('deliverMouseWheelToAncestor': Name@2577) = ArrayList@2578[1] { JavaMethodDescriptor@2579['deliverMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@2418
-    functions('deserializeResources': Name@2580) = ArrayList@2581[1] { JavaMethodDescriptor@2582['deserializeResources'] } // through LazyJavaClassMemberScope@2418
-    functions('disable': Name@172) = ArrayList@2583[1] { JavaMethodDescriptor@2584['disable'] } // through LazyJavaClassMemberScope@2418
-    functions('disableEvents': Name@175) = ArrayList@2585[1] { JavaMethodDescriptor@2586['disableEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('dispatchEvent': Name@178) = ArrayList@2587[1] { JavaMethodDescriptor@2588['dispatchEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('dispatchEventImpl': Name@2589) = ArrayList@2590[1] { JavaMethodDescriptor@2591['dispatchEventImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('dispatchEventToSelf': Name@1501) = ArrayList@2592[1] { JavaMethodDescriptor@2593['dispatchEventToSelf'] } // through LazyJavaClassMemberScope@2418
-    functions('dispatchMouseWheelToAncestor': Name@2594) = ArrayList@2595[1] { JavaMethodDescriptor@2596['dispatchMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@2418
-    functions('dispose': Name@2597) = ArrayList@2598[1] { JavaMethodDescriptor@2599['dispose'] } // through LazyJavaClassMemberScope@2418
-    functions('disposeImpl': Name@2600) = ArrayList@2601[1] { JavaMethodDescriptor@2602['disposeImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('doDispose': Name@2603) = ArrayList@2604[1] { JavaMethodDescriptor@2605['doDispose'] } // through LazyJavaClassMemberScope@2418
-    functions('doLayout': Name@1506) = ArrayList@2606[1] { JavaMethodDescriptor@2607['doLayout'] } // through LazyJavaClassMemberScope@2418
-    functions('doSwingSerialization': Name@194) = ArrayList@2608[1] { JavaMethodDescriptor@2609['doSwingSerialization'] } // through LazyJavaClassMemberScope@2418
-    functions('enable': Name@197) = ArrayList@2610[2] { JavaMethodDescriptor@2611['enable'], JavaMethodDescriptor@2612['enable'] } // through LazyJavaClassMemberScope@2418
-    functions('enableEvents': Name@201) = ArrayList@2613[1] { JavaMethodDescriptor@2614['enableEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('enableInputMethods': Name@204) = ArrayList@2615[1] { JavaMethodDescriptor@2616['enableInputMethods'] } // through LazyJavaClassMemberScope@2418
-    functions('equals': Name@207) = ArrayList@2617[1] { DeserializedSimpleFunctionDescriptor@2618['equals'] } // through LazyJavaClassMemberScope@2418
-    functions('eventEnabled': Name@2619) = ArrayList@2620[1] { JavaMethodDescriptor@2621['eventEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('eventTypeEnabled': Name@213) = ArrayList@2622[1] { JavaMethodDescriptor@2623['eventTypeEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('findComponentAt': Name@1525) = ArrayList@2624[3] { JavaMethodDescriptor@2625['findComponentAt'], JavaMethodDescriptor@2626['findComponentAt'], JavaMethodDescriptor@2627['findComponentAt'] } // through LazyJavaClassMemberScope@2418
-    functions('findComponentAtImpl': Name@1530) = ArrayList@2628[1] { JavaMethodDescriptor@2629['findComponentAtImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('findTraversalRoot': Name@1533) = ArrayList@2630[1] { JavaMethodDescriptor@2631['findTraversalRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('findUnderMouseInWindow': Name@220) = ArrayList@2632[1] { JavaMethodDescriptor@2633['findUnderMouseInWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('firePropertyChange': Name@223) = ArrayList@2634[9] { JavaMethodDescriptor@2635['firePropertyChange'], JavaMethodDescriptor@2636['firePropertyChange'], JavaMethodDescriptor@2637['firePropertyChange'], ... } // through LazyJavaClassMemberScope@2418
-    functions('frameInit': Name@228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getAccessControlContext': Name@229) = ArrayList@2638[1] { JavaMethodDescriptor@2639['getAccessControlContext'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleAt': Name@1544) = ArrayList@2640[1] { JavaMethodDescriptor@2641['getAccessibleAt'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleChild': Name@1547) = ArrayList@2642[1] { JavaMethodDescriptor@2643['getAccessibleChild'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleChildrenCount': Name@1550) = ArrayList@2644[1] { JavaMethodDescriptor@2645['getAccessibleChildrenCount'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleContext': Name@2646) = ArrayList@2647[1] { JavaMethodDescriptor@2648['getAccessibleContext'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleIndexInParent': Name@238) = ArrayList@2649[1] { JavaMethodDescriptor@2650['getAccessibleIndexInParent'] } // through LazyJavaClassMemberScope@2418
-    functions('getAccessibleStateSet': Name@241) = ArrayList@2651[1] { JavaMethodDescriptor@2652['getAccessibleStateSet'] } // through LazyJavaClassMemberScope@2418
-    functions('getAlignmentX': Name@1559) = ArrayList@2653[1] { JavaMethodDescriptor@2654['getAlignmentX'] } // through LazyJavaClassMemberScope@2418
-    functions('getAlignmentY': Name@1562) = ArrayList@2655[1] { JavaMethodDescriptor@2656['getAlignmentY'] } // through LazyJavaClassMemberScope@2418
-    functions('getAppliedShape': Name@250) = ArrayList@2657[1] { JavaMethodDescriptor@2658['getAppliedShape'] } // through LazyJavaClassMemberScope@2418
-    functions('getBackBuffer': Name@253) = ArrayList@2659[1] { JavaMethodDescriptor@2660['getBackBuffer'] } // through LazyJavaClassMemberScope@2418
-    functions('getBackground': Name@2661) = ArrayList@2662[1] { JavaMethodDescriptor@2663['getBackground'] } // through LazyJavaClassMemberScope@2418
-    functions('getBaseline': Name@259) = ArrayList@2664[1] { JavaMethodDescriptor@2665['getBaseline'] } // through LazyJavaClassMemberScope@2418
-    functions('getBaselineResizeBehavior': Name@262) = ArrayList@2666[1] { JavaMethodDescriptor@2667['getBaselineResizeBehavior'] } // through LazyJavaClassMemberScope@2418
-    functions('getBottommostComponentIndex': Name@1575) = ArrayList@2668[1] { JavaMethodDescriptor@2669['getBottommostComponentIndex'] } // through LazyJavaClassMemberScope@2418
-    functions('getBounds': Name@266) = ArrayList@2670[2] { JavaMethodDescriptor@2671['getBounds'], JavaMethodDescriptor@2672['getBounds'] } // through LazyJavaClassMemberScope@2418
-    functions('getBoundsOp': Name@270) = ArrayList@2673[1] { JavaMethodDescriptor@2674['getBoundsOp'] } // through LazyJavaClassMemberScope@2418
-    functions('getBufferStrategy': Name@2675) = ArrayList@2676[1] { JavaMethodDescriptor@2677['getBufferStrategy'] } // through LazyJavaClassMemberScope@2418
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getColorModel': Name@277) = ArrayList@2678[1] { JavaMethodDescriptor@2679['getColorModel'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponent': Name@1587) = ArrayList@2680[1] { JavaMethodDescriptor@2681['getComponent'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentAt': Name@1590) = ArrayList@2682[2] { JavaMethodDescriptor@2683['getComponentAt'], JavaMethodDescriptor@2684['getComponentAt'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentCount': Name@1594) = ArrayList@2685[1] { JavaMethodDescriptor@2686['getComponentCount'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentListeners': Name@286) = ArrayList@2687[1] { JavaMethodDescriptor@2688['getComponentListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentOrientation': Name@289) = ArrayList@2689[1] { JavaMethodDescriptor@2690['getComponentOrientation'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentZOrder': Name@1601) = ArrayList@2691[1] { JavaMethodDescriptor@2692['getComponentZOrder'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponents': Name@1604) = ArrayList@2693[1] { JavaMethodDescriptor@2694['getComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponentsSync': Name@1607) = ArrayList@2695[1] { JavaMethodDescriptor@2696['getComponentsSync'] } // through LazyJavaClassMemberScope@2418
-    functions('getComponents_NoClientCode': Name@1610) = ArrayList@2697[1] { JavaMethodDescriptor@2698['getComponents_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getContainer': Name@2699) = ArrayList@2700[1] { JavaMethodDescriptor@2701['getContainer'] } // through LazyJavaClassMemberScope@2418
-    functions('getContainerListeners': Name@1615) = ArrayList@2702[1] { JavaMethodDescriptor@2703['getContainerListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getContainingWindow': Name@300) = ArrayList@2704[1] { JavaMethodDescriptor@2705['getContainingWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('getContentPane': Name@303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getCursor': Name@304) = ArrayList@2706[1] { JavaMethodDescriptor@2707['getCursor'] } // through LazyJavaClassMemberScope@2418
-    functions('getCursorType': Name@2708) = ArrayList@2709[1] { JavaMethodDescriptor@2710['getCursorType'] } // through LazyJavaClassMemberScope@2418
-    functions('getCursor_NoClientCode': Name@308) = ArrayList@2711[1] { JavaMethodDescriptor@2712['getCursor_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getDefaultCloseOperation': Name@311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getDocumentRoot': Name@2713) = ArrayList@2714[1] { JavaMethodDescriptor@2715['getDocumentRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('getDropTarget': Name@313) = ArrayList@2716[1] { JavaMethodDescriptor@2717['getDropTarget'] } // through LazyJavaClassMemberScope@2418
-    functions('getDropTargetEventTarget': Name@1626) = ArrayList@2718[1] { JavaMethodDescriptor@2719['getDropTargetEventTarget'] } // through LazyJavaClassMemberScope@2418
-    functions('getExtendedState': Name@2720) = ArrayList@2721[1] { JavaMethodDescriptor@2722['getExtendedState'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusCycleRootAncestor': Name@2723) = ArrayList@2724[1] { JavaMethodDescriptor@2725['getFocusCycleRootAncestor'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusListeners': Name@321) = ArrayList@2726[1] { JavaMethodDescriptor@2727['getFocusListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusOwner': Name@2728) = ArrayList@2729[1] { JavaMethodDescriptor@2730['getFocusOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusTraversalKeys': Name@2731) = ArrayList@2732[1] { JavaMethodDescriptor@2733['getFocusTraversalKeys'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusTraversalKeysEnabled': Name@328) = ArrayList@2734[1] { JavaMethodDescriptor@2735['getFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusTraversalKeys_NoIDCheck': Name@331) = ArrayList@2736[1] { JavaMethodDescriptor@2737['getFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusTraversalPolicy': Name@1640) = ArrayList@2738[1] { JavaMethodDescriptor@2739['getFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@2418
-    functions('getFocusableWindowState': Name@2740) = ArrayList@2741[1] { JavaMethodDescriptor@2742['getFocusableWindowState'] } // through LazyJavaClassMemberScope@2418
-    functions('getFont': Name@336) = ArrayList@2743[1] { JavaMethodDescriptor@2744['getFont'] } // through LazyJavaClassMemberScope@2418
-    functions('getFontMetrics': Name@339) = ArrayList@2745[1] { JavaMethodDescriptor@2746['getFontMetrics'] } // through LazyJavaClassMemberScope@2418
-    functions('getFont_NoClientCode': Name@342) = ArrayList@2747[1] { JavaMethodDescriptor@2748['getFont_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getForeground': Name@345) = ArrayList@2749[1] { JavaMethodDescriptor@2750['getForeground'] } // through LazyJavaClassMemberScope@2418
-    functions('getGlassPane': Name@348) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getGraphics': Name@349) = ArrayList@2751[1] { JavaMethodDescriptor@2752['getGraphics'] } // through LazyJavaClassMemberScope@2418
-    functions('getGraphicsConfiguration': Name@352) = ArrayList@2753[1] { JavaMethodDescriptor@2754['getGraphicsConfiguration'] } // through LazyJavaClassMemberScope@2418
-    functions('getGraphicsConfiguration_NoClientCode': Name@355) = ArrayList@2755[1] { JavaMethodDescriptor@2756['getGraphicsConfiguration_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getGraphics_NoClientCode': Name@358) = ArrayList@2757[1] { JavaMethodDescriptor@2758['getGraphics_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getHWPeerAboveMe': Name@361) = ArrayList@2759[1] { JavaMethodDescriptor@2760['getHWPeerAboveMe'] } // through LazyJavaClassMemberScope@2418
-    functions('getHeavyweightContainer': Name@1661) = ArrayList@2761[1] { JavaMethodDescriptor@2762['getHeavyweightContainer'] } // through LazyJavaClassMemberScope@2418
-    functions('getHeight': Name@365) = ArrayList@2763[1] { JavaMethodDescriptor@2764['getHeight'] } // through LazyJavaClassMemberScope@2418
-    functions('getHierarchyBoundsListeners': Name@368) = ArrayList@2765[1] { JavaMethodDescriptor@2766['getHierarchyBoundsListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getHierarchyListeners': Name@371) = ArrayList@2767[1] { JavaMethodDescriptor@2768['getHierarchyListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getIconImage': Name@2769) = ArrayList@2770[1] { JavaMethodDescriptor@2771['getIconImage'] } // through LazyJavaClassMemberScope@2418
-    functions('getIconImages': Name@2772) = ArrayList@2773[1] { JavaMethodDescriptor@2774['getIconImages'] } // through LazyJavaClassMemberScope@2418
-    functions('getIgnoreRepaint': Name@376) = ArrayList@2775[1] { JavaMethodDescriptor@2776['getIgnoreRepaint'] } // through LazyJavaClassMemberScope@2418
-    functions('getInputContext': Name@2777) = ArrayList@2778[1] { JavaMethodDescriptor@2779['getInputContext'] } // through LazyJavaClassMemberScope@2418
-    functions('getInputMethodListeners': Name@382) = ArrayList@2780[1] { JavaMethodDescriptor@2781['getInputMethodListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getInputMethodRequests': Name@385) = ArrayList@2782[1] { JavaMethodDescriptor@2783['getInputMethodRequests'] } // through LazyJavaClassMemberScope@2418
-    functions('getInsets': Name@1678) = ArrayList@2784[1] { JavaMethodDescriptor@2785['getInsets'] } // through LazyJavaClassMemberScope@2418
-    functions('getInsets_NoClientCode': Name@389) = ArrayList@2786[1] { JavaMethodDescriptor@2787['getInsets_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getJMenuBar': Name@392) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getKeyListeners': Name@393) = ArrayList@2788[1] { JavaMethodDescriptor@2789['getKeyListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getLayeredPane': Name@396) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getLayout': Name@1685) = ArrayList@2790[1] { JavaMethodDescriptor@2791['getLayout'] } // through LazyJavaClassMemberScope@2418
-    functions('getListeners': Name@2792) = ArrayList@2793[1] { JavaMethodDescriptor@2794['getListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getListenersCount': Name@1691) = ArrayList@2795[1] { JavaMethodDescriptor@2796['getListenersCount'] } // through LazyJavaClassMemberScope@2418
-    functions('getLocale': Name@2797) = ArrayList@2798[1] { JavaMethodDescriptor@2799['getLocale'] } // through LazyJavaClassMemberScope@2418
-    functions('getLocation': Name@405) = ArrayList@2800[2] { JavaMethodDescriptor@2801['getLocation'], JavaMethodDescriptor@2802['getLocation'] } // through LazyJavaClassMemberScope@2418
-    functions('getLocationOnScreen': Name@409) = ArrayList@2803[1] { JavaMethodDescriptor@2804['getLocationOnScreen'] } // through LazyJavaClassMemberScope@2418
-    functions('getLocationOnScreen_NoTreeLock': Name@412) = ArrayList@2805[1] { JavaMethodDescriptor@2806['getLocationOnScreen_NoTreeLock'] } // through LazyJavaClassMemberScope@2418
-    functions('getLocationOnWindow': Name@2807) = ArrayList@2808[1] { JavaMethodDescriptor@2809['getLocationOnWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('getMaximizedBounds': Name@2810) = ArrayList@2811[1] { JavaMethodDescriptor@2812['getMaximizedBounds'] } // through LazyJavaClassMemberScope@2418
-    functions('getMaximumSize': Name@1705) = ArrayList@2813[1] { JavaMethodDescriptor@2814['getMaximumSize'] } // through LazyJavaClassMemberScope@2418
-    functions('getMenuBar': Name@2815) = ArrayList@2816[1] { JavaMethodDescriptor@2817['getMenuBar'] } // through LazyJavaClassMemberScope@2418
-    functions('getMinimumSize': Name@1708) = ArrayList@2818[1] { JavaMethodDescriptor@2819['getMinimumSize'] } // through LazyJavaClassMemberScope@2418
-    functions('getModalBlocker': Name@2820) = ArrayList@2821[1] { JavaMethodDescriptor@2822['getModalBlocker'] } // through LazyJavaClassMemberScope@2418
-    functions('getModalExclusionType': Name@2823) = ArrayList@2824[1] { JavaMethodDescriptor@2825['getModalExclusionType'] } // through LazyJavaClassMemberScope@2418
-    functions('getMostRecentFocusOwner': Name@2826) = ArrayList@2827[1] { JavaMethodDescriptor@2828['getMostRecentFocusOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('getMouseEventTarget': Name@1711) = ArrayList@2829[3] { JavaMethodDescriptor@2830['getMouseEventTarget'], JavaMethodDescriptor@2831['getMouseEventTarget'], JavaMethodDescriptor@2832['getMouseEventTarget'] } // through LazyJavaClassMemberScope@2418
-    functions('getMouseEventTargetImpl': Name@1716) = ArrayList@2833[2] { JavaMethodDescriptor@2834['getMouseEventTargetImpl'], JavaMethodDescriptor@2835['getMouseEventTargetImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('getMouseListeners': Name@431) = ArrayList@2836[1] { JavaMethodDescriptor@2837['getMouseListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getMouseMotionListeners': Name@434) = ArrayList@2838[1] { JavaMethodDescriptor@2839['getMouseMotionListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getMousePosition': Name@1724) = ArrayList@2840[2] { JavaMethodDescriptor@2841['getMousePosition'], JavaMethodDescriptor@2842['getMousePosition'] } // through LazyJavaClassMemberScope@2418
-    functions('getMouseWheelListeners': Name@440) = ArrayList@2843[1] { JavaMethodDescriptor@2844['getMouseWheelListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getName': Name@443) = ArrayList@2845[1] { JavaMethodDescriptor@2846['getName'] } // through LazyJavaClassMemberScope@2418
-    functions('getNativeContainer': Name@446) = ArrayList@2847[1] { JavaMethodDescriptor@2848['getNativeContainer'] } // through LazyJavaClassMemberScope@2418
-    functions('getNextFocusCandidate': Name@449) = ArrayList@2849[1] { JavaMethodDescriptor@2850['getNextFocusCandidate'] } // through LazyJavaClassMemberScope@2418
-    functions('getNormalShape': Name@452) = ArrayList@2851[1] { JavaMethodDescriptor@2852['getNormalShape'] } // through LazyJavaClassMemberScope@2418
-    functions('getObjectLock': Name@455) = ArrayList@2853[1] { JavaMethodDescriptor@2854['getObjectLock'] } // through LazyJavaClassMemberScope@2418
-    functions('getOpacity': Name@2855) = ArrayList@2856[1] { JavaMethodDescriptor@2857['getOpacity'] } // through LazyJavaClassMemberScope@2418
-    functions('getOpaqueShape': Name@1740) = ArrayList@2858[1] { JavaMethodDescriptor@2859['getOpaqueShape'] } // through LazyJavaClassMemberScope@2418
-    functions('getOwnedWindows': Name@2860) = ArrayList@2861[1] { JavaMethodDescriptor@2862['getOwnedWindows'] } // through LazyJavaClassMemberScope@2418
-    functions('getOwnedWindows_NoClientCode': Name@2863) = ArrayList@2864[1] { JavaMethodDescriptor@2865['getOwnedWindows_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getOwner': Name@2866) = ArrayList@2867[1] { JavaMethodDescriptor@2868['getOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('getOwner_NoClientCode': Name@2869) = ArrayList@2870[1] { JavaMethodDescriptor@2871['getOwner_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getParent': Name@466) = ArrayList@2872[1] { JavaMethodDescriptor@2873['getParent'] } // through LazyJavaClassMemberScope@2418
-    functions('getParent_NoClientCode': Name@469) = ArrayList@2874[1] { JavaMethodDescriptor@2875['getParent_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('getPeer': Name@472) = ArrayList@2876[1] { JavaMethodDescriptor@2877['getPeer'] } // through LazyJavaClassMemberScope@2418
-    functions('getPreferredSize': Name@1749) = ArrayList@2878[1] { JavaMethodDescriptor@2879['getPreferredSize'] } // through LazyJavaClassMemberScope@2418
-    functions('getPropertyChangeListeners': Name@478) = ArrayList@2880[2] { JavaMethodDescriptor@2881['getPropertyChangeListeners'], JavaMethodDescriptor@2882['getPropertyChangeListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getRootPane': Name@482) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getShape': Name@2883) = ArrayList@2884[1] { JavaMethodDescriptor@2885['getShape'] } // through LazyJavaClassMemberScope@2418
-    functions('getSiblingIndexAbove': Name@484) = ArrayList@2886[1] { JavaMethodDescriptor@2887['getSiblingIndexAbove'] } // through LazyJavaClassMemberScope@2418
-    functions('getSiblingIndexBelow': Name@487) = ArrayList@2888[1] { JavaMethodDescriptor@2889['getSiblingIndexBelow'] } // through LazyJavaClassMemberScope@2418
-    functions('getSize': Name@490) = ArrayList@2890[2] { JavaMethodDescriptor@2891['getSize'], JavaMethodDescriptor@2892['getSize'] } // through LazyJavaClassMemberScope@2418
-    functions('getState': Name@2893) = ArrayList@2894[1] { JavaMethodDescriptor@2895['getState'] } // through LazyJavaClassMemberScope@2418
-    functions('getTemporaryLostComponent': Name@2896) = ArrayList@2897[1] { JavaMethodDescriptor@2898['getTemporaryLostComponent'] } // through LazyJavaClassMemberScope@2418
-    functions('getTitle': Name@2899) = ArrayList@2900[1] { JavaMethodDescriptor@2901['getTitle'] } // through LazyJavaClassMemberScope@2418
-    functions('getToolkit': Name@2902) = ArrayList@2903[1] { JavaMethodDescriptor@2904['getToolkit'] } // through LazyJavaClassMemberScope@2418
-    functions('getToolkitImpl': Name@500) = ArrayList@2905[1] { JavaMethodDescriptor@2906['getToolkitImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('getTopmostComponentIndex': Name@1766) = ArrayList@2907[1] { JavaMethodDescriptor@2908['getTopmostComponentIndex'] } // through LazyJavaClassMemberScope@2418
-    functions('getTransferHandler': Name@504) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('getTraversalRoot': Name@1769) = ArrayList@2909[1] { JavaMethodDescriptor@2910['getTraversalRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('getTreeLock': Name@508) = ArrayList@2911[1] { JavaMethodDescriptor@2912['getTreeLock'] } // through LazyJavaClassMemberScope@2418
-    functions('getType': Name@2913) = ArrayList@2914[1] { JavaMethodDescriptor@2915['getType'] } // through LazyJavaClassMemberScope@2418
-    functions('getWarningString': Name@2916) = ArrayList@2917[1] { JavaMethodDescriptor@2918['getWarningString'] } // through LazyJavaClassMemberScope@2418
-    functions('getWidth': Name@513) = ArrayList@2919[1] { JavaMethodDescriptor@2920['getWidth'] } // through LazyJavaClassMemberScope@2418
-    functions('getWindowFocusListeners': Name@2921) = ArrayList@2922[1] { JavaMethodDescriptor@2923['getWindowFocusListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getWindowListeners': Name@2924) = ArrayList@2925[1] { JavaMethodDescriptor@2926['getWindowListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getWindowStateListeners': Name@2927) = ArrayList@2928[1] { JavaMethodDescriptor@2929['getWindowStateListeners'] } // through LazyJavaClassMemberScope@2418
-    functions('getX': Name@519) = ArrayList@2930[1] { JavaMethodDescriptor@2931['getX'] } // through LazyJavaClassMemberScope@2418
-    functions('getY': Name@522) = ArrayList@2932[1] { JavaMethodDescriptor@2933['getY'] } // through LazyJavaClassMemberScope@2418
-    functions('gotFocus': Name@525) = ArrayList@2934[1] { JavaMethodDescriptor@2935['gotFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('handleEvent': Name@528) = ArrayList@2936[1] { JavaMethodDescriptor@2937['handleEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('hasFocus': Name@531) = ArrayList@2938[1] { JavaMethodDescriptor@2939['hasFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('hasHeavyweightDescendants': Name@1786) = ArrayList@2940[1] { JavaMethodDescriptor@2941['hasHeavyweightDescendants'] } // through LazyJavaClassMemberScope@2418
-    functions('hasLightweightDescendants': Name@1789) = ArrayList@2942[1] { JavaMethodDescriptor@2943['hasLightweightDescendants'] } // through LazyJavaClassMemberScope@2418
-    functions('hashCode': Name@536) = ArrayList@2944[1] { DeserializedSimpleFunctionDescriptor@2945['hashCode'] } // through LazyJavaClassMemberScope@2418
-    functions('hide': Name@2946) = ArrayList@2947[1] { JavaMethodDescriptor@2948['hide'] } // through LazyJavaClassMemberScope@2418
-    functions('imageUpdate': Name@542) = ArrayList@2949[1] { JavaMethodDescriptor@2950['imageUpdate'] } // through LazyJavaClassMemberScope@2418
-    functions('increaseComponentCount': Name@1798) = ArrayList@2951[1] { JavaMethodDescriptor@2952['increaseComponentCount'] } // through LazyJavaClassMemberScope@2418
-    functions('init': Name@2953) = ArrayList@2954[2] { JavaMethodDescriptor@2955['init'], JavaMethodDescriptor@2956['init'] } // through LazyJavaClassMemberScope@2418
-    functions('initDeserializedWindow': Name@2957) = ArrayList@2958[1] { JavaMethodDescriptor@2959['initDeserializedWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('initGC': Name@2960) = ArrayList@2961[1] { JavaMethodDescriptor@2962['initGC'] } // through LazyJavaClassMemberScope@2418
-    functions('initializeFocusTraversalKeys': Name@1801) = ArrayList@2963[1] { JavaMethodDescriptor@2964['initializeFocusTraversalKeys'] } // through LazyJavaClassMemberScope@2418
-    functions('insets': Name@1804) = ArrayList@2965[1] { JavaMethodDescriptor@2966['insets'] } // through LazyJavaClassMemberScope@2418
-    functions('inside': Name@553) = ArrayList@2967[1] { JavaMethodDescriptor@2968['inside'] } // through LazyJavaClassMemberScope@2418
-    functions('invalidate': Name@1809) = ArrayList@2969[1] { JavaMethodDescriptor@2970['invalidate'] } // through LazyJavaClassMemberScope@2418
-    functions('invalidateIfValid': Name@559) = ArrayList@2971[1] { JavaMethodDescriptor@2972['invalidateIfValid'] } // through LazyJavaClassMemberScope@2418
-    functions('invalidateParent': Name@1814) = ArrayList@2973[1] { JavaMethodDescriptor@2974['invalidateParent'] } // through LazyJavaClassMemberScope@2418
-    functions('invalidateTree': Name@1817) = ArrayList@2975[1] { JavaMethodDescriptor@2976['invalidateTree'] } // through LazyJavaClassMemberScope@2418
-    functions('isActive': Name@2977) = ArrayList@2978[1] { JavaMethodDescriptor@2979['isActive'] } // through LazyJavaClassMemberScope@2418
-    functions('isAlwaysOnTop': Name@2980) = ArrayList@2981[1] { JavaMethodDescriptor@2982['isAlwaysOnTop'] } // through LazyJavaClassMemberScope@2418
-    functions('isAlwaysOnTopSupported': Name@2983) = ArrayList@2984[1] { JavaMethodDescriptor@2985['isAlwaysOnTopSupported'] } // through LazyJavaClassMemberScope@2418
-    functions('isAncestorOf': Name@1820) = ArrayList@2986[1] { JavaMethodDescriptor@2987['isAncestorOf'] } // through LazyJavaClassMemberScope@2418
-    functions('isAutoFocusTransferOnDisposal': Name@570) = ArrayList@2988[1] { JavaMethodDescriptor@2989['isAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@2418
-    functions('isAutoRequestFocus': Name@2990) = ArrayList@2991[1] { JavaMethodDescriptor@2992['isAutoRequestFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('isBackgroundSet': Name@574) = ArrayList@2993[1] { JavaMethodDescriptor@2994['isBackgroundSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isCoalescingEnabled': Name@577) = ArrayList@2995[1] { JavaMethodDescriptor@2996['isCoalescingEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('isCursorSet': Name@580) = ArrayList@2997[1] { JavaMethodDescriptor@2998['isCursorSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isDisplayable': Name@583) = ArrayList@2999[1] { JavaMethodDescriptor@3000['isDisplayable'] } // through LazyJavaClassMemberScope@2418
-    functions('isDisposing': Name@3001) = ArrayList@3002[1] { JavaMethodDescriptor@3003['isDisposing'] } // through LazyJavaClassMemberScope@2418
-    functions('isDoubleBuffered': Name@587) = ArrayList@3004[1] { JavaMethodDescriptor@3005['isDoubleBuffered'] } // through LazyJavaClassMemberScope@2418
-    functions('isEnabled': Name@590) = ArrayList@3006[1] { JavaMethodDescriptor@3007['isEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('isEnabledImpl': Name@593) = ArrayList@3008[1] { JavaMethodDescriptor@3009['isEnabledImpl'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusCycleRoot': Name@3010) = ArrayList@3011[2] { JavaMethodDescriptor@3012['isFocusCycleRoot'], JavaMethodDescriptor@3013['isFocusCycleRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusOwner': Name@599) = ArrayList@3014[1] { JavaMethodDescriptor@3015['isFocusOwner'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusTraversable': Name@602) = ArrayList@3016[1] { JavaMethodDescriptor@3017['isFocusTraversable'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusTraversableOverridden': Name@605) = ArrayList@3018[1] { JavaMethodDescriptor@3019['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusTraversalPolicyProvider': Name@1849) = ArrayList@3020[1] { JavaMethodDescriptor@3021['isFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusTraversalPolicySet': Name@1852) = ArrayList@3022[1] { JavaMethodDescriptor@3023['isFocusTraversalPolicySet'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusable': Name@610) = ArrayList@3024[1] { JavaMethodDescriptor@3025['isFocusable'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocusableWindow': Name@3026) = ArrayList@3027[1] { JavaMethodDescriptor@3028['isFocusableWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('isFocused': Name@3029) = ArrayList@3030[1] { JavaMethodDescriptor@3031['isFocused'] } // through LazyJavaClassMemberScope@2418
-    functions('isFontSet': Name@615) = ArrayList@3032[1] { JavaMethodDescriptor@3033['isFontSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isForegroundSet': Name@618) = ArrayList@3034[1] { JavaMethodDescriptor@3035['isForegroundSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isFrameStateSupported': Name@3036) = ArrayList@3037[1] { JavaMethodDescriptor@3038['isFrameStateSupported'] } // through LazyJavaClassMemberScope@2418
-    functions('isLightweight': Name@622) = ArrayList@3039[1] { JavaMethodDescriptor@3040['isLightweight'] } // through LazyJavaClassMemberScope@2418
-    functions('isLocationByPlatform': Name@3041) = ArrayList@3042[1] { JavaMethodDescriptor@3043['isLocationByPlatform'] } // through LazyJavaClassMemberScope@2418
-    functions('isMaximumSizeSet': Name@626) = ArrayList@3044[1] { JavaMethodDescriptor@3045['isMaximumSizeSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isMinimumSizeSet': Name@629) = ArrayList@3046[1] { JavaMethodDescriptor@3047['isMinimumSizeSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isMixingNeeded': Name@632) = ArrayList@3048[1] { JavaMethodDescriptor@3049['isMixingNeeded'] } // through LazyJavaClassMemberScope@2418
-    functions('isModalBlocked': Name@3050) = ArrayList@3051[1] { JavaMethodDescriptor@3052['isModalBlocked'] } // through LazyJavaClassMemberScope@2418
-    functions('isModalExcluded': Name@3053) = ArrayList@3054[1] { JavaMethodDescriptor@3055['isModalExcluded'] } // through LazyJavaClassMemberScope@2418
-    functions('isNonOpaqueForMixing': Name@637) = ArrayList@3056[1] { JavaMethodDescriptor@3057['isNonOpaqueForMixing'] } // through LazyJavaClassMemberScope@2418
-    functions('isOpaque': Name@3058) = ArrayList@3059[1] { JavaMethodDescriptor@3060['isOpaque'] } // through LazyJavaClassMemberScope@2418
-    functions('isParentOf': Name@1873) = ArrayList@3061[1] { JavaMethodDescriptor@3062['isParentOf'] } // through LazyJavaClassMemberScope@2418
-    functions('isPreferredSizeSet': Name@644) = ArrayList@3063[1] { JavaMethodDescriptor@3064['isPreferredSizeSet'] } // through LazyJavaClassMemberScope@2418
-    functions('isRecursivelyVisible': Name@3065) = ArrayList@3066[1] { JavaMethodDescriptor@3067['isRecursivelyVisible'] } // through LazyJavaClassMemberScope@2418
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@1880) = ArrayList@3068[1] { JavaMethodDescriptor@3069['isRecursivelyVisibleUpToHeavyweightContainer'] } // through LazyJavaClassMemberScope@2418
-    functions('isRequestFocusAccepted': Name@651) = ArrayList@3070[1] { JavaMethodDescriptor@3071['isRequestFocusAccepted'] } // through LazyJavaClassMemberScope@2418
-    functions('isResizable': Name@3072) = ArrayList@3073[1] { JavaMethodDescriptor@3074['isResizable'] } // through LazyJavaClassMemberScope@2418
-    functions('isRootPaneCheckingEnabled': Name@655) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('isSameOrAncestorOf': Name@1885) = ArrayList@3075[1] { JavaMethodDescriptor@3076['isSameOrAncestorOf'] } // through LazyJavaClassMemberScope@2418
-    functions('isShowing': Name@3077) = ArrayList@3078[1] { JavaMethodDescriptor@3079['isShowing'] } // through LazyJavaClassMemberScope@2418
-    functions('isUndecorated': Name@3080) = ArrayList@3081[1] { JavaMethodDescriptor@3082['isUndecorated'] } // through LazyJavaClassMemberScope@2418
-    functions('isValid': Name@663) = ArrayList@3083[1] { JavaMethodDescriptor@3084['isValid'] } // through LazyJavaClassMemberScope@2418
-    functions('isValidateRoot': Name@3085) = ArrayList@3086[1] { JavaMethodDescriptor@3087['isValidateRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('isVisible': Name@667) = ArrayList@3088[1] { JavaMethodDescriptor@3089['isVisible'] } // through LazyJavaClassMemberScope@2418
-    functions('isVisible_NoClientCode': Name@670) = ArrayList@3090[1] { JavaMethodDescriptor@3091['isVisible_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('keyDown': Name@673) = ArrayList@3092[1] { JavaMethodDescriptor@3093['keyDown'] } // through LazyJavaClassMemberScope@2418
-    functions('keyUp': Name@676) = ArrayList@3094[1] { JavaMethodDescriptor@3095['keyUp'] } // through LazyJavaClassMemberScope@2418
-    functions('layout': Name@1903) = ArrayList@3096[1] { JavaMethodDescriptor@3097['layout'] } // through LazyJavaClassMemberScope@2418
-    functions('lightweightPaint': Name@1906) = ArrayList@3098[1] { JavaMethodDescriptor@3099['lightweightPaint'] } // through LazyJavaClassMemberScope@2418
-    functions('lightweightPrint': Name@1909) = ArrayList@3100[1] { JavaMethodDescriptor@3101['lightweightPrint'] } // through LazyJavaClassMemberScope@2418
-    functions('list': Name@1912) = ArrayList@3102[5] { JavaMethodDescriptor@3103['list'], JavaMethodDescriptor@3104['list'], JavaMethodDescriptor@3105['list'], ... } // through LazyJavaClassMemberScope@2418
-    functions('locate': Name@1917) = ArrayList@3106[1] { JavaMethodDescriptor@3107['locate'] } // through LazyJavaClassMemberScope@2418
-    functions('location': Name@696) = ArrayList@3108[1] { JavaMethodDescriptor@3109['location'] } // through LazyJavaClassMemberScope@2418
-    functions('location_NoClientCode': Name@699) = ArrayList@3110[1] { JavaMethodDescriptor@3111['location_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('lostFocus': Name@702) = ArrayList@3112[1] { JavaMethodDescriptor@3113['lostFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('minimumSize': Name@1926) = ArrayList@3114[1] { JavaMethodDescriptor@3115['minimumSize'] } // through LazyJavaClassMemberScope@2418
-    functions('mixOnHiding': Name@1929) = ArrayList@3116[1] { JavaMethodDescriptor@3117['mixOnHiding'] } // through LazyJavaClassMemberScope@2418
-    functions('mixOnReshaping': Name@3118) = ArrayList@3119[1] { JavaMethodDescriptor@3120['mixOnReshaping'] } // through LazyJavaClassMemberScope@2418
-    functions('mixOnShowing': Name@1935) = ArrayList@3121[1] { JavaMethodDescriptor@3122['mixOnShowing'] } // through LazyJavaClassMemberScope@2418
-    functions('mixOnValidating': Name@1938) = ArrayList@3123[1] { JavaMethodDescriptor@3124['mixOnValidating'] } // through LazyJavaClassMemberScope@2418
-    functions('mixOnZOrderChanging': Name@1941) = ArrayList@3125[1] { JavaMethodDescriptor@3126['mixOnZOrderChanging'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseDown': Name@723) = ArrayList@3127[1] { JavaMethodDescriptor@3128['mouseDown'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseDrag': Name@726) = ArrayList@3129[1] { JavaMethodDescriptor@3130['mouseDrag'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseEnter': Name@729) = ArrayList@3131[1] { JavaMethodDescriptor@3132['mouseEnter'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseExit': Name@732) = ArrayList@3133[1] { JavaMethodDescriptor@3134['mouseExit'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseMove': Name@735) = ArrayList@3135[1] { JavaMethodDescriptor@3136['mouseMove'] } // through LazyJavaClassMemberScope@2418
-    functions('mouseUp': Name@738) = ArrayList@3137[1] { JavaMethodDescriptor@3138['mouseUp'] } // through LazyJavaClassMemberScope@2418
-    functions('move': Name@741) = ArrayList@3139[1] { JavaMethodDescriptor@3140['move'] } // through LazyJavaClassMemberScope@2418
-    functions('nextFocus': Name@744) = ArrayList@3141[1] { JavaMethodDescriptor@3142['nextFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('notifyNewBounds': Name@749) = ArrayList@3143[1] { JavaMethodDescriptor@3144['notifyNewBounds'] } // through LazyJavaClassMemberScope@2418
-    functions('numListening': Name@1962) = ArrayList@3145[1] { JavaMethodDescriptor@3146['numListening'] } // through LazyJavaClassMemberScope@2418
-    functions('ownedInit': Name@3147) = ArrayList@3148[1] { JavaMethodDescriptor@3149['ownedInit'] } // through LazyJavaClassMemberScope@2418
-    functions('pack': Name@3150) = ArrayList@3151[1] { JavaMethodDescriptor@3152['pack'] } // through LazyJavaClassMemberScope@2418
-    functions('paint': Name@3153) = ArrayList@3154[1] { JavaMethodDescriptor@3155['paint'] } // through LazyJavaClassMemberScope@2418
-    functions('paintAll': Name@760) = ArrayList@3156[1] { JavaMethodDescriptor@3157['paintAll'] } // through LazyJavaClassMemberScope@2418
-    functions('paintComponents': Name@1970) = ArrayList@3158[1] { JavaMethodDescriptor@3159['paintComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('paintHeavyweightComponents': Name@1973) = ArrayList@3160[1] { JavaMethodDescriptor@3161['paintHeavyweightComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('paramString': Name@3162) = ArrayList@3163[1] { JavaMethodDescriptor@3164['paramString'] } // through LazyJavaClassMemberScope@2418
-    functions('pointRelativeToComponent': Name@770) = ArrayList@3165[1] { JavaMethodDescriptor@3166['pointRelativeToComponent'] } // through LazyJavaClassMemberScope@2418
-    functions('postEvent': Name@3167) = ArrayList@3168[1] { JavaMethodDescriptor@3169['postEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('postProcessKeyEvent': Name@3170) = ArrayList@3171[1] { JavaMethodDescriptor@3172['postProcessKeyEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('postWindowEvent': Name@3173) = ArrayList@3174[1] { JavaMethodDescriptor@3175['postWindowEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('postsOldMouseEvents': Name@1986) = ArrayList@3176[1] { JavaMethodDescriptor@3177['postsOldMouseEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('preProcessKeyEvent': Name@3178) = ArrayList@3179[1] { JavaMethodDescriptor@3180['preProcessKeyEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('preferredSize': Name@1992) = ArrayList@3181[1] { JavaMethodDescriptor@3182['preferredSize'] } // through LazyJavaClassMemberScope@2418
-    functions('prepareImage': Name@785) = ArrayList@3183[2] { JavaMethodDescriptor@3184['prepareImage'], JavaMethodDescriptor@3185['prepareImage'] } // through LazyJavaClassMemberScope@2418
-    functions('print': Name@1998) = ArrayList@3186[1] { JavaMethodDescriptor@3187['print'] } // through LazyJavaClassMemberScope@2418
-    functions('printAll': Name@792) = ArrayList@3188[1] { JavaMethodDescriptor@3189['printAll'] } // through LazyJavaClassMemberScope@2418
-    functions('printComponents': Name@2003) = ArrayList@3190[1] { JavaMethodDescriptor@3191['printComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('printHeavyweightComponents': Name@2006) = ArrayList@3192[1] { JavaMethodDescriptor@3193['printHeavyweightComponents'] } // through LazyJavaClassMemberScope@2418
-    functions('processComponentEvent': Name@799) = ArrayList@3194[1] { JavaMethodDescriptor@3195['processComponentEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processContainerEvent': Name@2011) = ArrayList@3196[1] { JavaMethodDescriptor@3197['processContainerEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processEvent': Name@3198) = ArrayList@3199[1] { JavaMethodDescriptor@3200['processEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processFocusEvent': Name@806) = ArrayList@3201[1] { JavaMethodDescriptor@3202['processFocusEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processHierarchyBoundsEvent': Name@809) = ArrayList@3203[1] { JavaMethodDescriptor@3204['processHierarchyBoundsEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processHierarchyEvent': Name@812) = ArrayList@3205[1] { JavaMethodDescriptor@3206['processHierarchyEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processInputMethodEvent': Name@815) = ArrayList@3207[1] { JavaMethodDescriptor@3208['processInputMethodEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processKeyEvent': Name@818) = ArrayList@3209[1] { JavaMethodDescriptor@3210['processKeyEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processMouseEvent': Name@821) = ArrayList@3211[1] { JavaMethodDescriptor@3212['processMouseEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processMouseMotionEvent': Name@824) = ArrayList@3213[1] { JavaMethodDescriptor@3214['processMouseMotionEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processMouseWheelEvent': Name@827) = ArrayList@3215[1] { JavaMethodDescriptor@3216['processMouseWheelEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processWindowEvent': Name@3217) = ArrayList@3218[1] { JavaMethodDescriptor@3219['processWindowEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processWindowFocusEvent': Name@3220) = ArrayList@3221[1] { JavaMethodDescriptor@3222['processWindowFocusEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('processWindowStateEvent': Name@3223) = ArrayList@3224[1] { JavaMethodDescriptor@3225['processWindowStateEvent'] } // through LazyJavaClassMemberScope@2418
-    functions('proxyEnableEvents': Name@2033) = ArrayList@3226[1] { JavaMethodDescriptor@3227['proxyEnableEvents'] } // through LazyJavaClassMemberScope@2418
-    functions('readObject': Name@3228) = ArrayList@3229[1] { JavaMethodDescriptor@3230['readObject'] } // through LazyJavaClassMemberScope@2418
-    functions('recursiveApplyCurrentShape': Name@2039) = ArrayList@3231[3] { JavaMethodDescriptor@3232['recursiveApplyCurrentShape'], JavaMethodDescriptor@3233['recursiveApplyCurrentShape'], JavaMethodDescriptor@3234['recursiveApplyCurrentShape'] } // through LazyJavaClassMemberScope@2418
-    functions('recursiveHideHeavyweightChildren': Name@2044) = ArrayList@3235[1] { JavaMethodDescriptor@3236['recursiveHideHeavyweightChildren'] } // through LazyJavaClassMemberScope@2418
-    functions('recursiveRelocateHeavyweightChildren': Name@2047) = ArrayList@3237[1] { JavaMethodDescriptor@3238['recursiveRelocateHeavyweightChildren'] } // through LazyJavaClassMemberScope@2418
-    functions('recursiveShowHeavyweightChildren': Name@2050) = ArrayList@3239[1] { JavaMethodDescriptor@3240['recursiveShowHeavyweightChildren'] } // through LazyJavaClassMemberScope@2418
-    functions('recursiveSubtractAndApplyShape': Name@2053) = ArrayList@3241[3] { JavaMethodDescriptor@3242['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@3243['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@3244['recursiveSubtractAndApplyShape'] } // through LazyJavaClassMemberScope@2418
-    functions('relocateComponent': Name@842) = ArrayList@3245[1] { JavaMethodDescriptor@3246['relocateComponent'] } // through LazyJavaClassMemberScope@2418
-    functions('remove': Name@3247) = ArrayList@3248[2] { JavaMethodDescriptor@3249['remove'], JavaMethodDescriptor@3250['remove'] } // through LazyJavaClassMemberScope@2418
-    functions('removeAll': Name@2064) = ArrayList@3251[1] { JavaMethodDescriptor@3252['removeAll'] } // through LazyJavaClassMemberScope@2418
-    functions('removeComponentListener': Name@849) = ArrayList@3253[1] { JavaMethodDescriptor@3254['removeComponentListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeContainerListener': Name@2069) = ArrayList@3255[1] { JavaMethodDescriptor@3256['removeContainerListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeDelicately': Name@2072) = ArrayList@3257[1] { JavaMethodDescriptor@3258['removeDelicately'] } // through LazyJavaClassMemberScope@2418
-    functions('removeFocusListener': Name@854) = ArrayList@3259[1] { JavaMethodDescriptor@3260['removeFocusListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeFromWindowList': Name@3261) = ArrayList@3262[1] { JavaMethodDescriptor@3263['removeFromWindowList'] } // through LazyJavaClassMemberScope@2418
-    functions('removeHierarchyBoundsListener': Name@858) = ArrayList@3264[1] { JavaMethodDescriptor@3265['removeHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeHierarchyListener': Name@861) = ArrayList@3266[1] { JavaMethodDescriptor@3267['removeHierarchyListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeInputMethodListener': Name@864) = ArrayList@3268[1] { JavaMethodDescriptor@3269['removeInputMethodListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeKeyListener': Name@867) = ArrayList@3270[1] { JavaMethodDescriptor@3271['removeKeyListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeMouseListener': Name@870) = ArrayList@3272[1] { JavaMethodDescriptor@3273['removeMouseListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeMouseMotionListener': Name@873) = ArrayList@3274[1] { JavaMethodDescriptor@3275['removeMouseMotionListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeMouseWheelListener': Name@876) = ArrayList@3276[1] { JavaMethodDescriptor@3277['removeMouseWheelListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeNotify': Name@3278) = ArrayList@3279[1] { JavaMethodDescriptor@3280['removeNotify'] } // through LazyJavaClassMemberScope@2418
-    functions('removeOwnedWindow': Name@3281) = ArrayList@3282[1] { JavaMethodDescriptor@3283['removeOwnedWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('removePropertyChangeListener': Name@883) = ArrayList@3284[2] { JavaMethodDescriptor@3285['removePropertyChangeListener'], JavaMethodDescriptor@3286['removePropertyChangeListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeWindowFocusListener': Name@3287) = ArrayList@3288[1] { JavaMethodDescriptor@3289['removeWindowFocusListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeWindowListener': Name@3290) = ArrayList@3291[1] { JavaMethodDescriptor@3292['removeWindowListener'] } // through LazyJavaClassMemberScope@2418
-    functions('removeWindowStateListener': Name@3293) = ArrayList@3294[1] { JavaMethodDescriptor@3295['removeWindowStateListener'] } // through LazyJavaClassMemberScope@2418
-    functions('repaint': Name@890) = ArrayList@3296[4] { JavaMethodDescriptor@3297['repaint'], JavaMethodDescriptor@3298['repaint'], JavaMethodDescriptor@3299['repaint'], ... } // through LazyJavaClassMemberScope@2418
-    functions('repaintParentIfNeeded': Name@895) = ArrayList@3300[1] { JavaMethodDescriptor@3301['repaintParentIfNeeded'] } // through LazyJavaClassMemberScope@2418
-    functions('reparentChild': Name@2103) = ArrayList@3302[1] { JavaMethodDescriptor@3303['reparentChild'] } // through LazyJavaClassMemberScope@2418
-    functions('reparentTraverse': Name@2106) = ArrayList@3304[1] { JavaMethodDescriptor@3305['reparentTraverse'] } // through LazyJavaClassMemberScope@2418
-    functions('requestFocus': Name@900) = ArrayList@3306[3] { JavaMethodDescriptor@3307['requestFocus'], JavaMethodDescriptor@3308['requestFocus'], JavaMethodDescriptor@3309['requestFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('requestFocusHelper': Name@905) = ArrayList@3310[2] { JavaMethodDescriptor@3311['requestFocusHelper'], JavaMethodDescriptor@3312['requestFocusHelper'] } // through LazyJavaClassMemberScope@2418
-    functions('requestFocusInWindow': Name@909) = ArrayList@3313[3] { JavaMethodDescriptor@3314['requestFocusInWindow'], JavaMethodDescriptor@3315['requestFocusInWindow'], JavaMethodDescriptor@3316['requestFocusInWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('reshape': Name@3317) = ArrayList@3318[1] { JavaMethodDescriptor@3319['reshape'] } // through LazyJavaClassMemberScope@2418
-    functions('reshapeNativePeer': Name@917) = ArrayList@3320[1] { JavaMethodDescriptor@3321['reshapeNativePeer'] } // through LazyJavaClassMemberScope@2418
-    functions('resize': Name@920) = ArrayList@3322[2] { JavaMethodDescriptor@3323['resize'], JavaMethodDescriptor@3324['resize'] } // through LazyJavaClassMemberScope@2418
-    functions('revalidate': Name@924) = ArrayList@3325[1] { JavaMethodDescriptor@3326['revalidate'] } // through LazyJavaClassMemberScope@2418
-    functions('setAlwaysOnTop': Name@3327) = ArrayList@3328[1] { JavaMethodDescriptor@3329['setAlwaysOnTop'] } // through LazyJavaClassMemberScope@2418
-    functions('setAutoFocusTransferOnDisposal': Name@928) = ArrayList@3330[1] { JavaMethodDescriptor@3331['setAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@2418
-    functions('setAutoRequestFocus': Name@3332) = ArrayList@3333[1] { JavaMethodDescriptor@3334['setAutoRequestFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('setBackground': Name@3335) = ArrayList@3336[1] { JavaMethodDescriptor@3337['setBackground'] } // through LazyJavaClassMemberScope@2418
-    functions('setBounds': Name@3338) = ArrayList@3339[2] { JavaMethodDescriptor@3340['setBounds'], JavaMethodDescriptor@3341['setBounds'] } // through LazyJavaClassMemberScope@2418
-    functions('setBoundsOp': Name@939) = ArrayList@3342[1] { JavaMethodDescriptor@3343['setBoundsOp'] } // through LazyJavaClassMemberScope@2418
-    functions('setClientSize': Name@3344) = ArrayList@3345[1] { JavaMethodDescriptor@3346['setClientSize'] } // through LazyJavaClassMemberScope@2418
-    functions('setComponentOrientation': Name@943) = ArrayList@3347[1] { JavaMethodDescriptor@3348['setComponentOrientation'] } // through LazyJavaClassMemberScope@2418
-    functions('setComponentZOrder': Name@2140) = ArrayList@3349[1] { JavaMethodDescriptor@3350['setComponentZOrder'] } // through LazyJavaClassMemberScope@2418
-    functions('setContentPane': Name@947) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setCursor': Name@3351) = ArrayList@3352[1] { JavaMethodDescriptor@3353['setCursor'] } // through LazyJavaClassMemberScope@2418
-    functions('setDefaultCloseOperation': Name@951) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setDropTarget': Name@952) = ArrayList@3354[1] { JavaMethodDescriptor@3355['setDropTarget'] } // through LazyJavaClassMemberScope@2418
-    functions('setEnabled': Name@955) = ArrayList@3356[1] { JavaMethodDescriptor@3357['setEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('setExtendedState': Name@3358) = ArrayList@3359[1] { JavaMethodDescriptor@3360['setExtendedState'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusCycleRoot': Name@3361) = ArrayList@3362[1] { JavaMethodDescriptor@3363['setFocusCycleRoot'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusTraversalKeys': Name@2152) = ArrayList@3364[1] { JavaMethodDescriptor@3365['setFocusTraversalKeys'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusTraversalKeysEnabled': Name@963) = ArrayList@3366[1] { JavaMethodDescriptor@3367['setFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusTraversalKeys_NoIDCheck': Name@966) = ArrayList@3368[1] { JavaMethodDescriptor@3369['setFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusTraversalPolicy': Name@2159) = ArrayList@3370[1] { JavaMethodDescriptor@3371['setFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusTraversalPolicyProvider': Name@2162) = ArrayList@3372[1] { JavaMethodDescriptor@3373['setFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusable': Name@971) = ArrayList@3374[1] { JavaMethodDescriptor@3375['setFocusable'] } // through LazyJavaClassMemberScope@2418
-    functions('setFocusableWindowState': Name@3376) = ArrayList@3377[1] { JavaMethodDescriptor@3378['setFocusableWindowState'] } // through LazyJavaClassMemberScope@2418
-    functions('setFont': Name@2167) = ArrayList@3379[1] { JavaMethodDescriptor@3380['setFont'] } // through LazyJavaClassMemberScope@2418
-    functions('setForeground': Name@978) = ArrayList@3381[1] { JavaMethodDescriptor@3382['setForeground'] } // through LazyJavaClassMemberScope@2418
-    functions('setGlassPane': Name@981) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setGraphicsConfiguration': Name@3383) = ArrayList@3384[1] { JavaMethodDescriptor@3385['setGraphicsConfiguration'] } // through LazyJavaClassMemberScope@2418
-    functions('setIconImage': Name@3386) = ArrayList@3387[1] { JavaMethodDescriptor@3388['setIconImage'] } // through LazyJavaClassMemberScope@2418
-    functions('setIconImages': Name@3389) = ArrayList@3390[1] { JavaMethodDescriptor@3391['setIconImages'] } // through LazyJavaClassMemberScope@2418
-    functions('setIgnoreRepaint': Name@987) = ArrayList@3392[1] { JavaMethodDescriptor@3393['setIgnoreRepaint'] } // through LazyJavaClassMemberScope@2418
-    functions('setJMenuBar': Name@990) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setLayeredPane': Name@991) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setLayout': Name@2176) = ArrayList@3394[1] { JavaMethodDescriptor@3395['setLayout'] } // through LazyJavaClassMemberScope@2418
-    functions('setLocale': Name@993) = ArrayList@3396[1] { JavaMethodDescriptor@3397['setLocale'] } // through LazyJavaClassMemberScope@2418
-    functions('setLocation': Name@3398) = ArrayList@3399[2] { JavaMethodDescriptor@3400['setLocation'], JavaMethodDescriptor@3401['setLocation'] } // through LazyJavaClassMemberScope@2418
-    functions('setLocationByPlatform': Name@3402) = ArrayList@3403[1] { JavaMethodDescriptor@3404['setLocationByPlatform'] } // through LazyJavaClassMemberScope@2418
-    functions('setLocationRelativeTo': Name@3405) = ArrayList@3406[1] { JavaMethodDescriptor@3407['setLocationRelativeTo'] } // through LazyJavaClassMemberScope@2418
-    functions('setMaximizedBounds': Name@3408) = ArrayList@3409[1] { JavaMethodDescriptor@3410['setMaximizedBounds'] } // through LazyJavaClassMemberScope@2418
-    functions('setMaximumSize': Name@1003) = ArrayList@3411[1] { JavaMethodDescriptor@3412['setMaximumSize'] } // through LazyJavaClassMemberScope@2418
-    functions('setMenuBar': Name@3413) = ArrayList@3414[1] { JavaMethodDescriptor@3415['setMenuBar'] } // through LazyJavaClassMemberScope@2418
-    functions('setMinimumSize': Name@3416) = ArrayList@3417[1] { JavaMethodDescriptor@3418['setMinimumSize'] } // through LazyJavaClassMemberScope@2418
-    functions('setModalBlocked': Name@3419) = ArrayList@3420[1] { JavaMethodDescriptor@3421['setModalBlocked'] } // through LazyJavaClassMemberScope@2418
-    functions('setModalExclusionType': Name@3422) = ArrayList@3423[1] { JavaMethodDescriptor@3424['setModalExclusionType'] } // through LazyJavaClassMemberScope@2418
-    functions('setName': Name@1012) = ArrayList@3425[1] { JavaMethodDescriptor@3426['setName'] } // through LazyJavaClassMemberScope@2418
-    functions('setOpacity': Name@3427) = ArrayList@3428[1] { JavaMethodDescriptor@3429['setOpacity'] } // through LazyJavaClassMemberScope@2418
-    functions('setPreferredSize': Name@1016) = ArrayList@3430[1] { JavaMethodDescriptor@3431['setPreferredSize'] } // through LazyJavaClassMemberScope@2418
-    functions('setResizable': Name@3432) = ArrayList@3433[1] { JavaMethodDescriptor@3434['setResizable'] } // through LazyJavaClassMemberScope@2418
-    functions('setRootPane': Name@1020) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setRootPaneCheckingEnabled': Name@1021) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setShape': Name@3435) = ArrayList@3436[1] { JavaMethodDescriptor@3437['setShape'] } // through LazyJavaClassMemberScope@2418
-    functions('setSize': Name@3438) = ArrayList@3439[2] { JavaMethodDescriptor@3440['setSize'], JavaMethodDescriptor@3441['setSize'] } // through LazyJavaClassMemberScope@2418
-    functions('setState': Name@3442) = ArrayList@3443[1] { JavaMethodDescriptor@3444['setState'] } // through LazyJavaClassMemberScope@2418
-    functions('setTemporaryLostComponent': Name@3445) = ArrayList@3446[1] { JavaMethodDescriptor@3447['setTemporaryLostComponent'] } // through LazyJavaClassMemberScope@2418
-    functions('setTitle': Name@3448) = ArrayList@3449[1] { JavaMethodDescriptor@3450['setTitle'] } // through LazyJavaClassMemberScope@2418
-    functions('setTransferHandler': Name@1030) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('setType': Name@3451) = ArrayList@3452[1] { JavaMethodDescriptor@3453['setType'] } // through LazyJavaClassMemberScope@2418
-    functions('setUndecorated': Name@3454) = ArrayList@3455[1] { JavaMethodDescriptor@3456['setUndecorated'] } // through LazyJavaClassMemberScope@2418
-    functions('setVisible': Name@3457) = ArrayList@3458[1] { JavaMethodDescriptor@3459['setVisible'] } // through LazyJavaClassMemberScope@2418
-    functions('setWarningString': Name@3460) = ArrayList@3461[1] { JavaMethodDescriptor@3462['setWarningString'] } // through LazyJavaClassMemberScope@2418
-    functions('show': Name@3463) = ArrayList@3464[2] { JavaMethodDescriptor@3465['show'], JavaMethodDescriptor@3466['show'] } // through LazyJavaClassMemberScope@2418
-    functions('size': Name@1041) = ArrayList@3467[1] { JavaMethodDescriptor@3468['size'] } // through LazyJavaClassMemberScope@2418
-    functions('startLWModal': Name@2202) = ArrayList@3469[1] { JavaMethodDescriptor@3470['startLWModal'] } // through LazyJavaClassMemberScope@2418
-    functions('stopLWModal': Name@2205) = ArrayList@3471[1] { JavaMethodDescriptor@3472['stopLWModal'] } // through LazyJavaClassMemberScope@2418
-    functions('subtractAndApplyShape': Name@1046) = ArrayList@3473[1] { JavaMethodDescriptor@3474['subtractAndApplyShape'] } // through LazyJavaClassMemberScope@2418
-    functions('subtractAndApplyShapeBelowMe': Name@1049) = ArrayList@3475[1] { JavaMethodDescriptor@3476['subtractAndApplyShapeBelowMe'] } // through LazyJavaClassMemberScope@2418
-    functions('toBack': Name@3477) = ArrayList@3478[1] { JavaMethodDescriptor@3479['toBack'] } // through LazyJavaClassMemberScope@2418
-    functions('toBack_NoClientCode': Name@3480) = ArrayList@3481[1] { JavaMethodDescriptor@3482['toBack_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('toFront': Name@3483) = ArrayList@3484[1] { JavaMethodDescriptor@3485['toFront'] } // through LazyJavaClassMemberScope@2418
-    functions('toFront_NoClientCode': Name@3486) = ArrayList@3487[1] { JavaMethodDescriptor@3488['toFront_NoClientCode'] } // through LazyJavaClassMemberScope@2418
-    functions('toString': Name@1056) = ArrayList@3489[1] { JavaMethodDescriptor@3490['toString'] } // through LazyJavaClassMemberScope@2418
-    functions('transferFocus': Name@1059) = ArrayList@3491[2] { JavaMethodDescriptor@3492['transferFocus'], JavaMethodDescriptor@3493['transferFocus'] } // through LazyJavaClassMemberScope@2418
-    functions('transferFocusBackward': Name@1063) = ArrayList@3494[2] { JavaMethodDescriptor@3495['transferFocusBackward'], JavaMethodDescriptor@3496['transferFocusBackward'] } // through LazyJavaClassMemberScope@2418
-    functions('transferFocusDownCycle': Name@2220) = ArrayList@3497[1] { JavaMethodDescriptor@3498['transferFocusDownCycle'] } // through LazyJavaClassMemberScope@2418
-    functions('transferFocusUpCycle': Name@1068) = ArrayList@3499[1] { JavaMethodDescriptor@3500['transferFocusUpCycle'] } // through LazyJavaClassMemberScope@2418
-    functions('update': Name@2225) = ArrayList@3501[1] { JavaMethodDescriptor@3502['update'] } // through LazyJavaClassMemberScope@2418
-    functions('updateChildrenBlocking': Name@3503) = ArrayList@3504[1] { JavaMethodDescriptor@3505['updateChildrenBlocking'] } // through LazyJavaClassMemberScope@2418
-    functions('updateCursorImmediately': Name@1075) = ArrayList@3506[1] { JavaMethodDescriptor@3507['updateCursorImmediately'] } // through LazyJavaClassMemberScope@2418
-    functions('updateGraphicsData': Name@2230) = ArrayList@3508[1] { JavaMethodDescriptor@3509['updateGraphicsData'] } // through LazyJavaClassMemberScope@2418
-    functions('updateWindow': Name@3510) = ArrayList@3511[1] { JavaMethodDescriptor@3512['updateWindow'] } // through LazyJavaClassMemberScope@2418
-    functions('updateZOrder': Name@3513) = ArrayList@3514[1] { JavaMethodDescriptor@3515['updateZOrder'] } // through LazyJavaClassMemberScope@2418
-    functions('validate': Name@2235) = ArrayList@3516[1] { JavaMethodDescriptor@3517['validate'] } // through LazyJavaClassMemberScope@2418
-    functions('validateTree': Name@2238) = ArrayList@3518[1] { JavaMethodDescriptor@3519['validateTree'] } // through LazyJavaClassMemberScope@2418
-    functions('validateUnconditionally': Name@2241) = ArrayList@3520[1] { JavaMethodDescriptor@3521['validateUnconditionally'] } // through LazyJavaClassMemberScope@2418
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    functions('writeObject': Name@3522) = ArrayList@3523[1] { JavaMethodDescriptor@3524['writeObject'] } // through LazyJavaClassMemberScope@2418
-    memberIndex = computeMemberIndex$1@3525 // through LazyJavaClassMemberScope@2418
-    properties('acc': Name@1097) = ArrayList@3526[1] { PropertyDescriptorImpl@3527['acc'] } // through LazyJavaClassMemberScope@2418
-    properties('accessibleContext': Name@1100) = ArrayList@3528[1] { PropertyDescriptorImpl@3529['accessibleContext'] } // through LazyJavaClassMemberScope@2418
-    properties('alwaysOnTop': Name@1103) = ArrayList@3530[1] { PropertyDescriptorImpl@3531['alwaysOnTop'] } // through LazyJavaClassMemberScope@2418
-    properties('anchor': Name@1104) = ArrayList@3532[1] { PropertyDescriptorImpl@3533['anchor'] } // through LazyJavaClassMemberScope@2418
-    properties('appContext': Name@1105) = ArrayList@3534[1] { PropertyDescriptorImpl@3535['appContext'] } // through LazyJavaClassMemberScope@2418
-    properties('autoFocusTransferOnDisposal': Name@1108) = ArrayList@3536[1] { PropertyDescriptorImpl@3537['autoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@2418
-    properties('autoRequestFocus': Name@1111) = ArrayList@3538[1] { PropertyDescriptorImpl@3539['autoRequestFocus'] } // through LazyJavaClassMemberScope@2418
-    properties('background': Name@1112) = ArrayList@3540[1] { PropertyDescriptorImpl@3541['background'] } // through LazyJavaClassMemberScope@2418
-    properties('backgroundEraseDisabled': Name@1115) = ArrayList@3542[1] { PropertyDescriptorImpl@3543['backgroundEraseDisabled'] } // through LazyJavaClassMemberScope@2418
-    properties('beforeFirstShow': Name@1118) = ArrayList@3544[1] { PropertyDescriptorImpl@3545['beforeFirstShow'] } // through LazyJavaClassMemberScope@2418
-    properties('boundsOp': Name@1119) = ArrayList@3546[1] { PropertyDescriptorImpl@3547['boundsOp'] } // through LazyJavaClassMemberScope@2418
-    properties('bufferStrategy': Name@1122) = ArrayList@3548[1] { PropertyDescriptorImpl@3549['bufferStrategy'] } // through LazyJavaClassMemberScope@2418
-    properties('changeSupport': Name@1125) = ArrayList@3550[1] { PropertyDescriptorImpl@3551['changeSupport'] } // through LazyJavaClassMemberScope@2418
-    properties('coalescingEnabled': Name@1128) = ArrayList@3552[1] { PropertyDescriptorImpl@3553['coalescingEnabled'] } // through LazyJavaClassMemberScope@2418
-    properties('component': Name@1131) = ArrayList@3554[1] { PropertyDescriptorImpl@3555['component'] } // through LazyJavaClassMemberScope@2418
-    properties('componentListener': Name@1132) = ArrayList@3556[1] { PropertyDescriptorImpl@3557['componentListener'] } // through LazyJavaClassMemberScope@2418
-    properties('componentOrientation': Name@1135) = ArrayList@3558[1] { PropertyDescriptorImpl@3559['componentOrientation'] } // through LazyJavaClassMemberScope@2418
-    properties('componentSerializedDataVersion': Name@1138) = ArrayList@3560[1] { PropertyDescriptorImpl@3561['componentSerializedDataVersion'] } // through LazyJavaClassMemberScope@2418
-    properties('compoundShape': Name@1141) = ArrayList@3562[1] { PropertyDescriptorImpl@3563['compoundShape'] } // through LazyJavaClassMemberScope@2418
-    properties('containerListener': Name@1144) = ArrayList@3564[1] { PropertyDescriptorImpl@3565['containerListener'] } // through LazyJavaClassMemberScope@2418
-    properties('containerSerializedDataVersion': Name@1145) = ArrayList@3566[1] { PropertyDescriptorImpl@3567['containerSerializedDataVersion'] } // through LazyJavaClassMemberScope@2418
-    properties('cursor': Name@1146) = ArrayList@3568[1] { PropertyDescriptorImpl@3569['cursor'] } // through LazyJavaClassMemberScope@2418
-    properties('defaultCloseOperation': Name@1149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    properties('descendantsCount': Name@1150) = ArrayList@3570[1] { PropertyDescriptorImpl@3571['descendantsCount'] } // through LazyJavaClassMemberScope@2418
-    properties('dispatcher': Name@1151) = ArrayList@3572[1] { PropertyDescriptorImpl@3573['dispatcher'] } // through LazyJavaClassMemberScope@2418
-    properties('disposing': Name@1152) = ArrayList@3574[1] { PropertyDescriptorImpl@3575['disposing'] } // through LazyJavaClassMemberScope@2418
-    properties('dropTarget': Name@1153) = ArrayList@3576[1] { PropertyDescriptorImpl@3577['dropTarget'] } // through LazyJavaClassMemberScope@2418
-    properties('enabled': Name@1156) = ArrayList@3578[1] { PropertyDescriptorImpl@3579['enabled'] } // through LazyJavaClassMemberScope@2418
-    properties('eventCache': Name@1159) = ArrayList@3580[1] { PropertyDescriptorImpl@3581['eventCache'] } // through LazyJavaClassMemberScope@2418
-    properties('eventMask': Name@1162) = ArrayList@3582[1] { PropertyDescriptorImpl@3583['eventMask'] } // through LazyJavaClassMemberScope@2418
-    properties('focusCycleRoot': Name@1165) = ArrayList@3584[1] { PropertyDescriptorImpl@3585['focusCycleRoot'] } // through LazyJavaClassMemberScope@2418
-    properties('focusListener': Name@1166) = ArrayList@3586[1] { PropertyDescriptorImpl@3587['focusListener'] } // through LazyJavaClassMemberScope@2418
-    properties('focusMgr': Name@1169) = ArrayList@3588[1] { PropertyDescriptorImpl@3589['focusMgr'] } // through LazyJavaClassMemberScope@2418
-    properties('focusTraversalKeys': Name@1170) = ArrayList@3590[1] { PropertyDescriptorImpl@3591['focusTraversalKeys'] } // through LazyJavaClassMemberScope@2418
-    properties('focusTraversalKeysEnabled': Name@1173) = ArrayList@3592[1] { PropertyDescriptorImpl@3593['focusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@2418
-    properties('focusTraversalPolicy': Name@1176) = ArrayList@3594[1] { PropertyDescriptorImpl@3595['focusTraversalPolicy'] } // through LazyJavaClassMemberScope@2418
-    properties('focusTraversalPolicyProvider': Name@1177) = ArrayList@3596[1] { PropertyDescriptorImpl@3597['focusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@2418
-    properties('focusable': Name@1178) = ArrayList@3598[1] { PropertyDescriptorImpl@3599['focusable'] } // through LazyJavaClassMemberScope@2418
-    properties('focusableWindowState': Name@1181) = ArrayList@3600[1] { PropertyDescriptorImpl@3601['focusableWindowState'] } // through LazyJavaClassMemberScope@2418
-    properties('font': Name@1182) = ArrayList@3602[1] { PropertyDescriptorImpl@3603['font'] } // through LazyJavaClassMemberScope@2418
-    properties('foreground': Name@1185) = ArrayList@3604[1] { PropertyDescriptorImpl@3605['foreground'] } // through LazyJavaClassMemberScope@2418
-    properties('frameSerializedDataVersion': Name@1188) = ArrayList@3606[1] { JavaPropertyDescriptor@3607['frameSerializedDataVersion'] } // through LazyJavaClassMemberScope@2418
-    properties('graphicsConfig': Name@1189) = ArrayList@3608[1] { PropertyDescriptorImpl@3609['graphicsConfig'] } // through LazyJavaClassMemberScope@2418
-    properties('height': Name@1192) = ArrayList@3610[1] { PropertyDescriptorImpl@3611['height'] } // through LazyJavaClassMemberScope@2418
-    properties('hierarchyBoundsListener': Name@1195) = ArrayList@3612[1] { PropertyDescriptorImpl@3613['hierarchyBoundsListener'] } // through LazyJavaClassMemberScope@2418
-    properties('hierarchyListener': Name@1198) = ArrayList@3614[1] { PropertyDescriptorImpl@3615['hierarchyListener'] } // through LazyJavaClassMemberScope@2418
-    properties('icons': Name@1201) = ArrayList@3616[1] { PropertyDescriptorImpl@3617['icons'] } // through LazyJavaClassMemberScope@2418
-    properties('ignoreRepaint': Name@1202) = ArrayList@3618[1] { PropertyDescriptorImpl@3619['ignoreRepaint'] } // through LazyJavaClassMemberScope@2418
-    properties('inputContext': Name@1205) = ArrayList@3620[1] { PropertyDescriptorImpl@3621['inputContext'] } // through LazyJavaClassMemberScope@2418
-    properties('inputContextLock': Name@1206) = ArrayList@3622[1] { PropertyDescriptorImpl@3623['inputContextLock'] } // through LazyJavaClassMemberScope@2418
-    properties('inputMethodListener': Name@1207) = ArrayList@3624[1] { PropertyDescriptorImpl@3625['inputMethodListener'] } // through LazyJavaClassMemberScope@2418
-    properties('isAddNotifyComplete': Name@1210) = ArrayList@3626[1] { PropertyDescriptorImpl@3627['isAddNotifyComplete'] } // through LazyJavaClassMemberScope@2418
-    properties('isFocusTraversableOverridden': Name@1213) = ArrayList@3628[1] { PropertyDescriptorImpl@3629['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@2418
-    properties('isInShow': Name@1216) = ArrayList@3630[1] { PropertyDescriptorImpl@3631['isInShow'] } // through LazyJavaClassMemberScope@2418
-    properties('isPacked': Name@1217) = ArrayList@3632[1] { PropertyDescriptorImpl@3633['isPacked'] } // through LazyJavaClassMemberScope@2418
-    properties('isTrayIconWindow': Name@1220) = ArrayList@3634[1] { PropertyDescriptorImpl@3635['isTrayIconWindow'] } // through LazyJavaClassMemberScope@2418
-    properties('keyListener': Name@1221) = ArrayList@3636[1] { PropertyDescriptorImpl@3637['keyListener'] } // through LazyJavaClassMemberScope@2418
-    properties('layoutMgr': Name@1224) = ArrayList@3638[1] { PropertyDescriptorImpl@3639['layoutMgr'] } // through LazyJavaClassMemberScope@2418
-    properties('listeningBoundsChildren': Name@1225) = ArrayList@3640[1] { PropertyDescriptorImpl@3641['listeningBoundsChildren'] } // through LazyJavaClassMemberScope@2418
-    properties('listeningChildren': Name@1226) = ArrayList@3642[1] { PropertyDescriptorImpl@3643['listeningChildren'] } // through LazyJavaClassMemberScope@2418
-    properties('locale': Name@1227) = ArrayList@3644[1] { PropertyDescriptorImpl@3645['locale'] } // through LazyJavaClassMemberScope@2418
-    properties('locationByPlatform': Name@1230) = ArrayList@3646[1] { PropertyDescriptorImpl@3647['locationByPlatform'] } // through LazyJavaClassMemberScope@2418
-    properties('maxSize': Name@1231) = ArrayList@3648[1] { PropertyDescriptorImpl@3649['maxSize'] } // through LazyJavaClassMemberScope@2418
-    properties('maxSizeSet': Name@1234) = ArrayList@3650[1] { PropertyDescriptorImpl@3651['maxSizeSet'] } // through LazyJavaClassMemberScope@2418
-    properties('maximizedBounds': Name@1237) = ArrayList@3652[1] { JavaPropertyDescriptor@3653['maximizedBounds'] } // through LazyJavaClassMemberScope@2418
-    properties('mbManagement': Name@1238) = ArrayList@3654[1] { JavaPropertyDescriptor@3655['mbManagement'] } // through LazyJavaClassMemberScope@2418
-    properties('menuBar': Name@1239) = ArrayList@3656[1] { JavaPropertyDescriptor@3657['menuBar'] } // through LazyJavaClassMemberScope@2418
-    properties('minSize': Name@1240) = ArrayList@3658[1] { PropertyDescriptorImpl@3659['minSize'] } // through LazyJavaClassMemberScope@2418
-    properties('minSizeSet': Name@1243) = ArrayList@3660[1] { PropertyDescriptorImpl@3661['minSizeSet'] } // through LazyJavaClassMemberScope@2418
-    properties('mixingCutoutRegion': Name@1246) = ArrayList@3662[1] { PropertyDescriptorImpl@3663['mixingCutoutRegion'] } // through LazyJavaClassMemberScope@2418
-    properties('modalAppContext': Name@1249) = ArrayList@3664[1] { PropertyDescriptorImpl@3665['modalAppContext'] } // through LazyJavaClassMemberScope@2418
-    properties('modalBlocker': Name@1250) = ArrayList@3666[1] { PropertyDescriptorImpl@3667['modalBlocker'] } // through LazyJavaClassMemberScope@2418
-    properties('modalComp': Name@1251) = ArrayList@3668[1] { PropertyDescriptorImpl@3669['modalComp'] } // through LazyJavaClassMemberScope@2418
-    properties('modalExclusionType': Name@1252) = ArrayList@3670[1] { PropertyDescriptorImpl@3671['modalExclusionType'] } // through LazyJavaClassMemberScope@2418
-    properties('mouseListener': Name@1253) = ArrayList@3672[1] { PropertyDescriptorImpl@3673['mouseListener'] } // through LazyJavaClassMemberScope@2418
-    properties('mouseMotionListener': Name@1256) = ArrayList@3674[1] { PropertyDescriptorImpl@3675['mouseMotionListener'] } // through LazyJavaClassMemberScope@2418
-    properties('mouseWheelListener': Name@1259) = ArrayList@3676[1] { PropertyDescriptorImpl@3677['mouseWheelListener'] } // through LazyJavaClassMemberScope@2418
-    properties('name': Name@1262) = ArrayList@3678[1] { PropertyDescriptorImpl@3679['name'] } // through LazyJavaClassMemberScope@2418
-    properties('nameExplicitlySet': Name@1265) = ArrayList@3680[1] { PropertyDescriptorImpl@3681['nameExplicitlySet'] } // through LazyJavaClassMemberScope@2418
-    properties('newEventsOnly': Name@1268) = ArrayList@3682[1] { PropertyDescriptorImpl@3683['newEventsOnly'] } // through LazyJavaClassMemberScope@2418
-    properties('numOfHWComponents': Name@1271) = ArrayList@3684[1] { PropertyDescriptorImpl@3685['numOfHWComponents'] } // through LazyJavaClassMemberScope@2418
-    properties('numOfLWComponents': Name@1272) = ArrayList@3686[1] { PropertyDescriptorImpl@3687['numOfLWComponents'] } // through LazyJavaClassMemberScope@2418
-    properties('objectLock': Name@1273) = ArrayList@3688[1] { PropertyDescriptorImpl@3689['objectLock'] } // through LazyJavaClassMemberScope@2418
-    properties('opacity': Name@1276) = ArrayList@3690[1] { PropertyDescriptorImpl@3691['opacity'] } // through LazyJavaClassMemberScope@2418
-    properties('ownedWindowList': Name@1277) = ArrayList@3692[1] { PropertyDescriptorImpl@3693['ownedWindowList'] } // through LazyJavaClassMemberScope@2418
-    properties('ownedWindows': Name@1278) = ArrayList@3694[1] { JavaPropertyDescriptor@3695['ownedWindows'] } // through LazyJavaClassMemberScope@2418
-    properties('parent': Name@1279) = ArrayList@3696[1] { PropertyDescriptorImpl@3697['parent'] } // through LazyJavaClassMemberScope@2418
-    properties('peer': Name@1282) = ArrayList@3698[1] { PropertyDescriptorImpl@3699['peer'] } // through LazyJavaClassMemberScope@2418
-    properties('peerFont': Name@1285) = ArrayList@3700[1] { PropertyDescriptorImpl@3701['peerFont'] } // through LazyJavaClassMemberScope@2418
-    properties('popups': Name@1288) = ArrayList@3702[1] { PropertyDescriptorImpl@3703['popups'] } // through LazyJavaClassMemberScope@2418
-    properties('prefSize': Name@1291) = ArrayList@3704[1] { PropertyDescriptorImpl@3705['prefSize'] } // through LazyJavaClassMemberScope@2418
-    properties('prefSizeSet': Name@1294) = ArrayList@3706[1] { PropertyDescriptorImpl@3707['prefSizeSet'] } // through LazyJavaClassMemberScope@2418
-    properties('preserveBackgroundColor': Name@1297) = ArrayList@3708[1] { PropertyDescriptorImpl@3709['preserveBackgroundColor'] } // through LazyJavaClassMemberScope@2418
-    properties('printing': Name@1298) = ArrayList@3710[1] { PropertyDescriptorImpl@3711['printing'] } // through LazyJavaClassMemberScope@2418
-    properties('printingThreads': Name@1299) = ArrayList@3712[1] { PropertyDescriptorImpl@3713['printingThreads'] } // through LazyJavaClassMemberScope@2418
-    properties('resizable': Name@1300) = ArrayList@3714[1] { JavaPropertyDescriptor@3715['resizable'] } // through LazyJavaClassMemberScope@2418
-    properties('rootPane': Name@1301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    properties('rootPaneCheckingEnabled': Name@1302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    properties('securityWarningAlignmentX': Name@1303) = ArrayList@3716[1] { PropertyDescriptorImpl@3717['securityWarningAlignmentX'] } // through LazyJavaClassMemberScope@2418
-    properties('securityWarningAlignmentY': Name@1304) = ArrayList@3718[1] { PropertyDescriptorImpl@3719['securityWarningAlignmentY'] } // through LazyJavaClassMemberScope@2418
-    properties('securityWarningHeight': Name@1305) = ArrayList@3720[1] { PropertyDescriptorImpl@3721['securityWarningHeight'] } // through LazyJavaClassMemberScope@2418
-    properties('securityWarningPointX': Name@1306) = ArrayList@3722[1] { PropertyDescriptorImpl@3723['securityWarningPointX'] } // through LazyJavaClassMemberScope@2418
-    properties('securityWarningPointY': Name@1307) = ArrayList@3724[1] { PropertyDescriptorImpl@3725['securityWarningPointY'] } // through LazyJavaClassMemberScope@2418
-    properties('securityWarningWidth': Name@1308) = ArrayList@3726[1] { PropertyDescriptorImpl@3727['securityWarningWidth'] } // through LazyJavaClassMemberScope@2418
-    properties('shape': Name@1309) = ArrayList@3728[1] { PropertyDescriptorImpl@3729['shape'] } // through LazyJavaClassMemberScope@2418
-    properties('showWithParent': Name@1310) = ArrayList@3730[1] { PropertyDescriptorImpl@3731['showWithParent'] } // through LazyJavaClassMemberScope@2418
-    properties('state': Name@1311) = ArrayList@3732[1] { JavaPropertyDescriptor@3733['state'] } // through LazyJavaClassMemberScope@2418
-    properties('syncLWRequests': Name@1312) = ArrayList@3734[1] { PropertyDescriptorImpl@3735['syncLWRequests'] } // through LazyJavaClassMemberScope@2418
-    properties('temporaryLostComponent': Name@1313) = ArrayList@3736[1] { PropertyDescriptorImpl@3737['temporaryLostComponent'] } // through LazyJavaClassMemberScope@2418
-    properties('title': Name@1314) = ArrayList@3738[1] { JavaPropertyDescriptor@3739['title'] } // through LazyJavaClassMemberScope@2418
-    properties('transferHandler': Name@1315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@2418
-    properties('type': Name@1316) = ArrayList@3740[1] { PropertyDescriptorImpl@3741['type'] } // through LazyJavaClassMemberScope@2418
-    properties('undecorated': Name@1317) = ArrayList@3742[1] { JavaPropertyDescriptor@3743['undecorated'] } // through LazyJavaClassMemberScope@2418
-    properties('valid': Name@1318) = ArrayList@3744[1] { PropertyDescriptorImpl@3745['valid'] } // through LazyJavaClassMemberScope@2418
-    properties('visible': Name@1321) = ArrayList@3746[1] { PropertyDescriptorImpl@3747['visible'] } // through LazyJavaClassMemberScope@2418
-    properties('warningString': Name@1324) = ArrayList@3748[1] { PropertyDescriptorImpl@3749['warningString'] } // through LazyJavaClassMemberScope@2418
-    properties('weakThis': Name@1325) = ArrayList@3750[1] { PropertyDescriptorImpl@3751['weakThis'] } // through LazyJavaClassMemberScope@2418
-    properties('width': Name@1326) = ArrayList@3752[1] { PropertyDescriptorImpl@3753['width'] } // through LazyJavaClassMemberScope@2418
-    properties('windowClosingException': Name@1329) = ArrayList@3754[1] { PropertyDescriptorImpl@3755['windowClosingException'] } // through LazyJavaClassMemberScope@2418
-    properties('windowFocusListener': Name@1332) = ArrayList@3756[1] { PropertyDescriptorImpl@3757['windowFocusListener'] } // through LazyJavaClassMemberScope@2418
-    properties('windowListener': Name@1333) = ArrayList@3758[1] { PropertyDescriptorImpl@3759['windowListener'] } // through LazyJavaClassMemberScope@2418
-    properties('windowSerializedDataVersion': Name@1334) = ArrayList@3760[1] { PropertyDescriptorImpl@3761['windowSerializedDataVersion'] } // through LazyJavaClassMemberScope@2418
-    properties('windowStateListener': Name@1335) = ArrayList@3762[1] { PropertyDescriptorImpl@3763['windowStateListener'] } // through LazyJavaClassMemberScope@2418
-    properties('x': Name@1336) = ArrayList@3764[1] { PropertyDescriptorImpl@3765['x'] } // through LazyJavaClassMemberScope@2418
-    properties('y': Name@1339) = ArrayList@3766[1] { PropertyDescriptorImpl@3767['y'] } // through LazyJavaClassMemberScope@2418
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@3768['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@3769['Frame']
-}
-
-LazyJavaClassDescriptor@3770['JFrame'] {
-    allDescriptors = ArrayList@3771[659] { LazyJavaClassDescriptor@3772['AccessibleJFrame'], JavaMethodDescriptor@3773['getSiblingIndexAbove'], JavaMethodDescriptor@3774['move'], ... } // through LazyJavaClassMemberScope@3775
-    constructors = ArrayList@3776[4] { JavaConstructorDescriptor@3777['<init>'], JavaConstructorDescriptor@3778['<init>'], JavaConstructorDescriptor@3779['<init>'], ... } // through LazyJavaClassMemberScope@3775
-    defaultType = JetTypeImpl@3780['JFrame']
-    enumEntryIndex = LinkedHashMap@3781 // through LazyJavaClassMemberScope@3775
-    functionTypeForSamInterface = null
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('action': Name@11) = ArrayList@3782[1] { JavaMethodDescriptor@3783['action'] } // through LazyJavaClassMemberScope@3775
-    functions('add': Name@1349) = ArrayList@3784[6] { JavaMethodDescriptor@3785['add'], JavaMethodDescriptor@3786['add'], JavaMethodDescriptor@3787['add'], ... } // through LazyJavaClassMemberScope@3775
-    functions('addComponentListener': Name@17) = ArrayList@3788[1] { JavaMethodDescriptor@3789['addComponentListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addContainerListener': Name@1356) = ArrayList@3790[1] { JavaMethodDescriptor@3791['addContainerListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addDelicately': Name@1359) = ArrayList@3792[1] { JavaMethodDescriptor@3793['addDelicately'] } // through LazyJavaClassMemberScope@3775
-    functions('addFocusListener': Name@22) = ArrayList@3794[1] { JavaMethodDescriptor@3795['addFocusListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addHierarchyBoundsListener': Name@25) = ArrayList@3796[1] { JavaMethodDescriptor@3797['addHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addHierarchyListener': Name@28) = ArrayList@3798[1] { JavaMethodDescriptor@3799['addHierarchyListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addImpl': Name@3800) = ArrayList@3801[1] { JavaMethodDescriptor@3802['addImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('addInputMethodListener': Name@32) = ArrayList@3803[1] { JavaMethodDescriptor@3804['addInputMethodListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addKeyListener': Name@35) = ArrayList@3805[1] { JavaMethodDescriptor@3806['addKeyListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addMouseListener': Name@38) = ArrayList@3807[1] { JavaMethodDescriptor@3808['addMouseListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addMouseMotionListener': Name@41) = ArrayList@3809[1] { JavaMethodDescriptor@3810['addMouseMotionListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addMouseWheelListener': Name@44) = ArrayList@3811[1] { JavaMethodDescriptor@3812['addMouseWheelListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addNotify': Name@2449) = ArrayList@3813[1] { JavaMethodDescriptor@3814['addNotify'] } // through LazyJavaClassMemberScope@3775
-    functions('addOwnedWindow': Name@2452) = ArrayList@3815[1] { JavaMethodDescriptor@3816['addOwnedWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('addPropertyChangeListener': Name@2455) = ArrayList@3817[2] { JavaMethodDescriptor@3818['addPropertyChangeListener'], JavaMethodDescriptor@3819['addPropertyChangeListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addToWindowList': Name@2459) = ArrayList@3820[1] { JavaMethodDescriptor@3821['addToWindowList'] } // through LazyJavaClassMemberScope@3775
-    functions('addWindowFocusListener': Name@2462) = ArrayList@3822[1] { JavaMethodDescriptor@3823['addWindowFocusListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addWindowListener': Name@2465) = ArrayList@3824[1] { JavaMethodDescriptor@3825['addWindowListener'] } // through LazyJavaClassMemberScope@3775
-    functions('addWindowStateListener': Name@2468) = ArrayList@3826[1] { JavaMethodDescriptor@3827['addWindowStateListener'] } // through LazyJavaClassMemberScope@3775
-    functions('adjustDecendantsOnParent': Name@2471) = ArrayList@3828[1] { JavaMethodDescriptor@3829['adjustDecendantsOnParent'] } // through LazyJavaClassMemberScope@3775
-    functions('adjustDescendants': Name@1391) = ArrayList@3830[1] { JavaMethodDescriptor@3831['adjustDescendants'] } // through LazyJavaClassMemberScope@3775
-    functions('adjustListeningChildren': Name@1394) = ArrayList@3832[1] { JavaMethodDescriptor@3833['adjustListeningChildren'] } // through LazyJavaClassMemberScope@3775
-    functions('adjustListeningChildrenOnParent': Name@2478) = ArrayList@3834[1] { JavaMethodDescriptor@3835['adjustListeningChildrenOnParent'] } // through LazyJavaClassMemberScope@3775
-    functions('applyComponentOrientation': Name@1399) = ArrayList@3836[1] { JavaMethodDescriptor@3837['applyComponentOrientation'] } // through LazyJavaClassMemberScope@3775
-    functions('applyCompoundShape': Name@2483) = ArrayList@3838[1] { JavaMethodDescriptor@3839['applyCompoundShape'] } // through LazyJavaClassMemberScope@3775
-    functions('applyCurrentShape': Name@2486) = ArrayList@3840[1] { JavaMethodDescriptor@3841['applyCurrentShape'] } // through LazyJavaClassMemberScope@3775
-    functions('applyCurrentShapeBelowMe': Name@74) = ArrayList@3842[1] { JavaMethodDescriptor@3843['applyCurrentShapeBelowMe'] } // through LazyJavaClassMemberScope@3775
-    functions('applyResourceBundle': Name@2491) = ArrayList@3844[2] { JavaMethodDescriptor@3845['applyResourceBundle'], JavaMethodDescriptor@3846['applyResourceBundle'] } // through LazyJavaClassMemberScope@3775
-    functions('areBoundsValid': Name@78) = ArrayList@3847[1] { JavaMethodDescriptor@3848['areBoundsValid'] } // through LazyJavaClassMemberScope@3775
-    functions('areFocusTraversalKeysSet': Name@1410) = ArrayList@3849[1] { JavaMethodDescriptor@3850['areFocusTraversalKeysSet'] } // through LazyJavaClassMemberScope@3775
-    functions('areInputMethodsEnabled': Name@84) = ArrayList@3851[1] { JavaMethodDescriptor@3852['areInputMethodsEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('autoProcessMouseWheel': Name@87) = ArrayList@3853[1] { JavaMethodDescriptor@3854['autoProcessMouseWheel'] } // through LazyJavaClassMemberScope@3775
-    functions('bounds': Name@90) = ArrayList@3855[1] { JavaMethodDescriptor@3856['bounds'] } // through LazyJavaClassMemberScope@3775
-    functions('calculateCurrentShape': Name@93) = ArrayList@3857[1] { JavaMethodDescriptor@3858['calculateCurrentShape'] } // through LazyJavaClassMemberScope@3775
-    functions('calculateSecurityWarningPosition': Name@2507) = ArrayList@3859[1] { JavaMethodDescriptor@3860['calculateSecurityWarningPosition'] } // through LazyJavaClassMemberScope@3775
-    functions('canBeFocusOwner': Name@97) = ArrayList@3861[1] { JavaMethodDescriptor@3862['canBeFocusOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('canBeFocusOwnerRecursively': Name@100) = ArrayList@3863[1] { JavaMethodDescriptor@3864['canBeFocusOwnerRecursively'] } // through LazyJavaClassMemberScope@3775
-    functions('canContainFocusOwner': Name@2514) = ArrayList@3865[1] { JavaMethodDescriptor@3866['canContainFocusOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('checkAddToSelf': Name@1428) = ArrayList@3867[1] { JavaMethodDescriptor@3868['checkAddToSelf'] } // through LazyJavaClassMemberScope@3775
-    functions('checkAdding': Name@1431) = ArrayList@3869[1] { JavaMethodDescriptor@3870['checkAdding'] } // through LazyJavaClassMemberScope@3775
-    functions('checkCoalescing': Name@106) = ArrayList@3871[1] { JavaMethodDescriptor@3872['checkCoalescing'] } // through LazyJavaClassMemberScope@3775
-    functions('checkGD': Name@1436) = ArrayList@3873[1] { JavaMethodDescriptor@3874['checkGD'] } // through LazyJavaClassMemberScope@3775
-    functions('checkImage': Name@112) = ArrayList@3875[2] { JavaMethodDescriptor@3876['checkImage'], JavaMethodDescriptor@3877['checkImage'] } // through LazyJavaClassMemberScope@3775
-    functions('checkNotAWindow': Name@1442) = ArrayList@3878[1] { JavaMethodDescriptor@3879['checkNotAWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('checkTreeLock': Name@117) = ArrayList@3880[1] { JavaMethodDescriptor@3881['checkTreeLock'] } // through LazyJavaClassMemberScope@3775
-    functions('checkWindowClosingException': Name@120) = ArrayList@3882[1] { JavaMethodDescriptor@3883['checkWindowClosingException'] } // through LazyJavaClassMemberScope@3775
-    functions('clearCurrentFocusCycleRootOnHide': Name@1449) = ArrayList@3884[1] { JavaMethodDescriptor@3885['clearCurrentFocusCycleRootOnHide'] } // through LazyJavaClassMemberScope@3775
-    functions('clearMostRecentFocusOwnerOnHide': Name@2536) = ArrayList@3886[1] { JavaMethodDescriptor@3887['clearMostRecentFocusOwnerOnHide'] } // through LazyJavaClassMemberScope@3775
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('closeSplashScreen': Name@2539) = ArrayList@3888[1] { JavaMethodDescriptor@3889['closeSplashScreen'] } // through LazyJavaClassMemberScope@3775
-    functions('coalesceEvents': Name@131) = ArrayList@3890[1] { JavaMethodDescriptor@3891['coalesceEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('connectOwnedWindow': Name@2544) = ArrayList@3892[1] { JavaMethodDescriptor@3893['connectOwnedWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('constructComponentName': Name@2547) = ArrayList@3894[1] { JavaMethodDescriptor@3895['constructComponentName'] } // through LazyJavaClassMemberScope@3775
-    functions('contains': Name@138) = ArrayList@3896[2] { JavaMethodDescriptor@3897['contains'], JavaMethodDescriptor@3898['contains'] } // through LazyJavaClassMemberScope@3775
-    functions('containsFocus': Name@1462) = ArrayList@3899[1] { JavaMethodDescriptor@3900['containsFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('countComponents': Name@1465) = ArrayList@3901[1] { JavaMethodDescriptor@3902['countComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('countHierarchyMembers': Name@1468) = ArrayList@3903[1] { JavaMethodDescriptor@3904['countHierarchyMembers'] } // through LazyJavaClassMemberScope@3775
-    functions('createBufferStrategy': Name@2559) = ArrayList@3905[2] { JavaMethodDescriptor@3906['createBufferStrategy'], JavaMethodDescriptor@3907['createBufferStrategy'] } // through LazyJavaClassMemberScope@3775
-    functions('createChildHierarchyEvents': Name@1474) = ArrayList@3908[1] { JavaMethodDescriptor@3909['createChildHierarchyEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('createHierarchyEvents': Name@1477) = ArrayList@3910[1] { JavaMethodDescriptor@3911['createHierarchyEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('createImage': Name@157) = ArrayList@3912[2] { JavaMethodDescriptor@3913['createImage'], JavaMethodDescriptor@3914['createImage'] } // through LazyJavaClassMemberScope@3775
-    functions('createRootPane': Name@3915) = ArrayList@3916[1] { JavaMethodDescriptor@3917['createRootPane'] } // through LazyJavaClassMemberScope@3775
-    functions('createVolatileImage': Name@162) = ArrayList@3918[2] { JavaMethodDescriptor@3919['createVolatileImage'], JavaMethodDescriptor@3920['createVolatileImage'] } // through LazyJavaClassMemberScope@3775
-    functions('decreaseComponentCount': Name@1486) = ArrayList@3921[1] { JavaMethodDescriptor@3922['decreaseComponentCount'] } // through LazyJavaClassMemberScope@3775
-    functions('deliverEvent': Name@1489) = ArrayList@3923[1] { JavaMethodDescriptor@3924['deliverEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('deliverMouseWheelToAncestor': Name@2577) = ArrayList@3925[1] { JavaMethodDescriptor@3926['deliverMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@3775
-    functions('deserializeResources': Name@2580) = ArrayList@3927[1] { JavaMethodDescriptor@3928['deserializeResources'] } // through LazyJavaClassMemberScope@3775
-    functions('disable': Name@172) = ArrayList@3929[1] { JavaMethodDescriptor@3930['disable'] } // through LazyJavaClassMemberScope@3775
-    functions('disableEvents': Name@175) = ArrayList@3931[1] { JavaMethodDescriptor@3932['disableEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('dispatchEvent': Name@178) = ArrayList@3933[1] { JavaMethodDescriptor@3934['dispatchEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('dispatchEventImpl': Name@2589) = ArrayList@3935[1] { JavaMethodDescriptor@3936['dispatchEventImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('dispatchEventToSelf': Name@1501) = ArrayList@3937[1] { JavaMethodDescriptor@3938['dispatchEventToSelf'] } // through LazyJavaClassMemberScope@3775
-    functions('dispatchMouseWheelToAncestor': Name@2594) = ArrayList@3939[1] { JavaMethodDescriptor@3940['dispatchMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@3775
-    functions('dispose': Name@2597) = ArrayList@3941[1] { JavaMethodDescriptor@3942['dispose'] } // through LazyJavaClassMemberScope@3775
-    functions('disposeImpl': Name@2600) = ArrayList@3943[1] { JavaMethodDescriptor@3944['disposeImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('doDispose': Name@2603) = ArrayList@3945[1] { JavaMethodDescriptor@3946['doDispose'] } // through LazyJavaClassMemberScope@3775
-    functions('doLayout': Name@1506) = ArrayList@3947[1] { JavaMethodDescriptor@3948['doLayout'] } // through LazyJavaClassMemberScope@3775
-    functions('doSwingSerialization': Name@194) = ArrayList@3949[1] { JavaMethodDescriptor@3950['doSwingSerialization'] } // through LazyJavaClassMemberScope@3775
-    functions('enable': Name@197) = ArrayList@3951[2] { JavaMethodDescriptor@3952['enable'], JavaMethodDescriptor@3953['enable'] } // through LazyJavaClassMemberScope@3775
-    functions('enableEvents': Name@201) = ArrayList@3954[1] { JavaMethodDescriptor@3955['enableEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('enableInputMethods': Name@204) = ArrayList@3956[1] { JavaMethodDescriptor@3957['enableInputMethods'] } // through LazyJavaClassMemberScope@3775
-    functions('equals': Name@207) = ArrayList@3958[1] { DeserializedSimpleFunctionDescriptor@3959['equals'] } // through LazyJavaClassMemberScope@3775
-    functions('eventEnabled': Name@2619) = ArrayList@3960[1] { JavaMethodDescriptor@3961['eventEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('eventTypeEnabled': Name@213) = ArrayList@3962[1] { JavaMethodDescriptor@3963['eventTypeEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('findComponentAt': Name@1525) = ArrayList@3964[3] { JavaMethodDescriptor@3965['findComponentAt'], JavaMethodDescriptor@3966['findComponentAt'], JavaMethodDescriptor@3967['findComponentAt'] } // through LazyJavaClassMemberScope@3775
-    functions('findComponentAtImpl': Name@1530) = ArrayList@3968[1] { JavaMethodDescriptor@3969['findComponentAtImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('findTraversalRoot': Name@1533) = ArrayList@3970[1] { JavaMethodDescriptor@3971['findTraversalRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('findUnderMouseInWindow': Name@220) = ArrayList@3972[1] { JavaMethodDescriptor@3973['findUnderMouseInWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('firePropertyChange': Name@223) = ArrayList@3974[9] { JavaMethodDescriptor@3975['firePropertyChange'], JavaMethodDescriptor@3976['firePropertyChange'], JavaMethodDescriptor@3977['firePropertyChange'], ... } // through LazyJavaClassMemberScope@3775
-    functions('frameInit': Name@3978) = ArrayList@3979[1] { JavaMethodDescriptor@3980['frameInit'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessControlContext': Name@229) = ArrayList@3981[1] { JavaMethodDescriptor@3982['getAccessControlContext'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleAt': Name@1544) = ArrayList@3983[1] { JavaMethodDescriptor@3984['getAccessibleAt'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleChild': Name@1547) = ArrayList@3985[1] { JavaMethodDescriptor@3986['getAccessibleChild'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleChildrenCount': Name@1550) = ArrayList@3987[1] { JavaMethodDescriptor@3988['getAccessibleChildrenCount'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleContext': Name@3989) = ArrayList@3990[1] { JavaMethodDescriptor@3991['getAccessibleContext'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleIndexInParent': Name@238) = ArrayList@3992[1] { JavaMethodDescriptor@3993['getAccessibleIndexInParent'] } // through LazyJavaClassMemberScope@3775
-    functions('getAccessibleStateSet': Name@241) = ArrayList@3994[1] { JavaMethodDescriptor@3995['getAccessibleStateSet'] } // through LazyJavaClassMemberScope@3775
-    functions('getAlignmentX': Name@1559) = ArrayList@3996[1] { JavaMethodDescriptor@3997['getAlignmentX'] } // through LazyJavaClassMemberScope@3775
-    functions('getAlignmentY': Name@1562) = ArrayList@3998[1] { JavaMethodDescriptor@3999['getAlignmentY'] } // through LazyJavaClassMemberScope@3775
-    functions('getAppliedShape': Name@250) = ArrayList@4000[1] { JavaMethodDescriptor@4001['getAppliedShape'] } // through LazyJavaClassMemberScope@3775
-    functions('getBackBuffer': Name@253) = ArrayList@4002[1] { JavaMethodDescriptor@4003['getBackBuffer'] } // through LazyJavaClassMemberScope@3775
-    functions('getBackground': Name@2661) = ArrayList@4004[1] { JavaMethodDescriptor@4005['getBackground'] } // through LazyJavaClassMemberScope@3775
-    functions('getBaseline': Name@259) = ArrayList@4006[1] { JavaMethodDescriptor@4007['getBaseline'] } // through LazyJavaClassMemberScope@3775
-    functions('getBaselineResizeBehavior': Name@262) = ArrayList@4008[1] { JavaMethodDescriptor@4009['getBaselineResizeBehavior'] } // through LazyJavaClassMemberScope@3775
-    functions('getBottommostComponentIndex': Name@1575) = ArrayList@4010[1] { JavaMethodDescriptor@4011['getBottommostComponentIndex'] } // through LazyJavaClassMemberScope@3775
-    functions('getBounds': Name@266) = ArrayList@4012[2] { JavaMethodDescriptor@4013['getBounds'], JavaMethodDescriptor@4014['getBounds'] } // through LazyJavaClassMemberScope@3775
-    functions('getBoundsOp': Name@270) = ArrayList@4015[1] { JavaMethodDescriptor@4016['getBoundsOp'] } // through LazyJavaClassMemberScope@3775
-    functions('getBufferStrategy': Name@2675) = ArrayList@4017[1] { JavaMethodDescriptor@4018['getBufferStrategy'] } // through LazyJavaClassMemberScope@3775
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('getColorModel': Name@277) = ArrayList@4019[1] { JavaMethodDescriptor@4020['getColorModel'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponent': Name@1587) = ArrayList@4021[1] { JavaMethodDescriptor@4022['getComponent'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentAt': Name@1590) = ArrayList@4023[2] { JavaMethodDescriptor@4024['getComponentAt'], JavaMethodDescriptor@4025['getComponentAt'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentCount': Name@1594) = ArrayList@4026[1] { JavaMethodDescriptor@4027['getComponentCount'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentListeners': Name@286) = ArrayList@4028[1] { JavaMethodDescriptor@4029['getComponentListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentOrientation': Name@289) = ArrayList@4030[1] { JavaMethodDescriptor@4031['getComponentOrientation'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentZOrder': Name@1601) = ArrayList@4032[1] { JavaMethodDescriptor@4033['getComponentZOrder'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponents': Name@1604) = ArrayList@4034[1] { JavaMethodDescriptor@4035['getComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponentsSync': Name@1607) = ArrayList@4036[1] { JavaMethodDescriptor@4037['getComponentsSync'] } // through LazyJavaClassMemberScope@3775
-    functions('getComponents_NoClientCode': Name@1610) = ArrayList@4038[1] { JavaMethodDescriptor@4039['getComponents_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getContainer': Name@2699) = ArrayList@4040[1] { JavaMethodDescriptor@4041['getContainer'] } // through LazyJavaClassMemberScope@3775
-    functions('getContainerListeners': Name@1615) = ArrayList@4042[1] { JavaMethodDescriptor@4043['getContainerListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getContainingWindow': Name@300) = ArrayList@4044[1] { JavaMethodDescriptor@4045['getContainingWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('getContentPane': Name@4046) = ArrayList@4047[1] { JavaMethodDescriptor@4048['getContentPane'] } // through LazyJavaClassMemberScope@3775
-    functions('getCursor': Name@304) = ArrayList@4049[1] { JavaMethodDescriptor@4050['getCursor'] } // through LazyJavaClassMemberScope@3775
-    functions('getCursorType': Name@2708) = ArrayList@4051[1] { JavaMethodDescriptor@4052['getCursorType'] } // through LazyJavaClassMemberScope@3775
-    functions('getCursor_NoClientCode': Name@308) = ArrayList@4053[1] { JavaMethodDescriptor@4054['getCursor_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getDefaultCloseOperation': Name@4055) = ArrayList@4056[1] { JavaMethodDescriptor@4057['getDefaultCloseOperation'] } // through LazyJavaClassMemberScope@3775
-    functions('getDocumentRoot': Name@2713) = ArrayList@4058[1] { JavaMethodDescriptor@4059['getDocumentRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('getDropTarget': Name@313) = ArrayList@4060[1] { JavaMethodDescriptor@4061['getDropTarget'] } // through LazyJavaClassMemberScope@3775
-    functions('getDropTargetEventTarget': Name@1626) = ArrayList@4062[1] { JavaMethodDescriptor@4063['getDropTargetEventTarget'] } // through LazyJavaClassMemberScope@3775
-    functions('getExtendedState': Name@2720) = ArrayList@4064[1] { JavaMethodDescriptor@4065['getExtendedState'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusCycleRootAncestor': Name@2723) = ArrayList@4066[1] { JavaMethodDescriptor@4067['getFocusCycleRootAncestor'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusListeners': Name@321) = ArrayList@4068[1] { JavaMethodDescriptor@4069['getFocusListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusOwner': Name@2728) = ArrayList@4070[1] { JavaMethodDescriptor@4071['getFocusOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusTraversalKeys': Name@2731) = ArrayList@4072[1] { JavaMethodDescriptor@4073['getFocusTraversalKeys'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusTraversalKeysEnabled': Name@328) = ArrayList@4074[1] { JavaMethodDescriptor@4075['getFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusTraversalKeys_NoIDCheck': Name@331) = ArrayList@4076[1] { JavaMethodDescriptor@4077['getFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusTraversalPolicy': Name@1640) = ArrayList@4078[1] { JavaMethodDescriptor@4079['getFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@3775
-    functions('getFocusableWindowState': Name@2740) = ArrayList@4080[1] { JavaMethodDescriptor@4081['getFocusableWindowState'] } // through LazyJavaClassMemberScope@3775
-    functions('getFont': Name@336) = ArrayList@4082[1] { JavaMethodDescriptor@4083['getFont'] } // through LazyJavaClassMemberScope@3775
-    functions('getFontMetrics': Name@339) = ArrayList@4084[1] { JavaMethodDescriptor@4085['getFontMetrics'] } // through LazyJavaClassMemberScope@3775
-    functions('getFont_NoClientCode': Name@342) = ArrayList@4086[1] { JavaMethodDescriptor@4087['getFont_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getForeground': Name@345) = ArrayList@4088[1] { JavaMethodDescriptor@4089['getForeground'] } // through LazyJavaClassMemberScope@3775
-    functions('getGlassPane': Name@4090) = ArrayList@4091[1] { JavaMethodDescriptor@4092['getGlassPane'] } // through LazyJavaClassMemberScope@3775
-    functions('getGraphics': Name@4093) = ArrayList@4094[1] { JavaMethodDescriptor@4095['getGraphics'] } // through LazyJavaClassMemberScope@3775
-    functions('getGraphicsConfiguration': Name@352) = ArrayList@4096[1] { JavaMethodDescriptor@4097['getGraphicsConfiguration'] } // through LazyJavaClassMemberScope@3775
-    functions('getGraphicsConfiguration_NoClientCode': Name@355) = ArrayList@4098[1] { JavaMethodDescriptor@4099['getGraphicsConfiguration_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getGraphics_NoClientCode': Name@358) = ArrayList@4100[1] { JavaMethodDescriptor@4101['getGraphics_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getHWPeerAboveMe': Name@361) = ArrayList@4102[1] { JavaMethodDescriptor@4103['getHWPeerAboveMe'] } // through LazyJavaClassMemberScope@3775
-    functions('getHeavyweightContainer': Name@1661) = ArrayList@4104[1] { JavaMethodDescriptor@4105['getHeavyweightContainer'] } // through LazyJavaClassMemberScope@3775
-    functions('getHeight': Name@365) = ArrayList@4106[1] { JavaMethodDescriptor@4107['getHeight'] } // through LazyJavaClassMemberScope@3775
-    functions('getHierarchyBoundsListeners': Name@368) = ArrayList@4108[1] { JavaMethodDescriptor@4109['getHierarchyBoundsListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getHierarchyListeners': Name@371) = ArrayList@4110[1] { JavaMethodDescriptor@4111['getHierarchyListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getIconImage': Name@2769) = ArrayList@4112[1] { JavaMethodDescriptor@4113['getIconImage'] } // through LazyJavaClassMemberScope@3775
-    functions('getIconImages': Name@2772) = ArrayList@4114[1] { JavaMethodDescriptor@4115['getIconImages'] } // through LazyJavaClassMemberScope@3775
-    functions('getIgnoreRepaint': Name@376) = ArrayList@4116[1] { JavaMethodDescriptor@4117['getIgnoreRepaint'] } // through LazyJavaClassMemberScope@3775
-    functions('getInputContext': Name@2777) = ArrayList@4118[1] { JavaMethodDescriptor@4119['getInputContext'] } // through LazyJavaClassMemberScope@3775
-    functions('getInputMethodListeners': Name@382) = ArrayList@4120[1] { JavaMethodDescriptor@4121['getInputMethodListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getInputMethodRequests': Name@385) = ArrayList@4122[1] { JavaMethodDescriptor@4123['getInputMethodRequests'] } // through LazyJavaClassMemberScope@3775
-    functions('getInsets': Name@1678) = ArrayList@4124[1] { JavaMethodDescriptor@4125['getInsets'] } // through LazyJavaClassMemberScope@3775
-    functions('getInsets_NoClientCode': Name@389) = ArrayList@4126[1] { JavaMethodDescriptor@4127['getInsets_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getJMenuBar': Name@4128) = ArrayList@4129[1] { JavaMethodDescriptor@4130['getJMenuBar'] } // through LazyJavaClassMemberScope@3775
-    functions('getKeyListeners': Name@393) = ArrayList@4131[1] { JavaMethodDescriptor@4132['getKeyListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getLayeredPane': Name@4133) = ArrayList@4134[1] { JavaMethodDescriptor@4135['getLayeredPane'] } // through LazyJavaClassMemberScope@3775
-    functions('getLayout': Name@1685) = ArrayList@4136[1] { JavaMethodDescriptor@4137['getLayout'] } // through LazyJavaClassMemberScope@3775
-    functions('getListeners': Name@2792) = ArrayList@4138[1] { JavaMethodDescriptor@4139['getListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getListenersCount': Name@1691) = ArrayList@4140[1] { JavaMethodDescriptor@4141['getListenersCount'] } // through LazyJavaClassMemberScope@3775
-    functions('getLocale': Name@2797) = ArrayList@4142[1] { JavaMethodDescriptor@4143['getLocale'] } // through LazyJavaClassMemberScope@3775
-    functions('getLocation': Name@405) = ArrayList@4144[2] { JavaMethodDescriptor@4145['getLocation'], JavaMethodDescriptor@4146['getLocation'] } // through LazyJavaClassMemberScope@3775
-    functions('getLocationOnScreen': Name@409) = ArrayList@4147[1] { JavaMethodDescriptor@4148['getLocationOnScreen'] } // through LazyJavaClassMemberScope@3775
-    functions('getLocationOnScreen_NoTreeLock': Name@412) = ArrayList@4149[1] { JavaMethodDescriptor@4150['getLocationOnScreen_NoTreeLock'] } // through LazyJavaClassMemberScope@3775
-    functions('getLocationOnWindow': Name@2807) = ArrayList@4151[1] { JavaMethodDescriptor@4152['getLocationOnWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('getMaximizedBounds': Name@2810) = ArrayList@4153[1] { JavaMethodDescriptor@4154['getMaximizedBounds'] } // through LazyJavaClassMemberScope@3775
-    functions('getMaximumSize': Name@1705) = ArrayList@4155[1] { JavaMethodDescriptor@4156['getMaximumSize'] } // through LazyJavaClassMemberScope@3775
-    functions('getMenuBar': Name@2815) = ArrayList@4157[1] { JavaMethodDescriptor@4158['getMenuBar'] } // through LazyJavaClassMemberScope@3775
-    functions('getMinimumSize': Name@1708) = ArrayList@4159[1] { JavaMethodDescriptor@4160['getMinimumSize'] } // through LazyJavaClassMemberScope@3775
-    functions('getModalBlocker': Name@2820) = ArrayList@4161[1] { JavaMethodDescriptor@4162['getModalBlocker'] } // through LazyJavaClassMemberScope@3775
-    functions('getModalExclusionType': Name@2823) = ArrayList@4163[1] { JavaMethodDescriptor@4164['getModalExclusionType'] } // through LazyJavaClassMemberScope@3775
-    functions('getMostRecentFocusOwner': Name@2826) = ArrayList@4165[1] { JavaMethodDescriptor@4166['getMostRecentFocusOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('getMouseEventTarget': Name@1711) = ArrayList@4167[3] { JavaMethodDescriptor@4168['getMouseEventTarget'], JavaMethodDescriptor@4169['getMouseEventTarget'], JavaMethodDescriptor@4170['getMouseEventTarget'] } // through LazyJavaClassMemberScope@3775
-    functions('getMouseEventTargetImpl': Name@1716) = ArrayList@4171[2] { JavaMethodDescriptor@4172['getMouseEventTargetImpl'], JavaMethodDescriptor@4173['getMouseEventTargetImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('getMouseListeners': Name@431) = ArrayList@4174[1] { JavaMethodDescriptor@4175['getMouseListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getMouseMotionListeners': Name@434) = ArrayList@4176[1] { JavaMethodDescriptor@4177['getMouseMotionListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getMousePosition': Name@1724) = ArrayList@4178[2] { JavaMethodDescriptor@4179['getMousePosition'], JavaMethodDescriptor@4180['getMousePosition'] } // through LazyJavaClassMemberScope@3775
-    functions('getMouseWheelListeners': Name@440) = ArrayList@4181[1] { JavaMethodDescriptor@4182['getMouseWheelListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getName': Name@443) = ArrayList@4183[1] { JavaMethodDescriptor@4184['getName'] } // through LazyJavaClassMemberScope@3775
-    functions('getNativeContainer': Name@446) = ArrayList@4185[1] { JavaMethodDescriptor@4186['getNativeContainer'] } // through LazyJavaClassMemberScope@3775
-    functions('getNextFocusCandidate': Name@449) = ArrayList@4187[1] { JavaMethodDescriptor@4188['getNextFocusCandidate'] } // through LazyJavaClassMemberScope@3775
-    functions('getNormalShape': Name@452) = ArrayList@4189[1] { JavaMethodDescriptor@4190['getNormalShape'] } // through LazyJavaClassMemberScope@3775
-    functions('getObjectLock': Name@455) = ArrayList@4191[1] { JavaMethodDescriptor@4192['getObjectLock'] } // through LazyJavaClassMemberScope@3775
-    functions('getOpacity': Name@2855) = ArrayList@4193[1] { JavaMethodDescriptor@4194['getOpacity'] } // through LazyJavaClassMemberScope@3775
-    functions('getOpaqueShape': Name@1740) = ArrayList@4195[1] { JavaMethodDescriptor@4196['getOpaqueShape'] } // through LazyJavaClassMemberScope@3775
-    functions('getOwnedWindows': Name@2860) = ArrayList@4197[1] { JavaMethodDescriptor@4198['getOwnedWindows'] } // through LazyJavaClassMemberScope@3775
-    functions('getOwnedWindows_NoClientCode': Name@2863) = ArrayList@4199[1] { JavaMethodDescriptor@4200['getOwnedWindows_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getOwner': Name@2866) = ArrayList@4201[1] { JavaMethodDescriptor@4202['getOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('getOwner_NoClientCode': Name@2869) = ArrayList@4203[1] { JavaMethodDescriptor@4204['getOwner_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getParent': Name@466) = ArrayList@4205[1] { JavaMethodDescriptor@4206['getParent'] } // through LazyJavaClassMemberScope@3775
-    functions('getParent_NoClientCode': Name@469) = ArrayList@4207[1] { JavaMethodDescriptor@4208['getParent_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('getPeer': Name@472) = ArrayList@4209[1] { JavaMethodDescriptor@4210['getPeer'] } // through LazyJavaClassMemberScope@3775
-    functions('getPreferredSize': Name@1749) = ArrayList@4211[1] { JavaMethodDescriptor@4212['getPreferredSize'] } // through LazyJavaClassMemberScope@3775
-    functions('getPropertyChangeListeners': Name@478) = ArrayList@4213[2] { JavaMethodDescriptor@4214['getPropertyChangeListeners'], JavaMethodDescriptor@4215['getPropertyChangeListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getRootPane': Name@4216) = ArrayList@4217[1] { JavaMethodDescriptor@4218['getRootPane'] } // through LazyJavaClassMemberScope@3775
-    functions('getShape': Name@2883) = ArrayList@4219[1] { JavaMethodDescriptor@4220['getShape'] } // through LazyJavaClassMemberScope@3775
-    functions('getSiblingIndexAbove': Name@484) = ArrayList@4221[1] { JavaMethodDescriptor@3773['getSiblingIndexAbove'] } // through LazyJavaClassMemberScope@3775
-    functions('getSiblingIndexBelow': Name@487) = ArrayList@4222[1] { JavaMethodDescriptor@4223['getSiblingIndexBelow'] } // through LazyJavaClassMemberScope@3775
-    functions('getSize': Name@490) = ArrayList@4224[2] { JavaMethodDescriptor@4225['getSize'], JavaMethodDescriptor@4226['getSize'] } // through LazyJavaClassMemberScope@3775
-    functions('getState': Name@2893) = ArrayList@4227[1] { JavaMethodDescriptor@4228['getState'] } // through LazyJavaClassMemberScope@3775
-    functions('getTemporaryLostComponent': Name@2896) = ArrayList@4229[1] { JavaMethodDescriptor@4230['getTemporaryLostComponent'] } // through LazyJavaClassMemberScope@3775
-    functions('getTitle': Name@2899) = ArrayList@4231[1] { JavaMethodDescriptor@4232['getTitle'] } // through LazyJavaClassMemberScope@3775
-    functions('getToolkit': Name@2902) = ArrayList@4233[1] { JavaMethodDescriptor@4234['getToolkit'] } // through LazyJavaClassMemberScope@3775
-    functions('getToolkitImpl': Name@500) = ArrayList@4235[1] { JavaMethodDescriptor@4236['getToolkitImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('getTopmostComponentIndex': Name@1766) = ArrayList@4237[1] { JavaMethodDescriptor@4238['getTopmostComponentIndex'] } // through LazyJavaClassMemberScope@3775
-    functions('getTransferHandler': Name@4239) = ArrayList@4240[1] { JavaMethodDescriptor@4241['getTransferHandler'] } // through LazyJavaClassMemberScope@3775
-    functions('getTraversalRoot': Name@1769) = ArrayList@4242[1] { JavaMethodDescriptor@4243['getTraversalRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('getTreeLock': Name@508) = ArrayList@4244[1] { JavaMethodDescriptor@4245['getTreeLock'] } // through LazyJavaClassMemberScope@3775
-    functions('getType': Name@2913) = ArrayList@4246[1] { JavaMethodDescriptor@4247['getType'] } // through LazyJavaClassMemberScope@3775
-    functions('getWarningString': Name@2916) = ArrayList@4248[1] { JavaMethodDescriptor@4249['getWarningString'] } // through LazyJavaClassMemberScope@3775
-    functions('getWidth': Name@513) = ArrayList@4250[1] { JavaMethodDescriptor@4251['getWidth'] } // through LazyJavaClassMemberScope@3775
-    functions('getWindowFocusListeners': Name@2921) = ArrayList@4252[1] { JavaMethodDescriptor@4253['getWindowFocusListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getWindowListeners': Name@2924) = ArrayList@4254[1] { JavaMethodDescriptor@4255['getWindowListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getWindowStateListeners': Name@2927) = ArrayList@4256[1] { JavaMethodDescriptor@4257['getWindowStateListeners'] } // through LazyJavaClassMemberScope@3775
-    functions('getX': Name@519) = ArrayList@4258[1] { JavaMethodDescriptor@4259['getX'] } // through LazyJavaClassMemberScope@3775
-    functions('getY': Name@522) = ArrayList@4260[1] { JavaMethodDescriptor@4261['getY'] } // through LazyJavaClassMemberScope@3775
-    functions('gotFocus': Name@525) = ArrayList@4262[1] { JavaMethodDescriptor@4263['gotFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('handleEvent': Name@528) = ArrayList@4264[1] { JavaMethodDescriptor@4265['handleEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('hasFocus': Name@531) = ArrayList@4266[1] { JavaMethodDescriptor@4267['hasFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('hasHeavyweightDescendants': Name@1786) = ArrayList@4268[1] { JavaMethodDescriptor@4269['hasHeavyweightDescendants'] } // through LazyJavaClassMemberScope@3775
-    functions('hasLightweightDescendants': Name@1789) = ArrayList@4270[1] { JavaMethodDescriptor@4271['hasLightweightDescendants'] } // through LazyJavaClassMemberScope@3775
-    functions('hashCode': Name@536) = ArrayList@4272[1] { DeserializedSimpleFunctionDescriptor@4273['hashCode'] } // through LazyJavaClassMemberScope@3775
-    functions('hide': Name@2946) = ArrayList@4274[1] { JavaMethodDescriptor@4275['hide'] } // through LazyJavaClassMemberScope@3775
-    functions('imageUpdate': Name@542) = ArrayList@4276[1] { JavaMethodDescriptor@4277['imageUpdate'] } // through LazyJavaClassMemberScope@3775
-    functions('increaseComponentCount': Name@1798) = ArrayList@4278[1] { JavaMethodDescriptor@4279['increaseComponentCount'] } // through LazyJavaClassMemberScope@3775
-    functions('init': Name@2953) = ArrayList@4280[2] { JavaMethodDescriptor@4281['init'], JavaMethodDescriptor@4282['init'] } // through LazyJavaClassMemberScope@3775
-    functions('initDeserializedWindow': Name@2957) = ArrayList@4283[1] { JavaMethodDescriptor@4284['initDeserializedWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('initGC': Name@2960) = ArrayList@4285[1] { JavaMethodDescriptor@4286['initGC'] } // through LazyJavaClassMemberScope@3775
-    functions('initializeFocusTraversalKeys': Name@1801) = ArrayList@4287[1] { JavaMethodDescriptor@4288['initializeFocusTraversalKeys'] } // through LazyJavaClassMemberScope@3775
-    functions('insets': Name@1804) = ArrayList@4289[1] { JavaMethodDescriptor@4290['insets'] } // through LazyJavaClassMemberScope@3775
-    functions('inside': Name@553) = ArrayList@4291[1] { JavaMethodDescriptor@4292['inside'] } // through LazyJavaClassMemberScope@3775
-    functions('invalidate': Name@1809) = ArrayList@4293[1] { JavaMethodDescriptor@4294['invalidate'] } // through LazyJavaClassMemberScope@3775
-    functions('invalidateIfValid': Name@559) = ArrayList@4295[1] { JavaMethodDescriptor@4296['invalidateIfValid'] } // through LazyJavaClassMemberScope@3775
-    functions('invalidateParent': Name@1814) = ArrayList@4297[1] { JavaMethodDescriptor@4298['invalidateParent'] } // through LazyJavaClassMemberScope@3775
-    functions('invalidateTree': Name@1817) = ArrayList@4299[1] { JavaMethodDescriptor@4300['invalidateTree'] } // through LazyJavaClassMemberScope@3775
-    functions('isActive': Name@2977) = ArrayList@4301[1] { JavaMethodDescriptor@4302['isActive'] } // through LazyJavaClassMemberScope@3775
-    functions('isAlwaysOnTop': Name@2980) = ArrayList@4303[1] { JavaMethodDescriptor@4304['isAlwaysOnTop'] } // through LazyJavaClassMemberScope@3775
-    functions('isAlwaysOnTopSupported': Name@2983) = ArrayList@4305[1] { JavaMethodDescriptor@4306['isAlwaysOnTopSupported'] } // through LazyJavaClassMemberScope@3775
-    functions('isAncestorOf': Name@1820) = ArrayList@4307[1] { JavaMethodDescriptor@4308['isAncestorOf'] } // through LazyJavaClassMemberScope@3775
-    functions('isAutoFocusTransferOnDisposal': Name@570) = ArrayList@4309[1] { JavaMethodDescriptor@4310['isAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@3775
-    functions('isAutoRequestFocus': Name@2990) = ArrayList@4311[1] { JavaMethodDescriptor@4312['isAutoRequestFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('isBackgroundSet': Name@574) = ArrayList@4313[1] { JavaMethodDescriptor@4314['isBackgroundSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isCoalescingEnabled': Name@577) = ArrayList@4315[1] { JavaMethodDescriptor@4316['isCoalescingEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('isCursorSet': Name@580) = ArrayList@4317[1] { JavaMethodDescriptor@4318['isCursorSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isDisplayable': Name@583) = ArrayList@4319[1] { JavaMethodDescriptor@4320['isDisplayable'] } // through LazyJavaClassMemberScope@3775
-    functions('isDisposing': Name@3001) = ArrayList@4321[1] { JavaMethodDescriptor@4322['isDisposing'] } // through LazyJavaClassMemberScope@3775
-    functions('isDoubleBuffered': Name@587) = ArrayList@4323[1] { JavaMethodDescriptor@4324['isDoubleBuffered'] } // through LazyJavaClassMemberScope@3775
-    functions('isEnabled': Name@590) = ArrayList@4325[1] { JavaMethodDescriptor@4326['isEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('isEnabledImpl': Name@593) = ArrayList@4327[1] { JavaMethodDescriptor@4328['isEnabledImpl'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusCycleRoot': Name@3010) = ArrayList@4329[2] { JavaMethodDescriptor@4330['isFocusCycleRoot'], JavaMethodDescriptor@4331['isFocusCycleRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusOwner': Name@599) = ArrayList@4332[1] { JavaMethodDescriptor@4333['isFocusOwner'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusTraversable': Name@602) = ArrayList@4334[1] { JavaMethodDescriptor@4335['isFocusTraversable'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusTraversableOverridden': Name@605) = ArrayList@4336[1] { JavaMethodDescriptor@4337['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusTraversalPolicyProvider': Name@1849) = ArrayList@4338[1] { JavaMethodDescriptor@4339['isFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusTraversalPolicySet': Name@1852) = ArrayList@4340[1] { JavaMethodDescriptor@4341['isFocusTraversalPolicySet'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusable': Name@610) = ArrayList@4342[1] { JavaMethodDescriptor@4343['isFocusable'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocusableWindow': Name@3026) = ArrayList@4344[1] { JavaMethodDescriptor@4345['isFocusableWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('isFocused': Name@3029) = ArrayList@4346[1] { JavaMethodDescriptor@4347['isFocused'] } // through LazyJavaClassMemberScope@3775
-    functions('isFontSet': Name@615) = ArrayList@4348[1] { JavaMethodDescriptor@4349['isFontSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isForegroundSet': Name@618) = ArrayList@4350[1] { JavaMethodDescriptor@4351['isForegroundSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isFrameStateSupported': Name@3036) = ArrayList@4352[1] { JavaMethodDescriptor@4353['isFrameStateSupported'] } // through LazyJavaClassMemberScope@3775
-    functions('isLightweight': Name@622) = ArrayList@4354[1] { JavaMethodDescriptor@4355['isLightweight'] } // through LazyJavaClassMemberScope@3775
-    functions('isLocationByPlatform': Name@3041) = ArrayList@4356[1] { JavaMethodDescriptor@4357['isLocationByPlatform'] } // through LazyJavaClassMemberScope@3775
-    functions('isMaximumSizeSet': Name@626) = ArrayList@4358[1] { JavaMethodDescriptor@4359['isMaximumSizeSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isMinimumSizeSet': Name@629) = ArrayList@4360[1] { JavaMethodDescriptor@4361['isMinimumSizeSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isMixingNeeded': Name@632) = ArrayList@4362[1] { JavaMethodDescriptor@4363['isMixingNeeded'] } // through LazyJavaClassMemberScope@3775
-    functions('isModalBlocked': Name@3050) = ArrayList@4364[1] { JavaMethodDescriptor@4365['isModalBlocked'] } // through LazyJavaClassMemberScope@3775
-    functions('isModalExcluded': Name@3053) = ArrayList@4366[1] { JavaMethodDescriptor@4367['isModalExcluded'] } // through LazyJavaClassMemberScope@3775
-    functions('isNonOpaqueForMixing': Name@637) = ArrayList@4368[1] { JavaMethodDescriptor@4369['isNonOpaqueForMixing'] } // through LazyJavaClassMemberScope@3775
-    functions('isOpaque': Name@3058) = ArrayList@4370[1] { JavaMethodDescriptor@4371['isOpaque'] } // through LazyJavaClassMemberScope@3775
-    functions('isParentOf': Name@1873) = ArrayList@4372[1] { JavaMethodDescriptor@4373['isParentOf'] } // through LazyJavaClassMemberScope@3775
-    functions('isPreferredSizeSet': Name@644) = ArrayList@4374[1] { JavaMethodDescriptor@4375['isPreferredSizeSet'] } // through LazyJavaClassMemberScope@3775
-    functions('isRecursivelyVisible': Name@3065) = ArrayList@4376[1] { JavaMethodDescriptor@4377['isRecursivelyVisible'] } // through LazyJavaClassMemberScope@3775
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@1880) = ArrayList@4378[1] { JavaMethodDescriptor@4379['isRecursivelyVisibleUpToHeavyweightContainer'] } // through LazyJavaClassMemberScope@3775
-    functions('isRequestFocusAccepted': Name@651) = ArrayList@4380[1] { JavaMethodDescriptor@4381['isRequestFocusAccepted'] } // through LazyJavaClassMemberScope@3775
-    functions('isResizable': Name@3072) = ArrayList@4382[1] { JavaMethodDescriptor@4383['isResizable'] } // through LazyJavaClassMemberScope@3775
-    functions('isRootPaneCheckingEnabled': Name@4384) = ArrayList@4385[1] { JavaMethodDescriptor@4386['isRootPaneCheckingEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('isSameOrAncestorOf': Name@1885) = ArrayList@4387[1] { JavaMethodDescriptor@4388['isSameOrAncestorOf'] } // through LazyJavaClassMemberScope@3775
-    functions('isShowing': Name@3077) = ArrayList@4389[1] { JavaMethodDescriptor@4390['isShowing'] } // through LazyJavaClassMemberScope@3775
-    functions('isUndecorated': Name@3080) = ArrayList@4391[1] { JavaMethodDescriptor@4392['isUndecorated'] } // through LazyJavaClassMemberScope@3775
-    functions('isValid': Name@663) = ArrayList@4393[1] { JavaMethodDescriptor@4394['isValid'] } // through LazyJavaClassMemberScope@3775
-    functions('isValidateRoot': Name@3085) = ArrayList@4395[1] { JavaMethodDescriptor@4396['isValidateRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('isVisible': Name@667) = ArrayList@4397[1] { JavaMethodDescriptor@4398['isVisible'] } // through LazyJavaClassMemberScope@3775
-    functions('isVisible_NoClientCode': Name@670) = ArrayList@4399[1] { JavaMethodDescriptor@4400['isVisible_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('keyDown': Name@673) = ArrayList@4401[1] { JavaMethodDescriptor@4402['keyDown'] } // through LazyJavaClassMemberScope@3775
-    functions('keyUp': Name@676) = ArrayList@4403[1] { JavaMethodDescriptor@4404['keyUp'] } // through LazyJavaClassMemberScope@3775
-    functions('layout': Name@1903) = ArrayList@4405[1] { JavaMethodDescriptor@4406['layout'] } // through LazyJavaClassMemberScope@3775
-    functions('lightweightPaint': Name@1906) = ArrayList@4407[1] { JavaMethodDescriptor@4408['lightweightPaint'] } // through LazyJavaClassMemberScope@3775
-    functions('lightweightPrint': Name@1909) = ArrayList@4409[1] { JavaMethodDescriptor@4410['lightweightPrint'] } // through LazyJavaClassMemberScope@3775
-    functions('list': Name@1912) = ArrayList@4411[5] { JavaMethodDescriptor@4412['list'], JavaMethodDescriptor@4413['list'], JavaMethodDescriptor@4414['list'], ... } // through LazyJavaClassMemberScope@3775
-    functions('locate': Name@1917) = ArrayList@4415[1] { JavaMethodDescriptor@4416['locate'] } // through LazyJavaClassMemberScope@3775
-    functions('location': Name@696) = ArrayList@4417[1] { JavaMethodDescriptor@4418['location'] } // through LazyJavaClassMemberScope@3775
-    functions('location_NoClientCode': Name@699) = ArrayList@4419[1] { JavaMethodDescriptor@4420['location_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('lostFocus': Name@702) = ArrayList@4421[1] { JavaMethodDescriptor@4422['lostFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('minimumSize': Name@1926) = ArrayList@4423[1] { JavaMethodDescriptor@4424['minimumSize'] } // through LazyJavaClassMemberScope@3775
-    functions('mixOnHiding': Name@1929) = ArrayList@4425[1] { JavaMethodDescriptor@4426['mixOnHiding'] } // through LazyJavaClassMemberScope@3775
-    functions('mixOnReshaping': Name@3118) = ArrayList@4427[1] { JavaMethodDescriptor@4428['mixOnReshaping'] } // through LazyJavaClassMemberScope@3775
-    functions('mixOnShowing': Name@1935) = ArrayList@4429[1] { JavaMethodDescriptor@4430['mixOnShowing'] } // through LazyJavaClassMemberScope@3775
-    functions('mixOnValidating': Name@1938) = ArrayList@4431[1] { JavaMethodDescriptor@4432['mixOnValidating'] } // through LazyJavaClassMemberScope@3775
-    functions('mixOnZOrderChanging': Name@1941) = ArrayList@4433[1] { JavaMethodDescriptor@4434['mixOnZOrderChanging'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseDown': Name@723) = ArrayList@4435[1] { JavaMethodDescriptor@4436['mouseDown'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseDrag': Name@726) = ArrayList@4437[1] { JavaMethodDescriptor@4438['mouseDrag'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseEnter': Name@729) = ArrayList@4439[1] { JavaMethodDescriptor@4440['mouseEnter'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseExit': Name@732) = ArrayList@4441[1] { JavaMethodDescriptor@4442['mouseExit'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseMove': Name@735) = ArrayList@4443[1] { JavaMethodDescriptor@4444['mouseMove'] } // through LazyJavaClassMemberScope@3775
-    functions('mouseUp': Name@738) = ArrayList@4445[1] { JavaMethodDescriptor@4446['mouseUp'] } // through LazyJavaClassMemberScope@3775
-    functions('move': Name@741) = ArrayList@4447[1] { JavaMethodDescriptor@3774['move'] } // through LazyJavaClassMemberScope@3775
-    functions('nextFocus': Name@744) = ArrayList@4448[1] { JavaMethodDescriptor@4449['nextFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('notifyNewBounds': Name@749) = ArrayList@4450[1] { JavaMethodDescriptor@4451['notifyNewBounds'] } // through LazyJavaClassMemberScope@3775
-    functions('numListening': Name@1962) = ArrayList@4452[1] { JavaMethodDescriptor@4453['numListening'] } // through LazyJavaClassMemberScope@3775
-    functions('ownedInit': Name@3147) = ArrayList@4454[1] { JavaMethodDescriptor@4455['ownedInit'] } // through LazyJavaClassMemberScope@3775
-    functions('pack': Name@3150) = ArrayList@4456[1] { JavaMethodDescriptor@4457['pack'] } // through LazyJavaClassMemberScope@3775
-    functions('paint': Name@3153) = ArrayList@4458[1] { JavaMethodDescriptor@4459['paint'] } // through LazyJavaClassMemberScope@3775
-    functions('paintAll': Name@760) = ArrayList@4460[1] { JavaMethodDescriptor@4461['paintAll'] } // through LazyJavaClassMemberScope@3775
-    functions('paintComponents': Name@1970) = ArrayList@4462[1] { JavaMethodDescriptor@4463['paintComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('paintHeavyweightComponents': Name@1973) = ArrayList@4464[1] { JavaMethodDescriptor@4465['paintHeavyweightComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('paramString': Name@4466) = ArrayList@4467[1] { JavaMethodDescriptor@4468['paramString'] } // through LazyJavaClassMemberScope@3775
-    functions('pointRelativeToComponent': Name@770) = ArrayList@4469[1] { JavaMethodDescriptor@4470['pointRelativeToComponent'] } // through LazyJavaClassMemberScope@3775
-    functions('postEvent': Name@3167) = ArrayList@4471[1] { JavaMethodDescriptor@4472['postEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('postProcessKeyEvent': Name@3170) = ArrayList@4473[1] { JavaMethodDescriptor@4474['postProcessKeyEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('postWindowEvent': Name@3173) = ArrayList@4475[1] { JavaMethodDescriptor@4476['postWindowEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('postsOldMouseEvents': Name@1986) = ArrayList@4477[1] { JavaMethodDescriptor@4478['postsOldMouseEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('preProcessKeyEvent': Name@3178) = ArrayList@4479[1] { JavaMethodDescriptor@4480['preProcessKeyEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('preferredSize': Name@1992) = ArrayList@4481[1] { JavaMethodDescriptor@4482['preferredSize'] } // through LazyJavaClassMemberScope@3775
-    functions('prepareImage': Name@785) = ArrayList@4483[2] { JavaMethodDescriptor@4484['prepareImage'], JavaMethodDescriptor@4485['prepareImage'] } // through LazyJavaClassMemberScope@3775
-    functions('print': Name@1998) = ArrayList@4486[1] { JavaMethodDescriptor@4487['print'] } // through LazyJavaClassMemberScope@3775
-    functions('printAll': Name@792) = ArrayList@4488[1] { JavaMethodDescriptor@4489['printAll'] } // through LazyJavaClassMemberScope@3775
-    functions('printComponents': Name@2003) = ArrayList@4490[1] { JavaMethodDescriptor@4491['printComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('printHeavyweightComponents': Name@2006) = ArrayList@4492[1] { JavaMethodDescriptor@4493['printHeavyweightComponents'] } // through LazyJavaClassMemberScope@3775
-    functions('processComponentEvent': Name@799) = ArrayList@4494[1] { JavaMethodDescriptor@4495['processComponentEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processContainerEvent': Name@2011) = ArrayList@4496[1] { JavaMethodDescriptor@4497['processContainerEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processEvent': Name@3198) = ArrayList@4498[1] { JavaMethodDescriptor@4499['processEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processFocusEvent': Name@806) = ArrayList@4500[1] { JavaMethodDescriptor@4501['processFocusEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processHierarchyBoundsEvent': Name@809) = ArrayList@4502[1] { JavaMethodDescriptor@4503['processHierarchyBoundsEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processHierarchyEvent': Name@812) = ArrayList@4504[1] { JavaMethodDescriptor@4505['processHierarchyEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processInputMethodEvent': Name@815) = ArrayList@4506[1] { JavaMethodDescriptor@4507['processInputMethodEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processKeyEvent': Name@818) = ArrayList@4508[1] { JavaMethodDescriptor@4509['processKeyEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processMouseEvent': Name@821) = ArrayList@4510[1] { JavaMethodDescriptor@4511['processMouseEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processMouseMotionEvent': Name@824) = ArrayList@4512[1] { JavaMethodDescriptor@4513['processMouseMotionEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processMouseWheelEvent': Name@827) = ArrayList@4514[1] { JavaMethodDescriptor@4515['processMouseWheelEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processWindowEvent': Name@4516) = ArrayList@4517[1] { JavaMethodDescriptor@4518['processWindowEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processWindowFocusEvent': Name@3220) = ArrayList@4519[1] { JavaMethodDescriptor@4520['processWindowFocusEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('processWindowStateEvent': Name@3223) = ArrayList@4521[1] { JavaMethodDescriptor@4522['processWindowStateEvent'] } // through LazyJavaClassMemberScope@3775
-    functions('proxyEnableEvents': Name@2033) = ArrayList@4523[1] { JavaMethodDescriptor@4524['proxyEnableEvents'] } // through LazyJavaClassMemberScope@3775
-    functions('readObject': Name@3228) = ArrayList@4525[1] { JavaMethodDescriptor@4526['readObject'] } // through LazyJavaClassMemberScope@3775
-    functions('recursiveApplyCurrentShape': Name@2039) = ArrayList@4527[3] { JavaMethodDescriptor@4528['recursiveApplyCurrentShape'], JavaMethodDescriptor@4529['recursiveApplyCurrentShape'], JavaMethodDescriptor@4530['recursiveApplyCurrentShape'] } // through LazyJavaClassMemberScope@3775
-    functions('recursiveHideHeavyweightChildren': Name@2044) = ArrayList@4531[1] { JavaMethodDescriptor@4532['recursiveHideHeavyweightChildren'] } // through LazyJavaClassMemberScope@3775
-    functions('recursiveRelocateHeavyweightChildren': Name@2047) = ArrayList@4533[1] { JavaMethodDescriptor@4534['recursiveRelocateHeavyweightChildren'] } // through LazyJavaClassMemberScope@3775
-    functions('recursiveShowHeavyweightChildren': Name@2050) = ArrayList@4535[1] { JavaMethodDescriptor@4536['recursiveShowHeavyweightChildren'] } // through LazyJavaClassMemberScope@3775
-    functions('recursiveSubtractAndApplyShape': Name@2053) = ArrayList@4537[3] { JavaMethodDescriptor@4538['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@4539['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@4540['recursiveSubtractAndApplyShape'] } // through LazyJavaClassMemberScope@3775
-    functions('relocateComponent': Name@842) = ArrayList@4541[1] { JavaMethodDescriptor@4542['relocateComponent'] } // through LazyJavaClassMemberScope@3775
-    functions('remove': Name@4543) = ArrayList@4544[2] { JavaMethodDescriptor@4545['remove'], JavaMethodDescriptor@4546['remove'] } // through LazyJavaClassMemberScope@3775
-    functions('removeAll': Name@2064) = ArrayList@4547[1] { JavaMethodDescriptor@4548['removeAll'] } // through LazyJavaClassMemberScope@3775
-    functions('removeComponentListener': Name@849) = ArrayList@4549[1] { JavaMethodDescriptor@4550['removeComponentListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeContainerListener': Name@2069) = ArrayList@4551[1] { JavaMethodDescriptor@4552['removeContainerListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeDelicately': Name@2072) = ArrayList@4553[1] { JavaMethodDescriptor@4554['removeDelicately'] } // through LazyJavaClassMemberScope@3775
-    functions('removeFocusListener': Name@854) = ArrayList@4555[1] { JavaMethodDescriptor@4556['removeFocusListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeFromWindowList': Name@3261) = ArrayList@4557[1] { JavaMethodDescriptor@4558['removeFromWindowList'] } // through LazyJavaClassMemberScope@3775
-    functions('removeHierarchyBoundsListener': Name@858) = ArrayList@4559[1] { JavaMethodDescriptor@4560['removeHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeHierarchyListener': Name@861) = ArrayList@4561[1] { JavaMethodDescriptor@4562['removeHierarchyListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeInputMethodListener': Name@864) = ArrayList@4563[1] { JavaMethodDescriptor@4564['removeInputMethodListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeKeyListener': Name@867) = ArrayList@4565[1] { JavaMethodDescriptor@4566['removeKeyListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeMouseListener': Name@870) = ArrayList@4567[1] { JavaMethodDescriptor@4568['removeMouseListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeMouseMotionListener': Name@873) = ArrayList@4569[1] { JavaMethodDescriptor@4570['removeMouseMotionListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeMouseWheelListener': Name@876) = ArrayList@4571[1] { JavaMethodDescriptor@4572['removeMouseWheelListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeNotify': Name@3278) = ArrayList@4573[1] { JavaMethodDescriptor@4574['removeNotify'] } // through LazyJavaClassMemberScope@3775
-    functions('removeOwnedWindow': Name@3281) = ArrayList@4575[1] { JavaMethodDescriptor@4576['removeOwnedWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('removePropertyChangeListener': Name@883) = ArrayList@4577[2] { JavaMethodDescriptor@4578['removePropertyChangeListener'], JavaMethodDescriptor@4579['removePropertyChangeListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeWindowFocusListener': Name@3287) = ArrayList@4580[1] { JavaMethodDescriptor@4581['removeWindowFocusListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeWindowListener': Name@3290) = ArrayList@4582[1] { JavaMethodDescriptor@4583['removeWindowListener'] } // through LazyJavaClassMemberScope@3775
-    functions('removeWindowStateListener': Name@3293) = ArrayList@4584[1] { JavaMethodDescriptor@4585['removeWindowStateListener'] } // through LazyJavaClassMemberScope@3775
-    functions('repaint': Name@4586) = ArrayList@4587[4] { JavaMethodDescriptor@4588['repaint'], JavaMethodDescriptor@4589['repaint'], JavaMethodDescriptor@4590['repaint'], ... } // through LazyJavaClassMemberScope@3775
-    functions('repaintParentIfNeeded': Name@895) = ArrayList@4591[1] { JavaMethodDescriptor@4592['repaintParentIfNeeded'] } // through LazyJavaClassMemberScope@3775
-    functions('reparentChild': Name@2103) = ArrayList@4593[1] { JavaMethodDescriptor@4594['reparentChild'] } // through LazyJavaClassMemberScope@3775
-    functions('reparentTraverse': Name@2106) = ArrayList@4595[1] { JavaMethodDescriptor@4596['reparentTraverse'] } // through LazyJavaClassMemberScope@3775
-    functions('requestFocus': Name@900) = ArrayList@4597[3] { JavaMethodDescriptor@4598['requestFocus'], JavaMethodDescriptor@4599['requestFocus'], JavaMethodDescriptor@4600['requestFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('requestFocusHelper': Name@905) = ArrayList@4601[2] { JavaMethodDescriptor@4602['requestFocusHelper'], JavaMethodDescriptor@4603['requestFocusHelper'] } // through LazyJavaClassMemberScope@3775
-    functions('requestFocusInWindow': Name@909) = ArrayList@4604[3] { JavaMethodDescriptor@4605['requestFocusInWindow'], JavaMethodDescriptor@4606['requestFocusInWindow'], JavaMethodDescriptor@4607['requestFocusInWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('reshape': Name@3317) = ArrayList@4608[1] { JavaMethodDescriptor@4609['reshape'] } // through LazyJavaClassMemberScope@3775
-    functions('reshapeNativePeer': Name@917) = ArrayList@4610[1] { JavaMethodDescriptor@4611['reshapeNativePeer'] } // through LazyJavaClassMemberScope@3775
-    functions('resize': Name@920) = ArrayList@4612[2] { JavaMethodDescriptor@4613['resize'], JavaMethodDescriptor@4614['resize'] } // through LazyJavaClassMemberScope@3775
-    functions('revalidate': Name@924) = ArrayList@4615[1] { JavaMethodDescriptor@4616['revalidate'] } // through LazyJavaClassMemberScope@3775
-    functions('setAlwaysOnTop': Name@3327) = ArrayList@4617[1] { JavaMethodDescriptor@4618['setAlwaysOnTop'] } // through LazyJavaClassMemberScope@3775
-    functions('setAutoFocusTransferOnDisposal': Name@928) = ArrayList@4619[1] { JavaMethodDescriptor@4620['setAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@3775
-    functions('setAutoRequestFocus': Name@3332) = ArrayList@4621[1] { JavaMethodDescriptor@4622['setAutoRequestFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('setBackground': Name@3335) = ArrayList@4623[1] { JavaMethodDescriptor@4624['setBackground'] } // through LazyJavaClassMemberScope@3775
-    functions('setBounds': Name@3338) = ArrayList@4625[2] { JavaMethodDescriptor@4626['setBounds'], JavaMethodDescriptor@4627['setBounds'] } // through LazyJavaClassMemberScope@3775
-    functions('setBoundsOp': Name@939) = ArrayList@4628[1] { JavaMethodDescriptor@4629['setBoundsOp'] } // through LazyJavaClassMemberScope@3775
-    functions('setClientSize': Name@3344) = ArrayList@4630[1] { JavaMethodDescriptor@4631['setClientSize'] } // through LazyJavaClassMemberScope@3775
-    functions('setComponentOrientation': Name@943) = ArrayList@4632[1] { JavaMethodDescriptor@4633['setComponentOrientation'] } // through LazyJavaClassMemberScope@3775
-    functions('setComponentZOrder': Name@2140) = ArrayList@4634[1] { JavaMethodDescriptor@4635['setComponentZOrder'] } // through LazyJavaClassMemberScope@3775
-    functions('setContentPane': Name@4636) = ArrayList@4637[1] { JavaMethodDescriptor@4638['setContentPane'] } // through LazyJavaClassMemberScope@3775
-    functions('setCursor': Name@3351) = ArrayList@4639[1] { JavaMethodDescriptor@4640['setCursor'] } // through LazyJavaClassMemberScope@3775
-    functions('setDefaultCloseOperation': Name@4641) = ArrayList@4642[1] { JavaMethodDescriptor@4643['setDefaultCloseOperation'] } // through LazyJavaClassMemberScope@3775
-    functions('setDropTarget': Name@952) = ArrayList@4644[1] { JavaMethodDescriptor@4645['setDropTarget'] } // through LazyJavaClassMemberScope@3775
-    functions('setEnabled': Name@955) = ArrayList@4646[1] { JavaMethodDescriptor@4647['setEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('setExtendedState': Name@3358) = ArrayList@4648[1] { JavaMethodDescriptor@4649['setExtendedState'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusCycleRoot': Name@3361) = ArrayList@4650[1] { JavaMethodDescriptor@4651['setFocusCycleRoot'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusTraversalKeys': Name@2152) = ArrayList@4652[1] { JavaMethodDescriptor@4653['setFocusTraversalKeys'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusTraversalKeysEnabled': Name@963) = ArrayList@4654[1] { JavaMethodDescriptor@4655['setFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusTraversalKeys_NoIDCheck': Name@966) = ArrayList@4656[1] { JavaMethodDescriptor@4657['setFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusTraversalPolicy': Name@2159) = ArrayList@4658[1] { JavaMethodDescriptor@4659['setFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusTraversalPolicyProvider': Name@2162) = ArrayList@4660[1] { JavaMethodDescriptor@4661['setFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusable': Name@971) = ArrayList@4662[1] { JavaMethodDescriptor@4663['setFocusable'] } // through LazyJavaClassMemberScope@3775
-    functions('setFocusableWindowState': Name@3376) = ArrayList@4664[1] { JavaMethodDescriptor@4665['setFocusableWindowState'] } // through LazyJavaClassMemberScope@3775
-    functions('setFont': Name@2167) = ArrayList@4666[1] { JavaMethodDescriptor@4667['setFont'] } // through LazyJavaClassMemberScope@3775
-    functions('setForeground': Name@978) = ArrayList@4668[1] { JavaMethodDescriptor@4669['setForeground'] } // through LazyJavaClassMemberScope@3775
-    functions('setGlassPane': Name@4670) = ArrayList@4671[1] { JavaMethodDescriptor@4672['setGlassPane'] } // through LazyJavaClassMemberScope@3775
-    functions('setGraphicsConfiguration': Name@3383) = ArrayList@4673[1] { JavaMethodDescriptor@4674['setGraphicsConfiguration'] } // through LazyJavaClassMemberScope@3775
-    functions('setIconImage': Name@4675) = ArrayList@4676[1] { JavaMethodDescriptor@4677['setIconImage'] } // through LazyJavaClassMemberScope@3775
-    functions('setIconImages': Name@3389) = ArrayList@4678[1] { JavaMethodDescriptor@4679['setIconImages'] } // through LazyJavaClassMemberScope@3775
-    functions('setIgnoreRepaint': Name@987) = ArrayList@4680[1] { JavaMethodDescriptor@4681['setIgnoreRepaint'] } // through LazyJavaClassMemberScope@3775
-    functions('setJMenuBar': Name@4682) = ArrayList@4683[1] { JavaMethodDescriptor@4684['setJMenuBar'] } // through LazyJavaClassMemberScope@3775
-    functions('setLayeredPane': Name@4685) = ArrayList@4686[1] { JavaMethodDescriptor@4687['setLayeredPane'] } // through LazyJavaClassMemberScope@3775
-    functions('setLayout': Name@4688) = ArrayList@4689[1] { JavaMethodDescriptor@4690['setLayout'] } // through LazyJavaClassMemberScope@3775
-    functions('setLocale': Name@993) = ArrayList@4691[1] { JavaMethodDescriptor@4692['setLocale'] } // through LazyJavaClassMemberScope@3775
-    functions('setLocation': Name@3398) = ArrayList@4693[2] { JavaMethodDescriptor@4694['setLocation'], JavaMethodDescriptor@4695['setLocation'] } // through LazyJavaClassMemberScope@3775
-    functions('setLocationByPlatform': Name@3402) = ArrayList@4696[1] { JavaMethodDescriptor@4697['setLocationByPlatform'] } // through LazyJavaClassMemberScope@3775
-    functions('setLocationRelativeTo': Name@3405) = ArrayList@4698[1] { JavaMethodDescriptor@4699['setLocationRelativeTo'] } // through LazyJavaClassMemberScope@3775
-    functions('setMaximizedBounds': Name@3408) = ArrayList@4700[1] { JavaMethodDescriptor@4701['setMaximizedBounds'] } // through LazyJavaClassMemberScope@3775
-    functions('setMaximumSize': Name@1003) = ArrayList@4702[1] { JavaMethodDescriptor@4703['setMaximumSize'] } // through LazyJavaClassMemberScope@3775
-    functions('setMenuBar': Name@3413) = ArrayList@4704[1] { JavaMethodDescriptor@4705['setMenuBar'] } // through LazyJavaClassMemberScope@3775
-    functions('setMinimumSize': Name@3416) = ArrayList@4706[1] { JavaMethodDescriptor@4707['setMinimumSize'] } // through LazyJavaClassMemberScope@3775
-    functions('setModalBlocked': Name@3419) = ArrayList@4708[1] { JavaMethodDescriptor@4709['setModalBlocked'] } // through LazyJavaClassMemberScope@3775
-    functions('setModalExclusionType': Name@3422) = ArrayList@4710[1] { JavaMethodDescriptor@4711['setModalExclusionType'] } // through LazyJavaClassMemberScope@3775
-    functions('setName': Name@1012) = ArrayList@4712[1] { JavaMethodDescriptor@4713['setName'] } // through LazyJavaClassMemberScope@3775
-    functions('setOpacity': Name@3427) = ArrayList@4714[1] { JavaMethodDescriptor@4715['setOpacity'] } // through LazyJavaClassMemberScope@3775
-    functions('setPreferredSize': Name@1016) = ArrayList@4716[1] { JavaMethodDescriptor@4717['setPreferredSize'] } // through LazyJavaClassMemberScope@3775
-    functions('setResizable': Name@3432) = ArrayList@4718[1] { JavaMethodDescriptor@4719['setResizable'] } // through LazyJavaClassMemberScope@3775
-    functions('setRootPane': Name@4720) = ArrayList@4721[1] { JavaMethodDescriptor@4722['setRootPane'] } // through LazyJavaClassMemberScope@3775
-    functions('setRootPaneCheckingEnabled': Name@4723) = ArrayList@4724[1] { JavaMethodDescriptor@4725['setRootPaneCheckingEnabled'] } // through LazyJavaClassMemberScope@3775
-    functions('setShape': Name@3435) = ArrayList@4726[1] { JavaMethodDescriptor@4727['setShape'] } // through LazyJavaClassMemberScope@3775
-    functions('setSize': Name@3438) = ArrayList@4728[2] { JavaMethodDescriptor@4729['setSize'], JavaMethodDescriptor@4730['setSize'] } // through LazyJavaClassMemberScope@3775
-    functions('setState': Name@3442) = ArrayList@4731[1] { JavaMethodDescriptor@4732['setState'] } // through LazyJavaClassMemberScope@3775
-    functions('setTemporaryLostComponent': Name@3445) = ArrayList@4733[1] { JavaMethodDescriptor@4734['setTemporaryLostComponent'] } // through LazyJavaClassMemberScope@3775
-    functions('setTitle': Name@3448) = ArrayList@4735[1] { JavaMethodDescriptor@4736['setTitle'] } // through LazyJavaClassMemberScope@3775
-    functions('setTransferHandler': Name@4737) = ArrayList@4738[1] { JavaMethodDescriptor@4739['setTransferHandler'] } // through LazyJavaClassMemberScope@3775
-    functions('setType': Name@3451) = ArrayList@4740[1] { JavaMethodDescriptor@4741['setType'] } // through LazyJavaClassMemberScope@3775
-    functions('setUndecorated': Name@3454) = ArrayList@4742[1] { JavaMethodDescriptor@4743['setUndecorated'] } // through LazyJavaClassMemberScope@3775
-    functions('setVisible': Name@3457) = ArrayList@4744[1] { JavaMethodDescriptor@4745['setVisible'] } // through LazyJavaClassMemberScope@3775
-    functions('setWarningString': Name@3460) = ArrayList@4746[1] { JavaMethodDescriptor@4747['setWarningString'] } // through LazyJavaClassMemberScope@3775
-    functions('show': Name@3463) = ArrayList@4748[2] { JavaMethodDescriptor@4749['show'], JavaMethodDescriptor@4750['show'] } // through LazyJavaClassMemberScope@3775
-    functions('size': Name@1041) = ArrayList@4751[1] { JavaMethodDescriptor@4752['size'] } // through LazyJavaClassMemberScope@3775
-    functions('startLWModal': Name@2202) = ArrayList@4753[1] { JavaMethodDescriptor@4754['startLWModal'] } // through LazyJavaClassMemberScope@3775
-    functions('stopLWModal': Name@2205) = ArrayList@4755[1] { JavaMethodDescriptor@4756['stopLWModal'] } // through LazyJavaClassMemberScope@3775
-    functions('subtractAndApplyShape': Name@1046) = ArrayList@4757[1] { JavaMethodDescriptor@4758['subtractAndApplyShape'] } // through LazyJavaClassMemberScope@3775
-    functions('subtractAndApplyShapeBelowMe': Name@1049) = ArrayList@4759[1] { JavaMethodDescriptor@4760['subtractAndApplyShapeBelowMe'] } // through LazyJavaClassMemberScope@3775
-    functions('toBack': Name@3477) = ArrayList@4761[1] { JavaMethodDescriptor@4762['toBack'] } // through LazyJavaClassMemberScope@3775
-    functions('toBack_NoClientCode': Name@3480) = ArrayList@4763[1] { JavaMethodDescriptor@4764['toBack_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('toFront': Name@3483) = ArrayList@4765[1] { JavaMethodDescriptor@4766['toFront'] } // through LazyJavaClassMemberScope@3775
-    functions('toFront_NoClientCode': Name@3486) = ArrayList@4767[1] { JavaMethodDescriptor@4768['toFront_NoClientCode'] } // through LazyJavaClassMemberScope@3775
-    functions('toString': Name@1056) = ArrayList@4769[1] { JavaMethodDescriptor@4770['toString'] } // through LazyJavaClassMemberScope@3775
-    functions('transferFocus': Name@1059) = ArrayList@4771[2] { JavaMethodDescriptor@4772['transferFocus'], JavaMethodDescriptor@4773['transferFocus'] } // through LazyJavaClassMemberScope@3775
-    functions('transferFocusBackward': Name@1063) = ArrayList@4774[2] { JavaMethodDescriptor@4775['transferFocusBackward'], JavaMethodDescriptor@4776['transferFocusBackward'] } // through LazyJavaClassMemberScope@3775
-    functions('transferFocusDownCycle': Name@2220) = ArrayList@4777[1] { JavaMethodDescriptor@4778['transferFocusDownCycle'] } // through LazyJavaClassMemberScope@3775
-    functions('transferFocusUpCycle': Name@1068) = ArrayList@4779[1] { JavaMethodDescriptor@4780['transferFocusUpCycle'] } // through LazyJavaClassMemberScope@3775
-    functions('update': Name@4781) = ArrayList@4782[1] { JavaMethodDescriptor@4783['update'] } // through LazyJavaClassMemberScope@3775
-    functions('updateChildrenBlocking': Name@3503) = ArrayList@4784[1] { JavaMethodDescriptor@4785['updateChildrenBlocking'] } // through LazyJavaClassMemberScope@3775
-    functions('updateCursorImmediately': Name@1075) = ArrayList@4786[1] { JavaMethodDescriptor@4787['updateCursorImmediately'] } // through LazyJavaClassMemberScope@3775
-    functions('updateGraphicsData': Name@2230) = ArrayList@4788[1] { JavaMethodDescriptor@4789['updateGraphicsData'] } // through LazyJavaClassMemberScope@3775
-    functions('updateWindow': Name@3510) = ArrayList@4790[1] { JavaMethodDescriptor@4791['updateWindow'] } // through LazyJavaClassMemberScope@3775
-    functions('updateZOrder': Name@3513) = ArrayList@4792[1] { JavaMethodDescriptor@4793['updateZOrder'] } // through LazyJavaClassMemberScope@3775
-    functions('validate': Name@2235) = ArrayList@4794[1] { JavaMethodDescriptor@4795['validate'] } // through LazyJavaClassMemberScope@3775
-    functions('validateTree': Name@2238) = ArrayList@4796[1] { JavaMethodDescriptor@4797['validateTree'] } // through LazyJavaClassMemberScope@3775
-    functions('validateUnconditionally': Name@2241) = ArrayList@4798[1] { JavaMethodDescriptor@4799['validateUnconditionally'] } // through LazyJavaClassMemberScope@3775
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3775
-    functions('writeObject': Name@3522) = ArrayList@4800[1] { JavaMethodDescriptor@4801['writeObject'] } // through LazyJavaClassMemberScope@3775
-    memberIndex = computeMemberIndex$1@4802 // through LazyJavaClassMemberScope@3775
-    nestedClassIndex = LinkedHashMap@4803 // through LazyJavaClassMemberScope@3775
-    nestedClasses('AccessibleJFrame': Name@8) = LazyJavaClassDescriptor@3772['AccessibleJFrame'] // through LazyJavaClassMemberScope@3775
-    properties('acc': Name@1097) = ArrayList@4804[1] { PropertyDescriptorImpl@4805['acc'] } // through LazyJavaClassMemberScope@3775
-    properties('accessibleContext': Name@1100) = ArrayList@4806[1] { JavaPropertyDescriptor@4807['accessibleContext'] } // through LazyJavaClassMemberScope@3775
-    properties('alwaysOnTop': Name@1103) = ArrayList@4808[1] { PropertyDescriptorImpl@4809['alwaysOnTop'] } // through LazyJavaClassMemberScope@3775
-    properties('anchor': Name@1104) = ArrayList@4810[1] { PropertyDescriptorImpl@4811['anchor'] } // through LazyJavaClassMemberScope@3775
-    properties('appContext': Name@1105) = ArrayList@4812[1] { PropertyDescriptorImpl@4813['appContext'] } // through LazyJavaClassMemberScope@3775
-    properties('autoFocusTransferOnDisposal': Name@1108) = ArrayList@4814[1] { PropertyDescriptorImpl@4815['autoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@3775
-    properties('autoRequestFocus': Name@1111) = ArrayList@4816[1] { PropertyDescriptorImpl@4817['autoRequestFocus'] } // through LazyJavaClassMemberScope@3775
-    properties('background': Name@1112) = ArrayList@4818[1] { PropertyDescriptorImpl@4819['background'] } // through LazyJavaClassMemberScope@3775
-    properties('backgroundEraseDisabled': Name@1115) = ArrayList@4820[1] { PropertyDescriptorImpl@4821['backgroundEraseDisabled'] } // through LazyJavaClassMemberScope@3775
-    properties('beforeFirstShow': Name@1118) = ArrayList@4822[1] { PropertyDescriptorImpl@4823['beforeFirstShow'] } // through LazyJavaClassMemberScope@3775
-    properties('boundsOp': Name@1119) = ArrayList@4824[1] { PropertyDescriptorImpl@4825['boundsOp'] } // through LazyJavaClassMemberScope@3775
-    properties('bufferStrategy': Name@1122) = ArrayList@4826[1] { PropertyDescriptorImpl@4827['bufferStrategy'] } // through LazyJavaClassMemberScope@3775
-    properties('changeSupport': Name@1125) = ArrayList@4828[1] { PropertyDescriptorImpl@4829['changeSupport'] } // through LazyJavaClassMemberScope@3775
-    properties('coalescingEnabled': Name@1128) = ArrayList@4830[1] { PropertyDescriptorImpl@4831['coalescingEnabled'] } // through LazyJavaClassMemberScope@3775
-    properties('component': Name@1131) = ArrayList@4832[1] { PropertyDescriptorImpl@4833['component'] } // through LazyJavaClassMemberScope@3775
-    properties('componentListener': Name@1132) = ArrayList@4834[1] { PropertyDescriptorImpl@4835['componentListener'] } // through LazyJavaClassMemberScope@3775
-    properties('componentOrientation': Name@1135) = ArrayList@4836[1] { PropertyDescriptorImpl@4837['componentOrientation'] } // through LazyJavaClassMemberScope@3775
-    properties('componentSerializedDataVersion': Name@1138) = ArrayList@4838[1] { PropertyDescriptorImpl@4839['componentSerializedDataVersion'] } // through LazyJavaClassMemberScope@3775
-    properties('compoundShape': Name@1141) = ArrayList@4840[1] { PropertyDescriptorImpl@4841['compoundShape'] } // through LazyJavaClassMemberScope@3775
-    properties('containerListener': Name@1144) = ArrayList@4842[1] { PropertyDescriptorImpl@4843['containerListener'] } // through LazyJavaClassMemberScope@3775
-    properties('containerSerializedDataVersion': Name@1145) = ArrayList@4844[1] { PropertyDescriptorImpl@4845['containerSerializedDataVersion'] } // through LazyJavaClassMemberScope@3775
-    properties('cursor': Name@1146) = ArrayList@4846[1] { PropertyDescriptorImpl@4847['cursor'] } // through LazyJavaClassMemberScope@3775
-    properties('defaultCloseOperation': Name@1149) = ArrayList@4848[1] { JavaPropertyDescriptor@4849['defaultCloseOperation'] } // through LazyJavaClassMemberScope@3775
-    properties('descendantsCount': Name@1150) = ArrayList@4850[1] { PropertyDescriptorImpl@4851['descendantsCount'] } // through LazyJavaClassMemberScope@3775
-    properties('dispatcher': Name@1151) = ArrayList@4852[1] { PropertyDescriptorImpl@4853['dispatcher'] } // through LazyJavaClassMemberScope@3775
-    properties('disposing': Name@1152) = ArrayList@4854[1] { PropertyDescriptorImpl@4855['disposing'] } // through LazyJavaClassMemberScope@3775
-    properties('dropTarget': Name@1153) = ArrayList@4856[1] { PropertyDescriptorImpl@4857['dropTarget'] } // through LazyJavaClassMemberScope@3775
-    properties('enabled': Name@1156) = ArrayList@4858[1] { PropertyDescriptorImpl@4859['enabled'] } // through LazyJavaClassMemberScope@3775
-    properties('eventCache': Name@1159) = ArrayList@4860[1] { PropertyDescriptorImpl@4861['eventCache'] } // through LazyJavaClassMemberScope@3775
-    properties('eventMask': Name@1162) = ArrayList@4862[1] { PropertyDescriptorImpl@4863['eventMask'] } // through LazyJavaClassMemberScope@3775
-    properties('focusCycleRoot': Name@1165) = ArrayList@4864[1] { PropertyDescriptorImpl@4865['focusCycleRoot'] } // through LazyJavaClassMemberScope@3775
-    properties('focusListener': Name@1166) = ArrayList@4866[1] { PropertyDescriptorImpl@4867['focusListener'] } // through LazyJavaClassMemberScope@3775
-    properties('focusMgr': Name@1169) = ArrayList@4868[1] { PropertyDescriptorImpl@4869['focusMgr'] } // through LazyJavaClassMemberScope@3775
-    properties('focusTraversalKeys': Name@1170) = ArrayList@4870[1] { PropertyDescriptorImpl@4871['focusTraversalKeys'] } // through LazyJavaClassMemberScope@3775
-    properties('focusTraversalKeysEnabled': Name@1173) = ArrayList@4872[1] { PropertyDescriptorImpl@4873['focusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@3775
-    properties('focusTraversalPolicy': Name@1176) = ArrayList@4874[1] { PropertyDescriptorImpl@4875['focusTraversalPolicy'] } // through LazyJavaClassMemberScope@3775
-    properties('focusTraversalPolicyProvider': Name@1177) = ArrayList@4876[1] { PropertyDescriptorImpl@4877['focusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@3775
-    properties('focusable': Name@1178) = ArrayList@4878[1] { PropertyDescriptorImpl@4879['focusable'] } // through LazyJavaClassMemberScope@3775
-    properties('focusableWindowState': Name@1181) = ArrayList@4880[1] { PropertyDescriptorImpl@4881['focusableWindowState'] } // through LazyJavaClassMemberScope@3775
-    properties('font': Name@1182) = ArrayList@4882[1] { PropertyDescriptorImpl@4883['font'] } // through LazyJavaClassMemberScope@3775
-    properties('foreground': Name@1185) = ArrayList@4884[1] { PropertyDescriptorImpl@4885['foreground'] } // through LazyJavaClassMemberScope@3775
-    properties('frameSerializedDataVersion': Name@1188) = ArrayList@4886[1] { PropertyDescriptorImpl@4887['frameSerializedDataVersion'] } // through LazyJavaClassMemberScope@3775
-    properties('graphicsConfig': Name@1189) = ArrayList@4888[1] { PropertyDescriptorImpl@4889['graphicsConfig'] } // through LazyJavaClassMemberScope@3775
-    properties('height': Name@1192) = ArrayList@4890[1] { PropertyDescriptorImpl@4891['height'] } // through LazyJavaClassMemberScope@3775
-    properties('hierarchyBoundsListener': Name@1195) = ArrayList@4892[1] { PropertyDescriptorImpl@4893['hierarchyBoundsListener'] } // through LazyJavaClassMemberScope@3775
-    properties('hierarchyListener': Name@1198) = ArrayList@4894[1] { PropertyDescriptorImpl@4895['hierarchyListener'] } // through LazyJavaClassMemberScope@3775
-    properties('icons': Name@1201) = ArrayList@4896[1] { PropertyDescriptorImpl@4897['icons'] } // through LazyJavaClassMemberScope@3775
-    properties('ignoreRepaint': Name@1202) = ArrayList@4898[1] { PropertyDescriptorImpl@4899['ignoreRepaint'] } // through LazyJavaClassMemberScope@3775
-    properties('inputContext': Name@1205) = ArrayList@4900[1] { PropertyDescriptorImpl@4901['inputContext'] } // through LazyJavaClassMemberScope@3775
-    properties('inputContextLock': Name@1206) = ArrayList@4902[1] { PropertyDescriptorImpl@4903['inputContextLock'] } // through LazyJavaClassMemberScope@3775
-    properties('inputMethodListener': Name@1207) = ArrayList@4904[1] { PropertyDescriptorImpl@4905['inputMethodListener'] } // through LazyJavaClassMemberScope@3775
-    properties('isAddNotifyComplete': Name@1210) = ArrayList@4906[1] { PropertyDescriptorImpl@4907['isAddNotifyComplete'] } // through LazyJavaClassMemberScope@3775
-    properties('isFocusTraversableOverridden': Name@1213) = ArrayList@4908[1] { PropertyDescriptorImpl@4909['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@3775
-    properties('isInShow': Name@1216) = ArrayList@4910[1] { PropertyDescriptorImpl@4911['isInShow'] } // through LazyJavaClassMemberScope@3775
-    properties('isPacked': Name@1217) = ArrayList@4912[1] { PropertyDescriptorImpl@4913['isPacked'] } // through LazyJavaClassMemberScope@3775
-    properties('isTrayIconWindow': Name@1220) = ArrayList@4914[1] { PropertyDescriptorImpl@4915['isTrayIconWindow'] } // through LazyJavaClassMemberScope@3775
-    properties('keyListener': Name@1221) = ArrayList@4916[1] { PropertyDescriptorImpl@4917['keyListener'] } // through LazyJavaClassMemberScope@3775
-    properties('layoutMgr': Name@1224) = ArrayList@4918[1] { PropertyDescriptorImpl@4919['layoutMgr'] } // through LazyJavaClassMemberScope@3775
-    properties('listeningBoundsChildren': Name@1225) = ArrayList@4920[1] { PropertyDescriptorImpl@4921['listeningBoundsChildren'] } // through LazyJavaClassMemberScope@3775
-    properties('listeningChildren': Name@1226) = ArrayList@4922[1] { PropertyDescriptorImpl@4923['listeningChildren'] } // through LazyJavaClassMemberScope@3775
-    properties('locale': Name@1227) = ArrayList@4924[1] { PropertyDescriptorImpl@4925['locale'] } // through LazyJavaClassMemberScope@3775
-    properties('locationByPlatform': Name@1230) = ArrayList@4926[1] { PropertyDescriptorImpl@4927['locationByPlatform'] } // through LazyJavaClassMemberScope@3775
-    properties('maxSize': Name@1231) = ArrayList@4928[1] { PropertyDescriptorImpl@4929['maxSize'] } // through LazyJavaClassMemberScope@3775
-    properties('maxSizeSet': Name@1234) = ArrayList@4930[1] { PropertyDescriptorImpl@4931['maxSizeSet'] } // through LazyJavaClassMemberScope@3775
-    properties('maximizedBounds': Name@1237) = ArrayList@4932[1] { PropertyDescriptorImpl@4933['maximizedBounds'] } // through LazyJavaClassMemberScope@3775
-    properties('mbManagement': Name@1238) = ArrayList@4934[1] { PropertyDescriptorImpl@4935['mbManagement'] } // through LazyJavaClassMemberScope@3775
-    properties('menuBar': Name@1239) = ArrayList@4936[1] { PropertyDescriptorImpl@4937['menuBar'] } // through LazyJavaClassMemberScope@3775
-    properties('minSize': Name@1240) = ArrayList@4938[1] { PropertyDescriptorImpl@4939['minSize'] } // through LazyJavaClassMemberScope@3775
-    properties('minSizeSet': Name@1243) = ArrayList@4940[1] { PropertyDescriptorImpl@4941['minSizeSet'] } // through LazyJavaClassMemberScope@3775
-    properties('mixingCutoutRegion': Name@1246) = ArrayList@4942[1] { PropertyDescriptorImpl@4943['mixingCutoutRegion'] } // through LazyJavaClassMemberScope@3775
-    properties('modalAppContext': Name@1249) = ArrayList@4944[1] { PropertyDescriptorImpl@4945['modalAppContext'] } // through LazyJavaClassMemberScope@3775
-    properties('modalBlocker': Name@1250) = ArrayList@4946[1] { PropertyDescriptorImpl@4947['modalBlocker'] } // through LazyJavaClassMemberScope@3775
-    properties('modalComp': Name@1251) = ArrayList@4948[1] { PropertyDescriptorImpl@4949['modalComp'] } // through LazyJavaClassMemberScope@3775
-    properties('modalExclusionType': Name@1252) = ArrayList@4950[1] { PropertyDescriptorImpl@4951['modalExclusionType'] } // through LazyJavaClassMemberScope@3775
-    properties('mouseListener': Name@1253) = ArrayList@4952[1] { PropertyDescriptorImpl@4953['mouseListener'] } // through LazyJavaClassMemberScope@3775
-    properties('mouseMotionListener': Name@1256) = ArrayList@4954[1] { PropertyDescriptorImpl@4955['mouseMotionListener'] } // through LazyJavaClassMemberScope@3775
-    properties('mouseWheelListener': Name@1259) = ArrayList@4956[1] { PropertyDescriptorImpl@4957['mouseWheelListener'] } // through LazyJavaClassMemberScope@3775
-    properties('name': Name@1262) = ArrayList@4958[1] { PropertyDescriptorImpl@4959['name'] } // through LazyJavaClassMemberScope@3775
-    properties('nameExplicitlySet': Name@1265) = ArrayList@4960[1] { PropertyDescriptorImpl@4961['nameExplicitlySet'] } // through LazyJavaClassMemberScope@3775
-    properties('newEventsOnly': Name@1268) = ArrayList@4962[1] { PropertyDescriptorImpl@4963['newEventsOnly'] } // through LazyJavaClassMemberScope@3775
-    properties('numOfHWComponents': Name@1271) = ArrayList@4964[1] { PropertyDescriptorImpl@4965['numOfHWComponents'] } // through LazyJavaClassMemberScope@3775
-    properties('numOfLWComponents': Name@1272) = ArrayList@4966[1] { PropertyDescriptorImpl@4967['numOfLWComponents'] } // through LazyJavaClassMemberScope@3775
-    properties('objectLock': Name@1273) = ArrayList@4968[1] { PropertyDescriptorImpl@4969['objectLock'] } // through LazyJavaClassMemberScope@3775
-    properties('opacity': Name@1276) = ArrayList@4970[1] { PropertyDescriptorImpl@4971['opacity'] } // through LazyJavaClassMemberScope@3775
-    properties('ownedWindowList': Name@1277) = ArrayList@4972[1] { PropertyDescriptorImpl@4973['ownedWindowList'] } // through LazyJavaClassMemberScope@3775
-    properties('ownedWindows': Name@1278) = ArrayList@4974[1] { PropertyDescriptorImpl@4975['ownedWindows'] } // through LazyJavaClassMemberScope@3775
-    properties('parent': Name@1279) = ArrayList@4976[1] { PropertyDescriptorImpl@4977['parent'] } // through LazyJavaClassMemberScope@3775
-    properties('peer': Name@1282) = ArrayList@4978[1] { PropertyDescriptorImpl@4979['peer'] } // through LazyJavaClassMemberScope@3775
-    properties('peerFont': Name@1285) = ArrayList@4980[1] { PropertyDescriptorImpl@4981['peerFont'] } // through LazyJavaClassMemberScope@3775
-    properties('popups': Name@1288) = ArrayList@4982[1] { PropertyDescriptorImpl@4983['popups'] } // through LazyJavaClassMemberScope@3775
-    properties('prefSize': Name@1291) = ArrayList@4984[1] { PropertyDescriptorImpl@4985['prefSize'] } // through LazyJavaClassMemberScope@3775
-    properties('prefSizeSet': Name@1294) = ArrayList@4986[1] { PropertyDescriptorImpl@4987['prefSizeSet'] } // through LazyJavaClassMemberScope@3775
-    properties('preserveBackgroundColor': Name@1297) = ArrayList@4988[1] { PropertyDescriptorImpl@4989['preserveBackgroundColor'] } // through LazyJavaClassMemberScope@3775
-    properties('printing': Name@1298) = ArrayList@4990[1] { PropertyDescriptorImpl@4991['printing'] } // through LazyJavaClassMemberScope@3775
-    properties('printingThreads': Name@1299) = ArrayList@4992[1] { PropertyDescriptorImpl@4993['printingThreads'] } // through LazyJavaClassMemberScope@3775
-    properties('resizable': Name@1300) = ArrayList@4994[1] { PropertyDescriptorImpl@4995['resizable'] } // through LazyJavaClassMemberScope@3775
-    properties('rootPane': Name@1301) = ArrayList@4996[1] { JavaPropertyDescriptor@4997['rootPane'] } // through LazyJavaClassMemberScope@3775
-    properties('rootPaneCheckingEnabled': Name@1302) = ArrayList@4998[1] { JavaPropertyDescriptor@4999['rootPaneCheckingEnabled'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningAlignmentX': Name@1303) = ArrayList@5000[1] { PropertyDescriptorImpl@5001['securityWarningAlignmentX'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningAlignmentY': Name@1304) = ArrayList@5002[1] { PropertyDescriptorImpl@5003['securityWarningAlignmentY'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningHeight': Name@1305) = ArrayList@5004[1] { PropertyDescriptorImpl@5005['securityWarningHeight'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningPointX': Name@1306) = ArrayList@5006[1] { PropertyDescriptorImpl@5007['securityWarningPointX'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningPointY': Name@1307) = ArrayList@5008[1] { PropertyDescriptorImpl@5009['securityWarningPointY'] } // through LazyJavaClassMemberScope@3775
-    properties('securityWarningWidth': Name@1308) = ArrayList@5010[1] { PropertyDescriptorImpl@5011['securityWarningWidth'] } // through LazyJavaClassMemberScope@3775
-    properties('shape': Name@1309) = ArrayList@5012[1] { PropertyDescriptorImpl@5013['shape'] } // through LazyJavaClassMemberScope@3775
-    properties('showWithParent': Name@1310) = ArrayList@5014[1] { PropertyDescriptorImpl@5015['showWithParent'] } // through LazyJavaClassMemberScope@3775
-    properties('state': Name@1311) = ArrayList@5016[1] { PropertyDescriptorImpl@5017['state'] } // through LazyJavaClassMemberScope@3775
-    properties('syncLWRequests': Name@1312) = ArrayList@5018[1] { PropertyDescriptorImpl@5019['syncLWRequests'] } // through LazyJavaClassMemberScope@3775
-    properties('temporaryLostComponent': Name@1313) = ArrayList@5020[1] { PropertyDescriptorImpl@5021['temporaryLostComponent'] } // through LazyJavaClassMemberScope@3775
-    properties('title': Name@1314) = ArrayList@5022[1] { PropertyDescriptorImpl@5023['title'] } // through LazyJavaClassMemberScope@3775
-    properties('transferHandler': Name@1315) = ArrayList@5024[1] { JavaPropertyDescriptor@5025['transferHandler'] } // through LazyJavaClassMemberScope@3775
-    properties('type': Name@1316) = ArrayList@5026[1] { PropertyDescriptorImpl@5027['type'] } // through LazyJavaClassMemberScope@3775
-    properties('undecorated': Name@1317) = ArrayList@5028[1] { PropertyDescriptorImpl@5029['undecorated'] } // through LazyJavaClassMemberScope@3775
-    properties('valid': Name@1318) = ArrayList@5030[1] { PropertyDescriptorImpl@5031['valid'] } // through LazyJavaClassMemberScope@3775
-    properties('visible': Name@1321) = ArrayList@5032[1] { PropertyDescriptorImpl@5033['visible'] } // through LazyJavaClassMemberScope@3775
-    properties('warningString': Name@1324) = ArrayList@5034[1] { PropertyDescriptorImpl@5035['warningString'] } // through LazyJavaClassMemberScope@3775
-    properties('weakThis': Name@1325) = ArrayList@5036[1] { PropertyDescriptorImpl@5037['weakThis'] } // through LazyJavaClassMemberScope@3775
-    properties('width': Name@1326) = ArrayList@5038[1] { PropertyDescriptorImpl@5039['width'] } // through LazyJavaClassMemberScope@3775
-    properties('windowClosingException': Name@1329) = ArrayList@5040[1] { PropertyDescriptorImpl@5041['windowClosingException'] } // through LazyJavaClassMemberScope@3775
-    properties('windowFocusListener': Name@1332) = ArrayList@5042[1] { PropertyDescriptorImpl@5043['windowFocusListener'] } // through LazyJavaClassMemberScope@3775
-    properties('windowListener': Name@1333) = ArrayList@5044[1] { PropertyDescriptorImpl@5045['windowListener'] } // through LazyJavaClassMemberScope@3775
-    properties('windowSerializedDataVersion': Name@1334) = ArrayList@5046[1] { PropertyDescriptorImpl@5047['windowSerializedDataVersion'] } // through LazyJavaClassMemberScope@3775
-    properties('windowStateListener': Name@1335) = ArrayList@5048[1] { PropertyDescriptorImpl@5049['windowStateListener'] } // through LazyJavaClassMemberScope@3775
-    properties('x': Name@1336) = ArrayList@5050[1] { PropertyDescriptorImpl@5051['x'] } // through LazyJavaClassMemberScope@3775
-    properties('y': Name@1339) = ArrayList@5052[1] { PropertyDescriptorImpl@5053['y'] } // through LazyJavaClassMemberScope@3775
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@5054['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@5055['JFrame']
-}
-
-LazyJavaClassDescriptor@5056['Locale'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassDescriptor@5058['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@5060['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@5062['PrintStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassDescriptor@5064['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5065['RuntimeException']
-}
-
-LazyJavaClassDescriptor@5066['Serializable'] {
-    defaultType = JetTypeImpl@5067['Serializable']
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('action': Name@5069) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('add': Name@5070) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addComponentListener': Name@5071) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addContainerListener': Name@20) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addDelicately': Name@21) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addFocusListener': Name@5072) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addHierarchyBoundsListener': Name@5073) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addHierarchyListener': Name@5074) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addImpl': Name@31) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addInputMethodListener': Name@5075) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addKeyListener': Name@5076) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addMouseListener': Name@5077) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addMouseMotionListener': Name@5078) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addMouseWheelListener': Name@5079) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addNotify': Name@5080) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addOwnedWindow': Name@50) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addPropertyChangeListener': Name@5081) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addToWindowList': Name@55) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addWindowFocusListener': Name@56) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addWindowListener': Name@57) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('addWindowStateListener': Name@58) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('adjustDecendantsOnParent': Name@59) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('adjustDescendants': Name@60) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('adjustListeningChildren': Name@61) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('adjustListeningChildrenOnParent': Name@5082) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('applyComponentOrientation': Name@5083) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('applyCompoundShape': Name@5084) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('applyCurrentShape': Name@5085) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('applyCurrentShapeBelowMe': Name@5086) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('applyResourceBundle': Name@77) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('areBoundsValid': Name@5087) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('areFocusTraversalKeysSet': Name@5088) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('areInputMethodsEnabled': Name@5089) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('autoProcessMouseWheel': Name@5090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('bounds': Name@5091) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('calculateCurrentShape': Name@5092) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('calculateSecurityWarningPosition': Name@96) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('canBeFocusOwner': Name@5093) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('canBeFocusOwnerRecursively': Name@5094) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('canContainFocusOwner': Name@103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkAddToSelf': Name@104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkAdding': Name@105) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkCoalescing': Name@5095) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkGD': Name@5096) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkImage': Name@5097) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkNotAWindow': Name@116) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkTreeLock': Name@5098) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('checkWindowClosingException': Name@5099) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('clearCurrentFocusCycleRootOnHide': Name@5100) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('clearMostRecentFocusOwnerOnHide': Name@5101) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('closeSplashScreen': Name@130) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('coalesceEvents': Name@5102) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('connectOwnedWindow': Name@134) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('constructComponentName': Name@5103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('contains': Name@5104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('containsFocus': Name@5105) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('countComponents': Name@145) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('countHierarchyMembers': Name@5106) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createBufferStrategy': Name@5107) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createChildHierarchyEvents': Name@153) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createHierarchyEvents': Name@5108) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createImage': Name@5109) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createRootPane': Name@161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('createVolatileImage': Name@5110) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('decreaseComponentCount': Name@166) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('deliverEvent': Name@5111) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('deliverMouseWheelToAncestor': Name@170) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('deserializeResources': Name@171) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('disable': Name@5112) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('disableEvents': Name@5113) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('dispatchEvent': Name@5114) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('dispatchEventImpl': Name@5115) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('dispatchEventToSelf': Name@184) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('dispatchMouseWheelToAncestor': Name@5116) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('dispose': Name@188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('disposeImpl': Name@189) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('doDispose': Name@190) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('doLayout': Name@5117) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('doSwingSerialization': Name@5118) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('enable': Name@5119) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('enableEvents': Name@5120) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('enableInputMethods': Name@5121) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('equals': Name@207) = ArrayList@5122[1] { DeserializedSimpleFunctionDescriptor@5123['equals'] } // through LazyJavaClassMemberScope@5068
-    functions('eventEnabled': Name@5124) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('eventTypeEnabled': Name@5125) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('findComponentAt': Name@217) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('findComponentAtImpl': Name@218) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('findTraversalRoot': Name@219) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('findUnderMouseInWindow': Name@5126) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('firePropertyChange': Name@5127) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('frameInit': Name@228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessControlContext': Name@5128) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleAt': Name@232) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleChild': Name@233) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleChildrenCount': Name@234) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleContext': Name@5129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleIndexInParent': Name@5130) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAccessibleStateSet': Name@5131) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAlignmentX': Name@5132) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAlignmentY': Name@5133) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getAppliedShape': Name@5134) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBackBuffer': Name@5135) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBackground': Name@5136) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBaseline': Name@5137) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBaselineResizeBehavior': Name@5138) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBottommostComponentIndex': Name@265) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBounds': Name@5139) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBoundsOp': Name@5140) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getBufferStrategy': Name@5141) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getColorModel': Name@5142) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponent': Name@280) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentAt': Name@5143) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentCount': Name@285) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentListeners': Name@5144) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentOrientation': Name@5145) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentZOrder': Name@292) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponents': Name@293) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponentsSync': Name@294) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getComponents_NoClientCode': Name@295) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getContainer': Name@5146) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getContainerListeners': Name@299) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getContainingWindow': Name@5147) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getContentPane': Name@303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getCursor': Name@5148) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getCursorType': Name@307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getCursor_NoClientCode': Name@5149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getDefaultCloseOperation': Name@311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getDocumentRoot': Name@312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getDropTarget': Name@5150) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getDropTargetEventTarget': Name@316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getExtendedState': Name@317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusCycleRootAncestor': Name@5151) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusListeners': Name@5152) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusOwner': Name@324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusTraversalKeys': Name@5153) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusTraversalKeysEnabled': Name@5154) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusTraversalKeys_NoIDCheck': Name@5155) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusTraversalPolicy': Name@334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFocusableWindowState': Name@335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFont': Name@5156) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFontMetrics': Name@5157) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getFont_NoClientCode': Name@5158) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getForeground': Name@5159) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getGlassPane': Name@348) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getGraphics': Name@5160) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getGraphicsConfiguration': Name@5161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getGraphicsConfiguration_NoClientCode': Name@5162) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getGraphics_NoClientCode': Name@5163) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getHWPeerAboveMe': Name@5164) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getHeavyweightContainer': Name@364) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getHeight': Name@5165) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getHierarchyBoundsListeners': Name@5166) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getHierarchyListeners': Name@5167) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getIconImage': Name@374) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getIconImages': Name@375) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getIgnoreRepaint': Name@5168) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getInputContext': Name@5169) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getInputMethodListeners': Name@5170) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getInputMethodRequests': Name@5171) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getInsets': Name@388) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getInsets_NoClientCode': Name@5172) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getJMenuBar': Name@392) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getKeyListeners': Name@5173) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLayeredPane': Name@396) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLayout': Name@397) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getListeners': Name@5174) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getListenersCount': Name@401) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLocale': Name@5175) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLocation': Name@5176) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLocationOnScreen': Name@5177) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLocationOnScreen_NoTreeLock': Name@5178) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getLocationOnWindow': Name@5179) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMaximizedBounds': Name@418) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMaximumSize': Name@5180) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMenuBar': Name@422) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMinimumSize': Name@5181) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getModalBlocker': Name@426) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getModalExclusionType': Name@427) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMostRecentFocusOwner': Name@428) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMouseEventTarget': Name@429) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMouseEventTargetImpl': Name@430) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMouseListeners': Name@5182) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMouseMotionListeners': Name@5183) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMousePosition': Name@5184) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getMouseWheelListeners': Name@5185) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getName': Name@5186) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getNativeContainer': Name@5187) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getNextFocusCandidate': Name@5188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getNormalShape': Name@5189) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getObjectLock': Name@5190) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOpacity': Name@458) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOpaqueShape': Name@5191) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOwnedWindows': Name@462) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOwnedWindows_NoClientCode': Name@463) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOwner': Name@464) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getOwner_NoClientCode': Name@465) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getParent': Name@5192) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getParent_NoClientCode': Name@5193) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getPeer': Name@5194) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getPreferredSize': Name@5195) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getPropertyChangeListeners': Name@5196) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getRootPane': Name@482) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getShape': Name@483) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getSiblingIndexAbove': Name@5197) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getSiblingIndexBelow': Name@5198) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getSize': Name@5199) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getState': Name@494) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTemporaryLostComponent': Name@495) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTitle': Name@496) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getToolkit': Name@5200) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getToolkitImpl': Name@5201) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTopmostComponentIndex': Name@503) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTransferHandler': Name@504) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTraversalRoot': Name@5202) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getTreeLock': Name@5203) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getType': Name@511) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getWarningString': Name@512) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getWidth': Name@5204) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getWindowFocusListeners': Name@516) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getWindowListeners': Name@517) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getWindowStateListeners': Name@518) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getX': Name@5205) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('getY': Name@5206) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('gotFocus': Name@5207) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('handleEvent': Name@5208) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('hasFocus': Name@5209) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('hasHeavyweightDescendants': Name@534) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('hasLightweightDescendants': Name@535) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('hashCode': Name@536) = ArrayList@5210[1] { DeserializedSimpleFunctionDescriptor@5211['hashCode'] } // through LazyJavaClassMemberScope@5068
-    functions('hide': Name@5212) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('imageUpdate': Name@5213) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('increaseComponentCount': Name@545) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('init': Name@546) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('initDeserializedWindow': Name@547) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('initGC': Name@548) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('initializeFocusTraversalKeys': Name@5214) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('insets': Name@552) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('inside': Name@5215) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('invalidate': Name@5216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('invalidateIfValid': Name@5217) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('invalidateParent': Name@5218) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('invalidateTree': Name@565) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isActive': Name@566) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isAlwaysOnTop': Name@567) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isAlwaysOnTopSupported': Name@568) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isAncestorOf': Name@569) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isAutoFocusTransferOnDisposal': Name@5219) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isAutoRequestFocus': Name@573) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isBackgroundSet': Name@5220) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isCoalescingEnabled': Name@5221) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isCursorSet': Name@5222) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isDisplayable': Name@5223) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isDisposing': Name@586) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isDoubleBuffered': Name@5224) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isEnabled': Name@5225) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isEnabledImpl': Name@5226) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusCycleRoot': Name@5227) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusOwner': Name@5228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusTraversable': Name@5229) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusTraversableOverridden': Name@5230) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusTraversalPolicyProvider': Name@608) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusTraversalPolicySet': Name@609) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusable': Name@5231) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocusableWindow': Name@613) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFocused': Name@614) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFontSet': Name@5232) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isForegroundSet': Name@5233) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isFrameStateSupported': Name@621) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isLightweight': Name@5234) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isLocationByPlatform': Name@625) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isMaximumSizeSet': Name@5235) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isMinimumSizeSet': Name@5236) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isMixingNeeded': Name@5237) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isModalBlocked': Name@635) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isModalExcluded': Name@636) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isNonOpaqueForMixing': Name@5238) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isOpaque': Name@5239) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isParentOf': Name@643) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isPreferredSizeSet': Name@5240) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isRecursivelyVisible': Name@5241) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@650) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isRequestFocusAccepted': Name@5242) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isResizable': Name@654) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isRootPaneCheckingEnabled': Name@655) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isSameOrAncestorOf': Name@5243) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isShowing': Name@5244) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isUndecorated': Name@662) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isValid': Name@5245) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isValidateRoot': Name@666) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isVisible': Name@5246) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('isVisible_NoClientCode': Name@5247) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('keyDown': Name@5248) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('keyUp': Name@5249) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('layout': Name@5250) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('lightweightPaint': Name@5251) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('lightweightPrint': Name@5252) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('list': Name@5253) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('locate': Name@5254) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('location': Name@5255) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('location_NoClientCode': Name@5256) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('lostFocus': Name@5257) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('minimumSize': Name@5258) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mixOnHiding': Name@5259) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mixOnReshaping': Name@5260) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mixOnShowing': Name@5261) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mixOnValidating': Name@5262) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mixOnZOrderChanging': Name@5263) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseDown': Name@5264) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseDrag': Name@5265) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseEnter': Name@5266) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseExit': Name@5267) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseMove': Name@5268) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('mouseUp': Name@5269) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('move': Name@5270) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('nextFocus': Name@5271) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('notifyNewBounds': Name@5272) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('numListening': Name@5273) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('ownedInit': Name@755) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('pack': Name@756) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('paint': Name@5274) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('paintAll': Name@5275) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('paintComponents': Name@763) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('paintHeavyweightComponents': Name@5276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('paramString': Name@5277) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('pointRelativeToComponent': Name@5278) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('postEvent': Name@5279) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('postProcessKeyEvent': Name@776) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('postWindowEvent': Name@777) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('postsOldMouseEvents': Name@5280) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('preProcessKeyEvent': Name@781) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('preferredSize': Name@5281) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('prepareImage': Name@5282) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('print': Name@5283) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('printAll': Name@5284) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('printComponents': Name@795) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('printHeavyweightComponents': Name@5285) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processComponentEvent': Name@5286) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processContainerEvent': Name@802) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processEvent': Name@5287) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processFocusEvent': Name@5288) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processHierarchyBoundsEvent': Name@5289) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processHierarchyEvent': Name@5290) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processInputMethodEvent': Name@5291) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processKeyEvent': Name@5292) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processMouseEvent': Name@5293) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processMouseMotionEvent': Name@5294) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processMouseWheelEvent': Name@5295) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processWindowEvent': Name@830) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processWindowFocusEvent': Name@831) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('processWindowStateEvent': Name@832) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('proxyEnableEvents': Name@833) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('readObject': Name@5296) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('recursiveApplyCurrentShape': Name@837) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('recursiveHideHeavyweightChildren': Name@838) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('recursiveRelocateHeavyweightChildren': Name@839) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('recursiveShowHeavyweightChildren': Name@840) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('recursiveSubtractAndApplyShape': Name@841) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('relocateComponent': Name@5297) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('remove': Name@5298) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeAll': Name@848) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeComponentListener': Name@5299) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeContainerListener': Name@852) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeDelicately': Name@853) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeFocusListener': Name@5300) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeFromWindowList': Name@857) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeHierarchyBoundsListener': Name@5301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeHierarchyListener': Name@5302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeInputMethodListener': Name@5303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeKeyListener': Name@5304) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeMouseListener': Name@5305) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeMouseMotionListener': Name@5306) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeMouseWheelListener': Name@5307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeNotify': Name@5308) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeOwnedWindow': Name@882) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removePropertyChangeListener': Name@5309) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeWindowFocusListener': Name@887) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeWindowListener': Name@888) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('removeWindowStateListener': Name@889) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('repaint': Name@5310) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('repaintParentIfNeeded': Name@5311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('reparentChild': Name@898) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('reparentTraverse': Name@899) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('requestFocus': Name@5312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('requestFocusHelper': Name@5313) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('requestFocusInWindow': Name@5314) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('reshape': Name@5315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('reshapeNativePeer': Name@5316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('resize': Name@5317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('revalidate': Name@5318) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setAlwaysOnTop': Name@927) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setAutoFocusTransferOnDisposal': Name@5319) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setAutoRequestFocus': Name@931) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setBackground': Name@5320) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setBounds': Name@5321) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setBoundsOp': Name@5322) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setClientSize': Name@942) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setComponentOrientation': Name@5323) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setComponentZOrder': Name@946) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setContentPane': Name@947) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setCursor': Name@5324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setDefaultCloseOperation': Name@951) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setDropTarget': Name@5325) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setEnabled': Name@5326) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setExtendedState': Name@958) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusCycleRoot': Name@959) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusTraversalKeys': Name@5327) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusTraversalKeysEnabled': Name@5328) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusTraversalKeys_NoIDCheck': Name@5329) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusTraversalPolicy': Name@969) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusTraversalPolicyProvider': Name@970) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusable': Name@5330) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFocusableWindowState': Name@974) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setFont': Name@5331) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setForeground': Name@5332) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setGlassPane': Name@981) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setGraphicsConfiguration': Name@5333) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setIconImage': Name@985) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setIconImages': Name@986) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setIgnoreRepaint': Name@5334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setJMenuBar': Name@990) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLayeredPane': Name@991) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLayout': Name@992) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLocale': Name@5335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLocation': Name@5336) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLocationByPlatform': Name@1000) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setLocationRelativeTo': Name@1001) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setMaximizedBounds': Name@1002) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setMaximumSize': Name@5337) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setMenuBar': Name@1006) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setMinimumSize': Name@5338) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setModalBlocked': Name@1010) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setModalExclusionType': Name@1011) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setName': Name@5339) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setOpacity': Name@1015) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setPreferredSize': Name@5340) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setResizable': Name@1019) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setRootPane': Name@1020) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setRootPaneCheckingEnabled': Name@1021) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setShape': Name@1022) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setSize': Name@5341) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setState': Name@1027) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setTemporaryLostComponent': Name@1028) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setTitle': Name@1029) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setTransferHandler': Name@1030) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setType': Name@1031) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setUndecorated': Name@1032) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setVisible': Name@5342) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('setWarningString': Name@1036) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('show': Name@5343) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('size': Name@5344) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('startLWModal': Name@1044) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('stopLWModal': Name@1045) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('subtractAndApplyShape': Name@5345) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('subtractAndApplyShapeBelowMe': Name@5346) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('toBack': Name@1052) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('toBack_NoClientCode': Name@1053) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('toFront': Name@1054) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('toFront_NoClientCode': Name@1055) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('toString': Name@5347) = ArrayList@5348[1] { DeserializedSimpleFunctionDescriptor@5349['toString'] } // through LazyJavaClassMemberScope@5068
-    functions('transferFocus': Name@5350) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('transferFocusBackward': Name@5351) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('transferFocusDownCycle': Name@1067) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('transferFocusUpCycle': Name@5352) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('update': Name@5353) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('updateChildrenBlocking': Name@1074) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('updateCursorImmediately': Name@5354) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('updateGraphicsData': Name@5355) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('updateWindow': Name@1081) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('updateZOrder': Name@5356) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('validate': Name@5357) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('validateTree': Name@1088) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('validateUnconditionally': Name@1089) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    functions('writeObject': Name@5358) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    memberIndex = computeMemberIndex$1@5359 // through LazyJavaClassMemberScope@5068
-    properties('acc': Name@1097) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('accessibleContext': Name@1100) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('alwaysOnTop': Name@1103) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('anchor': Name@1104) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('appContext': Name@1105) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('autoFocusTransferOnDisposal': Name@1108) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('autoRequestFocus': Name@1111) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('background': Name@1112) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('backgroundEraseDisabled': Name@1115) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('beforeFirstShow': Name@1118) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('boundsOp': Name@1119) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('bufferStrategy': Name@1122) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('changeSupport': Name@1125) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('coalescingEnabled': Name@1128) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('component': Name@1131) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('componentListener': Name@1132) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('componentOrientation': Name@1135) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('componentSerializedDataVersion': Name@1138) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('compoundShape': Name@1141) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('containerListener': Name@1144) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('containerSerializedDataVersion': Name@1145) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('cursor': Name@1146) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('defaultCloseOperation': Name@1149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('descendantsCount': Name@1150) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('dispatcher': Name@1151) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('disposing': Name@1152) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('dropTarget': Name@1153) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('enabled': Name@1156) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('eventCache': Name@1159) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('eventMask': Name@1162) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusCycleRoot': Name@1165) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusListener': Name@1166) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusMgr': Name@1169) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusTraversalKeys': Name@1170) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusTraversalKeysEnabled': Name@1173) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusTraversalPolicy': Name@1176) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusTraversalPolicyProvider': Name@1177) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusable': Name@1178) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('focusableWindowState': Name@1181) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('font': Name@1182) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('foreground': Name@1185) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('frameSerializedDataVersion': Name@1188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('graphicsConfig': Name@1189) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('height': Name@1192) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('hierarchyBoundsListener': Name@1195) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('hierarchyListener': Name@1198) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('icons': Name@1201) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('ignoreRepaint': Name@1202) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('inputContext': Name@1205) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('inputContextLock': Name@1206) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('inputMethodListener': Name@1207) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('isAddNotifyComplete': Name@1210) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('isFocusTraversableOverridden': Name@1213) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('isInShow': Name@1216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('isPacked': Name@1217) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('isTrayIconWindow': Name@1220) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('keyListener': Name@1221) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('layoutMgr': Name@1224) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('listeningBoundsChildren': Name@1225) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('listeningChildren': Name@1226) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('locale': Name@1227) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('locationByPlatform': Name@1230) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('maxSize': Name@1231) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('maxSizeSet': Name@1234) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('maximizedBounds': Name@1237) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('mbManagement': Name@1238) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('menuBar': Name@1239) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('minSize': Name@1240) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('minSizeSet': Name@1243) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('mixingCutoutRegion': Name@1246) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('modalAppContext': Name@1249) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('modalBlocker': Name@1250) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('modalComp': Name@1251) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('modalExclusionType': Name@1252) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('mouseListener': Name@1253) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('mouseMotionListener': Name@1256) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('mouseWheelListener': Name@1259) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('name': Name@1262) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('nameExplicitlySet': Name@1265) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('newEventsOnly': Name@1268) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('numOfHWComponents': Name@1271) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('numOfLWComponents': Name@1272) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('objectLock': Name@1273) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('opacity': Name@1276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('ownedWindowList': Name@1277) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('ownedWindows': Name@1278) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('parent': Name@1279) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('peer': Name@1282) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('peerFont': Name@1285) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('popups': Name@1288) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('prefSize': Name@1291) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('prefSizeSet': Name@1294) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('preserveBackgroundColor': Name@1297) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('printing': Name@1298) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('printingThreads': Name@1299) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('resizable': Name@1300) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('rootPane': Name@1301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('rootPaneCheckingEnabled': Name@1302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningAlignmentX': Name@1303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningAlignmentY': Name@1304) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningHeight': Name@1305) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningPointX': Name@1306) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningPointY': Name@1307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('securityWarningWidth': Name@1308) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('shape': Name@1309) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('showWithParent': Name@1310) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('state': Name@1311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('syncLWRequests': Name@1312) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('temporaryLostComponent': Name@1313) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('title': Name@1314) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('transferHandler': Name@1315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('type': Name@1316) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('undecorated': Name@1317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('valid': Name@1318) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('visible': Name@1321) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('warningString': Name@1324) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('weakThis': Name@1325) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('width': Name@1326) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('windowClosingException': Name@1329) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('windowFocusListener': Name@1332) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('windowListener': Name@1333) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('windowSerializedDataVersion': Name@1334) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('windowStateListener': Name@1335) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('x': Name@1336) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    properties('y': Name@1339) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5068
-    typeConstructor = LazyJavaClassTypeConstructor@5360['Serializable']
-}
-
-LazyJavaClassDescriptor@5361['Type'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassDescriptor@5363['Window'] {
-    defaultType = JetTypeImpl@5364['Window']
-    functionTypeForSamInterface = null
-    functions('AccessibleJFrame': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('action': Name@11) = ArrayList@5366[1] { JavaMethodDescriptor@5367['action'] } // through LazyJavaClassMemberScope@5365
-    functions('add': Name@1349) = ArrayList@5368[6] { JavaMethodDescriptor@5369['add'], JavaMethodDescriptor@5370['add'], JavaMethodDescriptor@5371['add'], ... } // through LazyJavaClassMemberScope@5365
-    functions('addComponentListener': Name@17) = ArrayList@5372[1] { JavaMethodDescriptor@5373['addComponentListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addContainerListener': Name@1356) = ArrayList@5374[1] { JavaMethodDescriptor@5375['addContainerListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addDelicately': Name@1359) = ArrayList@5376[1] { JavaMethodDescriptor@5377['addDelicately'] } // through LazyJavaClassMemberScope@5365
-    functions('addFocusListener': Name@22) = ArrayList@5378[1] { JavaMethodDescriptor@5379['addFocusListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addHierarchyBoundsListener': Name@25) = ArrayList@5380[1] { JavaMethodDescriptor@5381['addHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addHierarchyListener': Name@28) = ArrayList@5382[1] { JavaMethodDescriptor@5383['addHierarchyListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addImpl': Name@1368) = ArrayList@5384[1] { JavaMethodDescriptor@5385['addImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('addInputMethodListener': Name@32) = ArrayList@5386[1] { JavaMethodDescriptor@5387['addInputMethodListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addKeyListener': Name@35) = ArrayList@5388[1] { JavaMethodDescriptor@5389['addKeyListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addMouseListener': Name@38) = ArrayList@5390[1] { JavaMethodDescriptor@5391['addMouseListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addMouseMotionListener': Name@41) = ArrayList@5392[1] { JavaMethodDescriptor@5393['addMouseMotionListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addMouseWheelListener': Name@44) = ArrayList@5394[1] { JavaMethodDescriptor@5395['addMouseWheelListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addNotify': Name@5396) = ArrayList@5397[1] { JavaMethodDescriptor@5398['addNotify'] } // through LazyJavaClassMemberScope@5365
-    functions('addOwnedWindow': Name@2452) = ArrayList@5399[1] { JavaMethodDescriptor@5400['addOwnedWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('addPropertyChangeListener': Name@2455) = ArrayList@5401[2] { JavaMethodDescriptor@5402['addPropertyChangeListener'], JavaMethodDescriptor@5403['addPropertyChangeListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addToWindowList': Name@2459) = ArrayList@5404[1] { JavaMethodDescriptor@5405['addToWindowList'] } // through LazyJavaClassMemberScope@5365
-    functions('addWindowFocusListener': Name@2462) = ArrayList@5406[1] { JavaMethodDescriptor@5407['addWindowFocusListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addWindowListener': Name@2465) = ArrayList@5408[1] { JavaMethodDescriptor@5409['addWindowListener'] } // through LazyJavaClassMemberScope@5365
-    functions('addWindowStateListener': Name@2468) = ArrayList@5410[1] { JavaMethodDescriptor@5411['addWindowStateListener'] } // through LazyJavaClassMemberScope@5365
-    functions('adjustDecendantsOnParent': Name@2471) = ArrayList@5412[1] { JavaMethodDescriptor@5413['adjustDecendantsOnParent'] } // through LazyJavaClassMemberScope@5365
-    functions('adjustDescendants': Name@1391) = ArrayList@5414[1] { JavaMethodDescriptor@5415['adjustDescendants'] } // through LazyJavaClassMemberScope@5365
-    functions('adjustListeningChildren': Name@1394) = ArrayList@5416[1] { JavaMethodDescriptor@5417['adjustListeningChildren'] } // through LazyJavaClassMemberScope@5365
-    functions('adjustListeningChildrenOnParent': Name@2478) = ArrayList@5418[1] { JavaMethodDescriptor@5419['adjustListeningChildrenOnParent'] } // through LazyJavaClassMemberScope@5365
-    functions('applyComponentOrientation': Name@1399) = ArrayList@5420[1] { JavaMethodDescriptor@5421['applyComponentOrientation'] } // through LazyJavaClassMemberScope@5365
-    functions('applyCompoundShape': Name@2483) = ArrayList@5422[1] { JavaMethodDescriptor@5423['applyCompoundShape'] } // through LazyJavaClassMemberScope@5365
-    functions('applyCurrentShape': Name@2486) = ArrayList@5424[1] { JavaMethodDescriptor@5425['applyCurrentShape'] } // through LazyJavaClassMemberScope@5365
-    functions('applyCurrentShapeBelowMe': Name@74) = ArrayList@5426[1] { JavaMethodDescriptor@5427['applyCurrentShapeBelowMe'] } // through LazyJavaClassMemberScope@5365
-    functions('applyResourceBundle': Name@2491) = ArrayList@5428[2] { JavaMethodDescriptor@5429['applyResourceBundle'], JavaMethodDescriptor@5430['applyResourceBundle'] } // through LazyJavaClassMemberScope@5365
-    functions('areBoundsValid': Name@78) = ArrayList@5431[1] { JavaMethodDescriptor@5432['areBoundsValid'] } // through LazyJavaClassMemberScope@5365
-    functions('areFocusTraversalKeysSet': Name@1410) = ArrayList@5433[1] { JavaMethodDescriptor@5434['areFocusTraversalKeysSet'] } // through LazyJavaClassMemberScope@5365
-    functions('areInputMethodsEnabled': Name@84) = ArrayList@5435[1] { JavaMethodDescriptor@5436['areInputMethodsEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('autoProcessMouseWheel': Name@87) = ArrayList@5437[1] { JavaMethodDescriptor@5438['autoProcessMouseWheel'] } // through LazyJavaClassMemberScope@5365
-    functions('bounds': Name@90) = ArrayList@5439[1] { JavaMethodDescriptor@5440['bounds'] } // through LazyJavaClassMemberScope@5365
-    functions('calculateCurrentShape': Name@93) = ArrayList@5441[1] { JavaMethodDescriptor@5442['calculateCurrentShape'] } // through LazyJavaClassMemberScope@5365
-    functions('calculateSecurityWarningPosition': Name@2507) = ArrayList@5443[1] { JavaMethodDescriptor@5444['calculateSecurityWarningPosition'] } // through LazyJavaClassMemberScope@5365
-    functions('canBeFocusOwner': Name@97) = ArrayList@5445[1] { JavaMethodDescriptor@5446['canBeFocusOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('canBeFocusOwnerRecursively': Name@100) = ArrayList@5447[1] { JavaMethodDescriptor@5448['canBeFocusOwnerRecursively'] } // through LazyJavaClassMemberScope@5365
-    functions('canContainFocusOwner': Name@2514) = ArrayList@5449[1] { JavaMethodDescriptor@5450['canContainFocusOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('checkAddToSelf': Name@1428) = ArrayList@5451[1] { JavaMethodDescriptor@5452['checkAddToSelf'] } // through LazyJavaClassMemberScope@5365
-    functions('checkAdding': Name@1431) = ArrayList@5453[1] { JavaMethodDescriptor@5454['checkAdding'] } // through LazyJavaClassMemberScope@5365
-    functions('checkCoalescing': Name@106) = ArrayList@5455[1] { JavaMethodDescriptor@5456['checkCoalescing'] } // through LazyJavaClassMemberScope@5365
-    functions('checkGD': Name@1436) = ArrayList@5457[1] { JavaMethodDescriptor@5458['checkGD'] } // through LazyJavaClassMemberScope@5365
-    functions('checkImage': Name@112) = ArrayList@5459[2] { JavaMethodDescriptor@5460['checkImage'], JavaMethodDescriptor@5461['checkImage'] } // through LazyJavaClassMemberScope@5365
-    functions('checkNotAWindow': Name@1442) = ArrayList@5462[1] { JavaMethodDescriptor@5463['checkNotAWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('checkTreeLock': Name@117) = ArrayList@5464[1] { JavaMethodDescriptor@5465['checkTreeLock'] } // through LazyJavaClassMemberScope@5365
-    functions('checkWindowClosingException': Name@120) = ArrayList@5466[1] { JavaMethodDescriptor@5467['checkWindowClosingException'] } // through LazyJavaClassMemberScope@5365
-    functions('clearCurrentFocusCycleRootOnHide': Name@1449) = ArrayList@5468[1] { JavaMethodDescriptor@5469['clearCurrentFocusCycleRootOnHide'] } // through LazyJavaClassMemberScope@5365
-    functions('clearMostRecentFocusOwnerOnHide': Name@2536) = ArrayList@5470[1] { JavaMethodDescriptor@5471['clearMostRecentFocusOwnerOnHide'] } // through LazyJavaClassMemberScope@5365
-    functions('clone': Name@129) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('closeSplashScreen': Name@2539) = ArrayList@5472[1] { JavaMethodDescriptor@5473['closeSplashScreen'] } // through LazyJavaClassMemberScope@5365
-    functions('coalesceEvents': Name@131) = ArrayList@5474[1] { JavaMethodDescriptor@5475['coalesceEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('connectOwnedWindow': Name@2544) = ArrayList@5476[1] { JavaMethodDescriptor@5477['connectOwnedWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('constructComponentName': Name@5478) = ArrayList@5479[1] { JavaMethodDescriptor@5480['constructComponentName'] } // through LazyJavaClassMemberScope@5365
-    functions('contains': Name@138) = ArrayList@5481[2] { JavaMethodDescriptor@5482['contains'], JavaMethodDescriptor@5483['contains'] } // through LazyJavaClassMemberScope@5365
-    functions('containsFocus': Name@1462) = ArrayList@5484[1] { JavaMethodDescriptor@5485['containsFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('countComponents': Name@1465) = ArrayList@5486[1] { JavaMethodDescriptor@5487['countComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('countHierarchyMembers': Name@1468) = ArrayList@5488[1] { JavaMethodDescriptor@5489['countHierarchyMembers'] } // through LazyJavaClassMemberScope@5365
-    functions('createBufferStrategy': Name@2559) = ArrayList@5490[2] { JavaMethodDescriptor@5491['createBufferStrategy'], JavaMethodDescriptor@5492['createBufferStrategy'] } // through LazyJavaClassMemberScope@5365
-    functions('createChildHierarchyEvents': Name@1474) = ArrayList@5493[1] { JavaMethodDescriptor@5494['createChildHierarchyEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('createHierarchyEvents': Name@1477) = ArrayList@5495[1] { JavaMethodDescriptor@5496['createHierarchyEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('createImage': Name@157) = ArrayList@5497[2] { JavaMethodDescriptor@5498['createImage'], JavaMethodDescriptor@5499['createImage'] } // through LazyJavaClassMemberScope@5365
-    functions('createRootPane': Name@161) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('createVolatileImage': Name@162) = ArrayList@5500[2] { JavaMethodDescriptor@5501['createVolatileImage'], JavaMethodDescriptor@5502['createVolatileImage'] } // through LazyJavaClassMemberScope@5365
-    functions('decreaseComponentCount': Name@1486) = ArrayList@5503[1] { JavaMethodDescriptor@5504['decreaseComponentCount'] } // through LazyJavaClassMemberScope@5365
-    functions('deliverEvent': Name@1489) = ArrayList@5505[1] { JavaMethodDescriptor@5506['deliverEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('deliverMouseWheelToAncestor': Name@2577) = ArrayList@5507[1] { JavaMethodDescriptor@5508['deliverMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@5365
-    functions('deserializeResources': Name@2580) = ArrayList@5509[1] { JavaMethodDescriptor@5510['deserializeResources'] } // through LazyJavaClassMemberScope@5365
-    functions('disable': Name@172) = ArrayList@5511[1] { JavaMethodDescriptor@5512['disable'] } // through LazyJavaClassMemberScope@5365
-    functions('disableEvents': Name@175) = ArrayList@5513[1] { JavaMethodDescriptor@5514['disableEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('dispatchEvent': Name@178) = ArrayList@5515[1] { JavaMethodDescriptor@5516['dispatchEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('dispatchEventImpl': Name@2589) = ArrayList@5517[1] { JavaMethodDescriptor@5518['dispatchEventImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('dispatchEventToSelf': Name@1501) = ArrayList@5519[1] { JavaMethodDescriptor@5520['dispatchEventToSelf'] } // through LazyJavaClassMemberScope@5365
-    functions('dispatchMouseWheelToAncestor': Name@2594) = ArrayList@5521[1] { JavaMethodDescriptor@5522['dispatchMouseWheelToAncestor'] } // through LazyJavaClassMemberScope@5365
-    functions('dispose': Name@2597) = ArrayList@5523[1] { JavaMethodDescriptor@5524['dispose'] } // through LazyJavaClassMemberScope@5365
-    functions('disposeImpl': Name@2600) = ArrayList@5525[1] { JavaMethodDescriptor@5526['disposeImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('doDispose': Name@2603) = ArrayList@5527[1] { JavaMethodDescriptor@5528['doDispose'] } // through LazyJavaClassMemberScope@5365
-    functions('doLayout': Name@1506) = ArrayList@5529[1] { JavaMethodDescriptor@5530['doLayout'] } // through LazyJavaClassMemberScope@5365
-    functions('doSwingSerialization': Name@194) = ArrayList@5531[1] { JavaMethodDescriptor@5532['doSwingSerialization'] } // through LazyJavaClassMemberScope@5365
-    functions('enable': Name@197) = ArrayList@5533[2] { JavaMethodDescriptor@5534['enable'], JavaMethodDescriptor@5535['enable'] } // through LazyJavaClassMemberScope@5365
-    functions('enableEvents': Name@201) = ArrayList@5536[1] { JavaMethodDescriptor@5537['enableEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('enableInputMethods': Name@204) = ArrayList@5538[1] { JavaMethodDescriptor@5539['enableInputMethods'] } // through LazyJavaClassMemberScope@5365
-    functions('equals': Name@207) = ArrayList@5540[1] { DeserializedSimpleFunctionDescriptor@5541['equals'] } // through LazyJavaClassMemberScope@5365
-    functions('eventEnabled': Name@2619) = ArrayList@5542[1] { JavaMethodDescriptor@5543['eventEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('eventTypeEnabled': Name@213) = ArrayList@5544[1] { JavaMethodDescriptor@5545['eventTypeEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('finalize': Name@216) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('findComponentAt': Name@1525) = ArrayList@5546[3] { JavaMethodDescriptor@5547['findComponentAt'], JavaMethodDescriptor@5548['findComponentAt'], JavaMethodDescriptor@5549['findComponentAt'] } // through LazyJavaClassMemberScope@5365
-    functions('findComponentAtImpl': Name@1530) = ArrayList@5550[1] { JavaMethodDescriptor@5551['findComponentAtImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('findTraversalRoot': Name@1533) = ArrayList@5552[1] { JavaMethodDescriptor@5553['findTraversalRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('findUnderMouseInWindow': Name@220) = ArrayList@5554[1] { JavaMethodDescriptor@5555['findUnderMouseInWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('firePropertyChange': Name@223) = ArrayList@5556[9] { JavaMethodDescriptor@5557['firePropertyChange'], JavaMethodDescriptor@5558['firePropertyChange'], JavaMethodDescriptor@5559['firePropertyChange'], ... } // through LazyJavaClassMemberScope@5365
-    functions('frameInit': Name@228) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getAccessControlContext': Name@229) = ArrayList@5560[1] { JavaMethodDescriptor@5561['getAccessControlContext'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleAt': Name@1544) = ArrayList@5562[1] { JavaMethodDescriptor@5563['getAccessibleAt'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleChild': Name@1547) = ArrayList@5564[1] { JavaMethodDescriptor@5565['getAccessibleChild'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleChildrenCount': Name@1550) = ArrayList@5566[1] { JavaMethodDescriptor@5567['getAccessibleChildrenCount'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleContext': Name@5568) = ArrayList@5569[1] { JavaMethodDescriptor@5570['getAccessibleContext'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleIndexInParent': Name@238) = ArrayList@5571[1] { JavaMethodDescriptor@5572['getAccessibleIndexInParent'] } // through LazyJavaClassMemberScope@5365
-    functions('getAccessibleStateSet': Name@241) = ArrayList@5573[1] { JavaMethodDescriptor@5574['getAccessibleStateSet'] } // through LazyJavaClassMemberScope@5365
-    functions('getAlignmentX': Name@1559) = ArrayList@5575[1] { JavaMethodDescriptor@5576['getAlignmentX'] } // through LazyJavaClassMemberScope@5365
-    functions('getAlignmentY': Name@1562) = ArrayList@5577[1] { JavaMethodDescriptor@5578['getAlignmentY'] } // through LazyJavaClassMemberScope@5365
-    functions('getAppliedShape': Name@250) = ArrayList@5579[1] { JavaMethodDescriptor@5580['getAppliedShape'] } // through LazyJavaClassMemberScope@5365
-    functions('getBackBuffer': Name@253) = ArrayList@5581[1] { JavaMethodDescriptor@5582['getBackBuffer'] } // through LazyJavaClassMemberScope@5365
-    functions('getBackground': Name@2661) = ArrayList@5583[1] { JavaMethodDescriptor@5584['getBackground'] } // through LazyJavaClassMemberScope@5365
-    functions('getBaseline': Name@259) = ArrayList@5585[1] { JavaMethodDescriptor@5586['getBaseline'] } // through LazyJavaClassMemberScope@5365
-    functions('getBaselineResizeBehavior': Name@262) = ArrayList@5587[1] { JavaMethodDescriptor@5588['getBaselineResizeBehavior'] } // through LazyJavaClassMemberScope@5365
-    functions('getBottommostComponentIndex': Name@1575) = ArrayList@5589[1] { JavaMethodDescriptor@5590['getBottommostComponentIndex'] } // through LazyJavaClassMemberScope@5365
-    functions('getBounds': Name@266) = ArrayList@5591[2] { JavaMethodDescriptor@5592['getBounds'], JavaMethodDescriptor@5593['getBounds'] } // through LazyJavaClassMemberScope@5365
-    functions('getBoundsOp': Name@270) = ArrayList@5594[1] { JavaMethodDescriptor@5595['getBoundsOp'] } // through LazyJavaClassMemberScope@5365
-    functions('getBufferStrategy': Name@2675) = ArrayList@5596[1] { JavaMethodDescriptor@5597['getBufferStrategy'] } // through LazyJavaClassMemberScope@5365
-    functions('getClass': Name@276) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getColorModel': Name@277) = ArrayList@5598[1] { JavaMethodDescriptor@5599['getColorModel'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponent': Name@1587) = ArrayList@5600[1] { JavaMethodDescriptor@5601['getComponent'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentAt': Name@1590) = ArrayList@5602[2] { JavaMethodDescriptor@5603['getComponentAt'], JavaMethodDescriptor@5604['getComponentAt'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentCount': Name@1594) = ArrayList@5605[1] { JavaMethodDescriptor@5606['getComponentCount'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentListeners': Name@286) = ArrayList@5607[1] { JavaMethodDescriptor@5608['getComponentListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentOrientation': Name@289) = ArrayList@5609[1] { JavaMethodDescriptor@5610['getComponentOrientation'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentZOrder': Name@1601) = ArrayList@5611[1] { JavaMethodDescriptor@5612['getComponentZOrder'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponents': Name@1604) = ArrayList@5613[1] { JavaMethodDescriptor@5614['getComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponentsSync': Name@1607) = ArrayList@5615[1] { JavaMethodDescriptor@5616['getComponentsSync'] } // through LazyJavaClassMemberScope@5365
-    functions('getComponents_NoClientCode': Name@1610) = ArrayList@5617[1] { JavaMethodDescriptor@5618['getComponents_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getContainer': Name@2699) = ArrayList@5619[1] { JavaMethodDescriptor@5620['getContainer'] } // through LazyJavaClassMemberScope@5365
-    functions('getContainerListeners': Name@1615) = ArrayList@5621[1] { JavaMethodDescriptor@5622['getContainerListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getContainingWindow': Name@300) = ArrayList@5623[1] { JavaMethodDescriptor@5624['getContainingWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('getContentPane': Name@303) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getCursor': Name@304) = ArrayList@5625[1] { JavaMethodDescriptor@5626['getCursor'] } // through LazyJavaClassMemberScope@5365
-    functions('getCursorType': Name@307) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getCursor_NoClientCode': Name@308) = ArrayList@5627[1] { JavaMethodDescriptor@5628['getCursor_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getDefaultCloseOperation': Name@311) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getDocumentRoot': Name@2713) = ArrayList@5629[1] { JavaMethodDescriptor@5630['getDocumentRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('getDropTarget': Name@313) = ArrayList@5631[1] { JavaMethodDescriptor@5632['getDropTarget'] } // through LazyJavaClassMemberScope@5365
-    functions('getDropTargetEventTarget': Name@1626) = ArrayList@5633[1] { JavaMethodDescriptor@5634['getDropTargetEventTarget'] } // through LazyJavaClassMemberScope@5365
-    functions('getExtendedState': Name@317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getFocusCycleRootAncestor': Name@2723) = ArrayList@5635[1] { JavaMethodDescriptor@5636['getFocusCycleRootAncestor'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusListeners': Name@321) = ArrayList@5637[1] { JavaMethodDescriptor@5638['getFocusListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusOwner': Name@2728) = ArrayList@5639[1] { JavaMethodDescriptor@5640['getFocusOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusTraversalKeys': Name@2731) = ArrayList@5641[1] { JavaMethodDescriptor@5642['getFocusTraversalKeys'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusTraversalKeysEnabled': Name@328) = ArrayList@5643[1] { JavaMethodDescriptor@5644['getFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusTraversalKeys_NoIDCheck': Name@331) = ArrayList@5645[1] { JavaMethodDescriptor@5646['getFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusTraversalPolicy': Name@1640) = ArrayList@5647[1] { JavaMethodDescriptor@5648['getFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@5365
-    functions('getFocusableWindowState': Name@2740) = ArrayList@5649[1] { JavaMethodDescriptor@5650['getFocusableWindowState'] } // through LazyJavaClassMemberScope@5365
-    functions('getFont': Name@336) = ArrayList@5651[1] { JavaMethodDescriptor@5652['getFont'] } // through LazyJavaClassMemberScope@5365
-    functions('getFontMetrics': Name@339) = ArrayList@5653[1] { JavaMethodDescriptor@5654['getFontMetrics'] } // through LazyJavaClassMemberScope@5365
-    functions('getFont_NoClientCode': Name@342) = ArrayList@5655[1] { JavaMethodDescriptor@5656['getFont_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getForeground': Name@345) = ArrayList@5657[1] { JavaMethodDescriptor@5658['getForeground'] } // through LazyJavaClassMemberScope@5365
-    functions('getGlassPane': Name@348) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getGraphics': Name@349) = ArrayList@5659[1] { JavaMethodDescriptor@5660['getGraphics'] } // through LazyJavaClassMemberScope@5365
-    functions('getGraphicsConfiguration': Name@352) = ArrayList@5661[1] { JavaMethodDescriptor@5662['getGraphicsConfiguration'] } // through LazyJavaClassMemberScope@5365
-    functions('getGraphicsConfiguration_NoClientCode': Name@355) = ArrayList@5663[1] { JavaMethodDescriptor@5664['getGraphicsConfiguration_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getGraphics_NoClientCode': Name@358) = ArrayList@5665[1] { JavaMethodDescriptor@5666['getGraphics_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getHWPeerAboveMe': Name@361) = ArrayList@5667[1] { JavaMethodDescriptor@5668['getHWPeerAboveMe'] } // through LazyJavaClassMemberScope@5365
-    functions('getHeavyweightContainer': Name@1661) = ArrayList@5669[1] { JavaMethodDescriptor@5670['getHeavyweightContainer'] } // through LazyJavaClassMemberScope@5365
-    functions('getHeight': Name@365) = ArrayList@5671[1] { JavaMethodDescriptor@5672['getHeight'] } // through LazyJavaClassMemberScope@5365
-    functions('getHierarchyBoundsListeners': Name@368) = ArrayList@5673[1] { JavaMethodDescriptor@5674['getHierarchyBoundsListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getHierarchyListeners': Name@371) = ArrayList@5675[1] { JavaMethodDescriptor@5676['getHierarchyListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getIconImage': Name@374) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getIconImages': Name@2772) = ArrayList@5677[1] { JavaMethodDescriptor@5678['getIconImages'] } // through LazyJavaClassMemberScope@5365
-    functions('getIgnoreRepaint': Name@376) = ArrayList@5679[1] { JavaMethodDescriptor@5680['getIgnoreRepaint'] } // through LazyJavaClassMemberScope@5365
-    functions('getInputContext': Name@2777) = ArrayList@5681[1] { JavaMethodDescriptor@5682['getInputContext'] } // through LazyJavaClassMemberScope@5365
-    functions('getInputMethodListeners': Name@382) = ArrayList@5683[1] { JavaMethodDescriptor@5684['getInputMethodListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getInputMethodRequests': Name@385) = ArrayList@5685[1] { JavaMethodDescriptor@5686['getInputMethodRequests'] } // through LazyJavaClassMemberScope@5365
-    functions('getInsets': Name@1678) = ArrayList@5687[1] { JavaMethodDescriptor@5688['getInsets'] } // through LazyJavaClassMemberScope@5365
-    functions('getInsets_NoClientCode': Name@389) = ArrayList@5689[1] { JavaMethodDescriptor@5690['getInsets_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getJMenuBar': Name@392) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getKeyListeners': Name@393) = ArrayList@5691[1] { JavaMethodDescriptor@5692['getKeyListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getLayeredPane': Name@396) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getLayout': Name@1685) = ArrayList@5693[1] { JavaMethodDescriptor@5694['getLayout'] } // through LazyJavaClassMemberScope@5365
-    functions('getListeners': Name@2792) = ArrayList@5695[1] { JavaMethodDescriptor@5696['getListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getListenersCount': Name@1691) = ArrayList@5697[1] { JavaMethodDescriptor@5698['getListenersCount'] } // through LazyJavaClassMemberScope@5365
-    functions('getLocale': Name@2797) = ArrayList@5699[1] { JavaMethodDescriptor@5700['getLocale'] } // through LazyJavaClassMemberScope@5365
-    functions('getLocation': Name@405) = ArrayList@5701[2] { JavaMethodDescriptor@5702['getLocation'], JavaMethodDescriptor@5703['getLocation'] } // through LazyJavaClassMemberScope@5365
-    functions('getLocationOnScreen': Name@409) = ArrayList@5704[1] { JavaMethodDescriptor@5705['getLocationOnScreen'] } // through LazyJavaClassMemberScope@5365
-    functions('getLocationOnScreen_NoTreeLock': Name@412) = ArrayList@5706[1] { JavaMethodDescriptor@5707['getLocationOnScreen_NoTreeLock'] } // through LazyJavaClassMemberScope@5365
-    functions('getLocationOnWindow': Name@2807) = ArrayList@5708[1] { JavaMethodDescriptor@5709['getLocationOnWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('getMaximizedBounds': Name@418) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getMaximumSize': Name@1705) = ArrayList@5710[1] { JavaMethodDescriptor@5711['getMaximumSize'] } // through LazyJavaClassMemberScope@5365
-    functions('getMenuBar': Name@422) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getMinimumSize': Name@1708) = ArrayList@5712[1] { JavaMethodDescriptor@5713['getMinimumSize'] } // through LazyJavaClassMemberScope@5365
-    functions('getModalBlocker': Name@2820) = ArrayList@5714[1] { JavaMethodDescriptor@5715['getModalBlocker'] } // through LazyJavaClassMemberScope@5365
-    functions('getModalExclusionType': Name@2823) = ArrayList@5716[1] { JavaMethodDescriptor@5717['getModalExclusionType'] } // through LazyJavaClassMemberScope@5365
-    functions('getMostRecentFocusOwner': Name@2826) = ArrayList@5718[1] { JavaMethodDescriptor@5719['getMostRecentFocusOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('getMouseEventTarget': Name@1711) = ArrayList@5720[3] { JavaMethodDescriptor@5721['getMouseEventTarget'], JavaMethodDescriptor@5722['getMouseEventTarget'], JavaMethodDescriptor@5723['getMouseEventTarget'] } // through LazyJavaClassMemberScope@5365
-    functions('getMouseEventTargetImpl': Name@1716) = ArrayList@5724[2] { JavaMethodDescriptor@5725['getMouseEventTargetImpl'], JavaMethodDescriptor@5726['getMouseEventTargetImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('getMouseListeners': Name@431) = ArrayList@5727[1] { JavaMethodDescriptor@5728['getMouseListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getMouseMotionListeners': Name@434) = ArrayList@5729[1] { JavaMethodDescriptor@5730['getMouseMotionListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getMousePosition': Name@1724) = ArrayList@5731[2] { JavaMethodDescriptor@5732['getMousePosition'], JavaMethodDescriptor@5733['getMousePosition'] } // through LazyJavaClassMemberScope@5365
-    functions('getMouseWheelListeners': Name@440) = ArrayList@5734[1] { JavaMethodDescriptor@5735['getMouseWheelListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getName': Name@443) = ArrayList@5736[1] { JavaMethodDescriptor@5737['getName'] } // through LazyJavaClassMemberScope@5365
-    functions('getNativeContainer': Name@446) = ArrayList@5738[1] { JavaMethodDescriptor@5739['getNativeContainer'] } // through LazyJavaClassMemberScope@5365
-    functions('getNextFocusCandidate': Name@449) = ArrayList@5740[1] { JavaMethodDescriptor@5741['getNextFocusCandidate'] } // through LazyJavaClassMemberScope@5365
-    functions('getNormalShape': Name@452) = ArrayList@5742[1] { JavaMethodDescriptor@5743['getNormalShape'] } // through LazyJavaClassMemberScope@5365
-    functions('getObjectLock': Name@455) = ArrayList@5744[1] { JavaMethodDescriptor@5745['getObjectLock'] } // through LazyJavaClassMemberScope@5365
-    functions('getOpacity': Name@2855) = ArrayList@5746[1] { JavaMethodDescriptor@5747['getOpacity'] } // through LazyJavaClassMemberScope@5365
-    functions('getOpaqueShape': Name@1740) = ArrayList@5748[1] { JavaMethodDescriptor@5749['getOpaqueShape'] } // through LazyJavaClassMemberScope@5365
-    functions('getOwnedWindows': Name@2860) = ArrayList@5750[1] { JavaMethodDescriptor@5751['getOwnedWindows'] } // through LazyJavaClassMemberScope@5365
-    functions('getOwnedWindows_NoClientCode': Name@2863) = ArrayList@5752[1] { JavaMethodDescriptor@5753['getOwnedWindows_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getOwner': Name@2866) = ArrayList@5754[1] { JavaMethodDescriptor@5755['getOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('getOwner_NoClientCode': Name@2869) = ArrayList@5756[1] { JavaMethodDescriptor@5757['getOwner_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getParent': Name@466) = ArrayList@5758[1] { JavaMethodDescriptor@5759['getParent'] } // through LazyJavaClassMemberScope@5365
-    functions('getParent_NoClientCode': Name@469) = ArrayList@5760[1] { JavaMethodDescriptor@5761['getParent_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('getPeer': Name@472) = ArrayList@5762[1] { JavaMethodDescriptor@5763['getPeer'] } // through LazyJavaClassMemberScope@5365
-    functions('getPreferredSize': Name@1749) = ArrayList@5764[1] { JavaMethodDescriptor@5765['getPreferredSize'] } // through LazyJavaClassMemberScope@5365
-    functions('getPropertyChangeListeners': Name@478) = ArrayList@5766[2] { JavaMethodDescriptor@5767['getPropertyChangeListeners'], JavaMethodDescriptor@5768['getPropertyChangeListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getRootPane': Name@482) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getShape': Name@2883) = ArrayList@5769[1] { JavaMethodDescriptor@5770['getShape'] } // through LazyJavaClassMemberScope@5365
-    functions('getSiblingIndexAbove': Name@484) = ArrayList@5771[1] { JavaMethodDescriptor@5772['getSiblingIndexAbove'] } // through LazyJavaClassMemberScope@5365
-    functions('getSiblingIndexBelow': Name@487) = ArrayList@5773[1] { JavaMethodDescriptor@5774['getSiblingIndexBelow'] } // through LazyJavaClassMemberScope@5365
-    functions('getSize': Name@490) = ArrayList@5775[2] { JavaMethodDescriptor@5776['getSize'], JavaMethodDescriptor@5777['getSize'] } // through LazyJavaClassMemberScope@5365
-    functions('getState': Name@494) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getTemporaryLostComponent': Name@2896) = ArrayList@5778[1] { JavaMethodDescriptor@5779['getTemporaryLostComponent'] } // through LazyJavaClassMemberScope@5365
-    functions('getTitle': Name@496) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getToolkit': Name@2902) = ArrayList@5780[1] { JavaMethodDescriptor@5781['getToolkit'] } // through LazyJavaClassMemberScope@5365
-    functions('getToolkitImpl': Name@500) = ArrayList@5782[1] { JavaMethodDescriptor@5783['getToolkitImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('getTopmostComponentIndex': Name@1766) = ArrayList@5784[1] { JavaMethodDescriptor@5785['getTopmostComponentIndex'] } // through LazyJavaClassMemberScope@5365
-    functions('getTransferHandler': Name@504) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('getTraversalRoot': Name@1769) = ArrayList@5786[1] { JavaMethodDescriptor@5787['getTraversalRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('getTreeLock': Name@508) = ArrayList@5788[1] { JavaMethodDescriptor@5789['getTreeLock'] } // through LazyJavaClassMemberScope@5365
-    functions('getType': Name@2913) = ArrayList@5790[1] { JavaMethodDescriptor@5791['getType'] } // through LazyJavaClassMemberScope@5365
-    functions('getWarningString': Name@2916) = ArrayList@5792[1] { JavaMethodDescriptor@5793['getWarningString'] } // through LazyJavaClassMemberScope@5365
-    functions('getWidth': Name@513) = ArrayList@5794[1] { JavaMethodDescriptor@5795['getWidth'] } // through LazyJavaClassMemberScope@5365
-    functions('getWindowFocusListeners': Name@2921) = ArrayList@5796[1] { JavaMethodDescriptor@5797['getWindowFocusListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getWindowListeners': Name@2924) = ArrayList@5798[1] { JavaMethodDescriptor@5799['getWindowListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getWindowStateListeners': Name@2927) = ArrayList@5800[1] { JavaMethodDescriptor@5801['getWindowStateListeners'] } // through LazyJavaClassMemberScope@5365
-    functions('getX': Name@519) = ArrayList@5802[1] { JavaMethodDescriptor@5803['getX'] } // through LazyJavaClassMemberScope@5365
-    functions('getY': Name@522) = ArrayList@5804[1] { JavaMethodDescriptor@5805['getY'] } // through LazyJavaClassMemberScope@5365
-    functions('gotFocus': Name@525) = ArrayList@5806[1] { JavaMethodDescriptor@5807['gotFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('handleEvent': Name@528) = ArrayList@5808[1] { JavaMethodDescriptor@5809['handleEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('hasFocus': Name@531) = ArrayList@5810[1] { JavaMethodDescriptor@5811['hasFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('hasHeavyweightDescendants': Name@1786) = ArrayList@5812[1] { JavaMethodDescriptor@5813['hasHeavyweightDescendants'] } // through LazyJavaClassMemberScope@5365
-    functions('hasLightweightDescendants': Name@1789) = ArrayList@5814[1] { JavaMethodDescriptor@5815['hasLightweightDescendants'] } // through LazyJavaClassMemberScope@5365
-    functions('hashCode': Name@536) = ArrayList@5816[1] { DeserializedSimpleFunctionDescriptor@5817['hashCode'] } // through LazyJavaClassMemberScope@5365
-    functions('hide': Name@2946) = ArrayList@5818[1] { JavaMethodDescriptor@5819['hide'] } // through LazyJavaClassMemberScope@5365
-    functions('imageUpdate': Name@542) = ArrayList@5820[1] { JavaMethodDescriptor@5821['imageUpdate'] } // through LazyJavaClassMemberScope@5365
-    functions('increaseComponentCount': Name@1798) = ArrayList@5822[1] { JavaMethodDescriptor@5823['increaseComponentCount'] } // through LazyJavaClassMemberScope@5365
-    functions('init': Name@5824) = ArrayList@5825[1] { JavaMethodDescriptor@5826['init'] } // through LazyJavaClassMemberScope@5365
-    functions('initDeserializedWindow': Name@2957) = ArrayList@5827[1] { JavaMethodDescriptor@5828['initDeserializedWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('initGC': Name@2960) = ArrayList@5829[1] { JavaMethodDescriptor@5830['initGC'] } // through LazyJavaClassMemberScope@5365
-    functions('initializeFocusTraversalKeys': Name@1801) = ArrayList@5831[1] { JavaMethodDescriptor@5832['initializeFocusTraversalKeys'] } // through LazyJavaClassMemberScope@5365
-    functions('insets': Name@1804) = ArrayList@5833[1] { JavaMethodDescriptor@5834['insets'] } // through LazyJavaClassMemberScope@5365
-    functions('inside': Name@553) = ArrayList@5835[1] { JavaMethodDescriptor@5836['inside'] } // through LazyJavaClassMemberScope@5365
-    functions('invalidate': Name@1809) = ArrayList@5837[1] { JavaMethodDescriptor@5838['invalidate'] } // through LazyJavaClassMemberScope@5365
-    functions('invalidateIfValid': Name@559) = ArrayList@5839[1] { JavaMethodDescriptor@5840['invalidateIfValid'] } // through LazyJavaClassMemberScope@5365
-    functions('invalidateParent': Name@1814) = ArrayList@5841[1] { JavaMethodDescriptor@5842['invalidateParent'] } // through LazyJavaClassMemberScope@5365
-    functions('invalidateTree': Name@1817) = ArrayList@5843[1] { JavaMethodDescriptor@5844['invalidateTree'] } // through LazyJavaClassMemberScope@5365
-    functions('isActive': Name@2977) = ArrayList@5845[1] { JavaMethodDescriptor@5846['isActive'] } // through LazyJavaClassMemberScope@5365
-    functions('isAlwaysOnTop': Name@2980) = ArrayList@5847[1] { JavaMethodDescriptor@5848['isAlwaysOnTop'] } // through LazyJavaClassMemberScope@5365
-    functions('isAlwaysOnTopSupported': Name@2983) = ArrayList@5849[1] { JavaMethodDescriptor@5850['isAlwaysOnTopSupported'] } // through LazyJavaClassMemberScope@5365
-    functions('isAncestorOf': Name@1820) = ArrayList@5851[1] { JavaMethodDescriptor@5852['isAncestorOf'] } // through LazyJavaClassMemberScope@5365
-    functions('isAutoFocusTransferOnDisposal': Name@570) = ArrayList@5853[1] { JavaMethodDescriptor@5854['isAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@5365
-    functions('isAutoRequestFocus': Name@2990) = ArrayList@5855[1] { JavaMethodDescriptor@5856['isAutoRequestFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('isBackgroundSet': Name@574) = ArrayList@5857[1] { JavaMethodDescriptor@5858['isBackgroundSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isCoalescingEnabled': Name@577) = ArrayList@5859[1] { JavaMethodDescriptor@5860['isCoalescingEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('isCursorSet': Name@580) = ArrayList@5861[1] { JavaMethodDescriptor@5862['isCursorSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isDisplayable': Name@583) = ArrayList@5863[1] { JavaMethodDescriptor@5864['isDisplayable'] } // through LazyJavaClassMemberScope@5365
-    functions('isDisposing': Name@3001) = ArrayList@5865[1] { JavaMethodDescriptor@5866['isDisposing'] } // through LazyJavaClassMemberScope@5365
-    functions('isDoubleBuffered': Name@587) = ArrayList@5867[1] { JavaMethodDescriptor@5868['isDoubleBuffered'] } // through LazyJavaClassMemberScope@5365
-    functions('isEnabled': Name@590) = ArrayList@5869[1] { JavaMethodDescriptor@5870['isEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('isEnabledImpl': Name@593) = ArrayList@5871[1] { JavaMethodDescriptor@5872['isEnabledImpl'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusCycleRoot': Name@3010) = ArrayList@5873[2] { JavaMethodDescriptor@5874['isFocusCycleRoot'], JavaMethodDescriptor@5875['isFocusCycleRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusOwner': Name@599) = ArrayList@5876[1] { JavaMethodDescriptor@5877['isFocusOwner'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusTraversable': Name@602) = ArrayList@5878[1] { JavaMethodDescriptor@5879['isFocusTraversable'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusTraversableOverridden': Name@605) = ArrayList@5880[1] { JavaMethodDescriptor@5881['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusTraversalPolicyProvider': Name@1849) = ArrayList@5882[1] { JavaMethodDescriptor@5883['isFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusTraversalPolicySet': Name@1852) = ArrayList@5884[1] { JavaMethodDescriptor@5885['isFocusTraversalPolicySet'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusable': Name@610) = ArrayList@5886[1] { JavaMethodDescriptor@5887['isFocusable'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocusableWindow': Name@3026) = ArrayList@5888[1] { JavaMethodDescriptor@5889['isFocusableWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('isFocused': Name@3029) = ArrayList@5890[1] { JavaMethodDescriptor@5891['isFocused'] } // through LazyJavaClassMemberScope@5365
-    functions('isFontSet': Name@615) = ArrayList@5892[1] { JavaMethodDescriptor@5893['isFontSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isForegroundSet': Name@618) = ArrayList@5894[1] { JavaMethodDescriptor@5895['isForegroundSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isFrameStateSupported': Name@621) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('isLightweight': Name@622) = ArrayList@5896[1] { JavaMethodDescriptor@5897['isLightweight'] } // through LazyJavaClassMemberScope@5365
-    functions('isLocationByPlatform': Name@3041) = ArrayList@5898[1] { JavaMethodDescriptor@5899['isLocationByPlatform'] } // through LazyJavaClassMemberScope@5365
-    functions('isMaximumSizeSet': Name@626) = ArrayList@5900[1] { JavaMethodDescriptor@5901['isMaximumSizeSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isMinimumSizeSet': Name@629) = ArrayList@5902[1] { JavaMethodDescriptor@5903['isMinimumSizeSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isMixingNeeded': Name@632) = ArrayList@5904[1] { JavaMethodDescriptor@5905['isMixingNeeded'] } // through LazyJavaClassMemberScope@5365
-    functions('isModalBlocked': Name@3050) = ArrayList@5906[1] { JavaMethodDescriptor@5907['isModalBlocked'] } // through LazyJavaClassMemberScope@5365
-    functions('isModalExcluded': Name@3053) = ArrayList@5908[1] { JavaMethodDescriptor@5909['isModalExcluded'] } // through LazyJavaClassMemberScope@5365
-    functions('isNonOpaqueForMixing': Name@637) = ArrayList@5910[1] { JavaMethodDescriptor@5911['isNonOpaqueForMixing'] } // through LazyJavaClassMemberScope@5365
-    functions('isOpaque': Name@3058) = ArrayList@5912[1] { JavaMethodDescriptor@5913['isOpaque'] } // through LazyJavaClassMemberScope@5365
-    functions('isParentOf': Name@1873) = ArrayList@5914[1] { JavaMethodDescriptor@5915['isParentOf'] } // through LazyJavaClassMemberScope@5365
-    functions('isPreferredSizeSet': Name@644) = ArrayList@5916[1] { JavaMethodDescriptor@5917['isPreferredSizeSet'] } // through LazyJavaClassMemberScope@5365
-    functions('isRecursivelyVisible': Name@3065) = ArrayList@5918[1] { JavaMethodDescriptor@5919['isRecursivelyVisible'] } // through LazyJavaClassMemberScope@5365
-    functions('isRecursivelyVisibleUpToHeavyweightContainer': Name@1880) = ArrayList@5920[1] { JavaMethodDescriptor@5921['isRecursivelyVisibleUpToHeavyweightContainer'] } // through LazyJavaClassMemberScope@5365
-    functions('isRequestFocusAccepted': Name@651) = ArrayList@5922[1] { JavaMethodDescriptor@5923['isRequestFocusAccepted'] } // through LazyJavaClassMemberScope@5365
-    functions('isResizable': Name@654) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('isRootPaneCheckingEnabled': Name@655) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('isSameOrAncestorOf': Name@1885) = ArrayList@5924[1] { JavaMethodDescriptor@5925['isSameOrAncestorOf'] } // through LazyJavaClassMemberScope@5365
-    functions('isShowing': Name@3077) = ArrayList@5926[1] { JavaMethodDescriptor@5927['isShowing'] } // through LazyJavaClassMemberScope@5365
-    functions('isUndecorated': Name@662) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('isValid': Name@663) = ArrayList@5928[1] { JavaMethodDescriptor@5929['isValid'] } // through LazyJavaClassMemberScope@5365
-    functions('isValidateRoot': Name@3085) = ArrayList@5930[1] { JavaMethodDescriptor@5931['isValidateRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('isVisible': Name@667) = ArrayList@5932[1] { JavaMethodDescriptor@5933['isVisible'] } // through LazyJavaClassMemberScope@5365
-    functions('isVisible_NoClientCode': Name@670) = ArrayList@5934[1] { JavaMethodDescriptor@5935['isVisible_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('keyDown': Name@673) = ArrayList@5936[1] { JavaMethodDescriptor@5937['keyDown'] } // through LazyJavaClassMemberScope@5365
-    functions('keyUp': Name@676) = ArrayList@5938[1] { JavaMethodDescriptor@5939['keyUp'] } // through LazyJavaClassMemberScope@5365
-    functions('layout': Name@1903) = ArrayList@5940[1] { JavaMethodDescriptor@5941['layout'] } // through LazyJavaClassMemberScope@5365
-    functions('lightweightPaint': Name@1906) = ArrayList@5942[1] { JavaMethodDescriptor@5943['lightweightPaint'] } // through LazyJavaClassMemberScope@5365
-    functions('lightweightPrint': Name@1909) = ArrayList@5944[1] { JavaMethodDescriptor@5945['lightweightPrint'] } // through LazyJavaClassMemberScope@5365
-    functions('list': Name@1912) = ArrayList@5946[5] { JavaMethodDescriptor@5947['list'], JavaMethodDescriptor@5948['list'], JavaMethodDescriptor@5949['list'], ... } // through LazyJavaClassMemberScope@5365
-    functions('locate': Name@1917) = ArrayList@5950[1] { JavaMethodDescriptor@5951['locate'] } // through LazyJavaClassMemberScope@5365
-    functions('location': Name@696) = ArrayList@5952[1] { JavaMethodDescriptor@5953['location'] } // through LazyJavaClassMemberScope@5365
-    functions('location_NoClientCode': Name@699) = ArrayList@5954[1] { JavaMethodDescriptor@5955['location_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('lostFocus': Name@702) = ArrayList@5956[1] { JavaMethodDescriptor@5957['lostFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('minimumSize': Name@1926) = ArrayList@5958[1] { JavaMethodDescriptor@5959['minimumSize'] } // through LazyJavaClassMemberScope@5365
-    functions('mixOnHiding': Name@1929) = ArrayList@5960[1] { JavaMethodDescriptor@5961['mixOnHiding'] } // through LazyJavaClassMemberScope@5365
-    functions('mixOnReshaping': Name@3118) = ArrayList@5962[1] { JavaMethodDescriptor@5963['mixOnReshaping'] } // through LazyJavaClassMemberScope@5365
-    functions('mixOnShowing': Name@1935) = ArrayList@5964[1] { JavaMethodDescriptor@5965['mixOnShowing'] } // through LazyJavaClassMemberScope@5365
-    functions('mixOnValidating': Name@1938) = ArrayList@5966[1] { JavaMethodDescriptor@5967['mixOnValidating'] } // through LazyJavaClassMemberScope@5365
-    functions('mixOnZOrderChanging': Name@1941) = ArrayList@5968[1] { JavaMethodDescriptor@5969['mixOnZOrderChanging'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseDown': Name@723) = ArrayList@5970[1] { JavaMethodDescriptor@5971['mouseDown'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseDrag': Name@726) = ArrayList@5972[1] { JavaMethodDescriptor@5973['mouseDrag'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseEnter': Name@729) = ArrayList@5974[1] { JavaMethodDescriptor@5975['mouseEnter'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseExit': Name@732) = ArrayList@5976[1] { JavaMethodDescriptor@5977['mouseExit'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseMove': Name@735) = ArrayList@5978[1] { JavaMethodDescriptor@5979['mouseMove'] } // through LazyJavaClassMemberScope@5365
-    functions('mouseUp': Name@738) = ArrayList@5980[1] { JavaMethodDescriptor@5981['mouseUp'] } // through LazyJavaClassMemberScope@5365
-    functions('move': Name@741) = ArrayList@5982[1] { JavaMethodDescriptor@5983['move'] } // through LazyJavaClassMemberScope@5365
-    functions('nextFocus': Name@744) = ArrayList@5984[1] { JavaMethodDescriptor@5985['nextFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('notify': Name@747) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('notifyAll': Name@748) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('notifyNewBounds': Name@749) = ArrayList@5986[1] { JavaMethodDescriptor@5987['notifyNewBounds'] } // through LazyJavaClassMemberScope@5365
-    functions('numListening': Name@1962) = ArrayList@5988[1] { JavaMethodDescriptor@5989['numListening'] } // through LazyJavaClassMemberScope@5365
-    functions('ownedInit': Name@3147) = ArrayList@5990[1] { JavaMethodDescriptor@5991['ownedInit'] } // through LazyJavaClassMemberScope@5365
-    functions('pack': Name@3150) = ArrayList@5992[1] { JavaMethodDescriptor@5993['pack'] } // through LazyJavaClassMemberScope@5365
-    functions('paint': Name@3153) = ArrayList@5994[1] { JavaMethodDescriptor@5995['paint'] } // through LazyJavaClassMemberScope@5365
-    functions('paintAll': Name@760) = ArrayList@5996[1] { JavaMethodDescriptor@5997['paintAll'] } // through LazyJavaClassMemberScope@5365
-    functions('paintComponents': Name@1970) = ArrayList@5998[1] { JavaMethodDescriptor@5999['paintComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('paintHeavyweightComponents': Name@1973) = ArrayList@6000[1] { JavaMethodDescriptor@6001['paintHeavyweightComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('paramString': Name@1976) = ArrayList@6002[1] { JavaMethodDescriptor@6003['paramString'] } // through LazyJavaClassMemberScope@5365
-    functions('pointRelativeToComponent': Name@770) = ArrayList@6004[1] { JavaMethodDescriptor@6005['pointRelativeToComponent'] } // through LazyJavaClassMemberScope@5365
-    functions('postEvent': Name@3167) = ArrayList@6006[1] { JavaMethodDescriptor@6007['postEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('postProcessKeyEvent': Name@6008) = ArrayList@6009[1] { JavaMethodDescriptor@6010['postProcessKeyEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('postWindowEvent': Name@3173) = ArrayList@6011[1] { JavaMethodDescriptor@6012['postWindowEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('postsOldMouseEvents': Name@1986) = ArrayList@6013[1] { JavaMethodDescriptor@6014['postsOldMouseEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('preProcessKeyEvent': Name@3178) = ArrayList@6015[1] { JavaMethodDescriptor@6016['preProcessKeyEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('preferredSize': Name@1992) = ArrayList@6017[1] { JavaMethodDescriptor@6018['preferredSize'] } // through LazyJavaClassMemberScope@5365
-    functions('prepareImage': Name@785) = ArrayList@6019[2] { JavaMethodDescriptor@6020['prepareImage'], JavaMethodDescriptor@6021['prepareImage'] } // through LazyJavaClassMemberScope@5365
-    functions('print': Name@1998) = ArrayList@6022[1] { JavaMethodDescriptor@6023['print'] } // through LazyJavaClassMemberScope@5365
-    functions('printAll': Name@792) = ArrayList@6024[1] { JavaMethodDescriptor@6025['printAll'] } // through LazyJavaClassMemberScope@5365
-    functions('printComponents': Name@2003) = ArrayList@6026[1] { JavaMethodDescriptor@6027['printComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('printHeavyweightComponents': Name@2006) = ArrayList@6028[1] { JavaMethodDescriptor@6029['printHeavyweightComponents'] } // through LazyJavaClassMemberScope@5365
-    functions('processComponentEvent': Name@799) = ArrayList@6030[1] { JavaMethodDescriptor@6031['processComponentEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processContainerEvent': Name@2011) = ArrayList@6032[1] { JavaMethodDescriptor@6033['processContainerEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processEvent': Name@3198) = ArrayList@6034[1] { JavaMethodDescriptor@6035['processEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processFocusEvent': Name@806) = ArrayList@6036[1] { JavaMethodDescriptor@6037['processFocusEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processHierarchyBoundsEvent': Name@809) = ArrayList@6038[1] { JavaMethodDescriptor@6039['processHierarchyBoundsEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processHierarchyEvent': Name@812) = ArrayList@6040[1] { JavaMethodDescriptor@6041['processHierarchyEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processInputMethodEvent': Name@815) = ArrayList@6042[1] { JavaMethodDescriptor@6043['processInputMethodEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processKeyEvent': Name@818) = ArrayList@6044[1] { JavaMethodDescriptor@6045['processKeyEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processMouseEvent': Name@821) = ArrayList@6046[1] { JavaMethodDescriptor@6047['processMouseEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processMouseMotionEvent': Name@824) = ArrayList@6048[1] { JavaMethodDescriptor@6049['processMouseMotionEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processMouseWheelEvent': Name@827) = ArrayList@6050[1] { JavaMethodDescriptor@6051['processMouseWheelEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processWindowEvent': Name@3217) = ArrayList@6052[1] { JavaMethodDescriptor@6053['processWindowEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processWindowFocusEvent': Name@3220) = ArrayList@6054[1] { JavaMethodDescriptor@6055['processWindowFocusEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('processWindowStateEvent': Name@3223) = ArrayList@6056[1] { JavaMethodDescriptor@6057['processWindowStateEvent'] } // through LazyJavaClassMemberScope@5365
-    functions('proxyEnableEvents': Name@2033) = ArrayList@6058[1] { JavaMethodDescriptor@6059['proxyEnableEvents'] } // through LazyJavaClassMemberScope@5365
-    functions('readObject': Name@6060) = ArrayList@6061[1] { JavaMethodDescriptor@6062['readObject'] } // through LazyJavaClassMemberScope@5365
-    functions('recursiveApplyCurrentShape': Name@2039) = ArrayList@6063[3] { JavaMethodDescriptor@6064['recursiveApplyCurrentShape'], JavaMethodDescriptor@6065['recursiveApplyCurrentShape'], JavaMethodDescriptor@6066['recursiveApplyCurrentShape'] } // through LazyJavaClassMemberScope@5365
-    functions('recursiveHideHeavyweightChildren': Name@2044) = ArrayList@6067[1] { JavaMethodDescriptor@6068['recursiveHideHeavyweightChildren'] } // through LazyJavaClassMemberScope@5365
-    functions('recursiveRelocateHeavyweightChildren': Name@2047) = ArrayList@6069[1] { JavaMethodDescriptor@6070['recursiveRelocateHeavyweightChildren'] } // through LazyJavaClassMemberScope@5365
-    functions('recursiveShowHeavyweightChildren': Name@2050) = ArrayList@6071[1] { JavaMethodDescriptor@6072['recursiveShowHeavyweightChildren'] } // through LazyJavaClassMemberScope@5365
-    functions('recursiveSubtractAndApplyShape': Name@2053) = ArrayList@6073[3] { JavaMethodDescriptor@6074['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@6075['recursiveSubtractAndApplyShape'], JavaMethodDescriptor@6076['recursiveSubtractAndApplyShape'] } // through LazyJavaClassMemberScope@5365
-    functions('relocateComponent': Name@842) = ArrayList@6077[1] { JavaMethodDescriptor@6078['relocateComponent'] } // through LazyJavaClassMemberScope@5365
-    functions('remove': Name@2060) = ArrayList@6079[2] { JavaMethodDescriptor@6080['remove'], JavaMethodDescriptor@6081['remove'] } // through LazyJavaClassMemberScope@5365
-    functions('removeAll': Name@2064) = ArrayList@6082[1] { JavaMethodDescriptor@6083['removeAll'] } // through LazyJavaClassMemberScope@5365
-    functions('removeComponentListener': Name@849) = ArrayList@6084[1] { JavaMethodDescriptor@6085['removeComponentListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeContainerListener': Name@2069) = ArrayList@6086[1] { JavaMethodDescriptor@6087['removeContainerListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeDelicately': Name@2072) = ArrayList@6088[1] { JavaMethodDescriptor@6089['removeDelicately'] } // through LazyJavaClassMemberScope@5365
-    functions('removeFocusListener': Name@854) = ArrayList@6090[1] { JavaMethodDescriptor@6091['removeFocusListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeFromWindowList': Name@3261) = ArrayList@6092[1] { JavaMethodDescriptor@6093['removeFromWindowList'] } // through LazyJavaClassMemberScope@5365
-    functions('removeHierarchyBoundsListener': Name@858) = ArrayList@6094[1] { JavaMethodDescriptor@6095['removeHierarchyBoundsListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeHierarchyListener': Name@861) = ArrayList@6096[1] { JavaMethodDescriptor@6097['removeHierarchyListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeInputMethodListener': Name@864) = ArrayList@6098[1] { JavaMethodDescriptor@6099['removeInputMethodListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeKeyListener': Name@867) = ArrayList@6100[1] { JavaMethodDescriptor@6101['removeKeyListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeMouseListener': Name@870) = ArrayList@6102[1] { JavaMethodDescriptor@6103['removeMouseListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeMouseMotionListener': Name@873) = ArrayList@6104[1] { JavaMethodDescriptor@6105['removeMouseMotionListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeMouseWheelListener': Name@876) = ArrayList@6106[1] { JavaMethodDescriptor@6107['removeMouseWheelListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeNotify': Name@6108) = ArrayList@6109[1] { JavaMethodDescriptor@6110['removeNotify'] } // through LazyJavaClassMemberScope@5365
-    functions('removeOwnedWindow': Name@3281) = ArrayList@6111[1] { JavaMethodDescriptor@6112['removeOwnedWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('removePropertyChangeListener': Name@883) = ArrayList@6113[2] { JavaMethodDescriptor@6114['removePropertyChangeListener'], JavaMethodDescriptor@6115['removePropertyChangeListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeWindowFocusListener': Name@3287) = ArrayList@6116[1] { JavaMethodDescriptor@6117['removeWindowFocusListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeWindowListener': Name@3290) = ArrayList@6118[1] { JavaMethodDescriptor@6119['removeWindowListener'] } // through LazyJavaClassMemberScope@5365
-    functions('removeWindowStateListener': Name@3293) = ArrayList@6120[1] { JavaMethodDescriptor@6121['removeWindowStateListener'] } // through LazyJavaClassMemberScope@5365
-    functions('repaint': Name@890) = ArrayList@6122[4] { JavaMethodDescriptor@6123['repaint'], JavaMethodDescriptor@6124['repaint'], JavaMethodDescriptor@6125['repaint'], ... } // through LazyJavaClassMemberScope@5365
-    functions('repaintParentIfNeeded': Name@895) = ArrayList@6126[1] { JavaMethodDescriptor@6127['repaintParentIfNeeded'] } // through LazyJavaClassMemberScope@5365
-    functions('reparentChild': Name@2103) = ArrayList@6128[1] { JavaMethodDescriptor@6129['reparentChild'] } // through LazyJavaClassMemberScope@5365
-    functions('reparentTraverse': Name@2106) = ArrayList@6130[1] { JavaMethodDescriptor@6131['reparentTraverse'] } // through LazyJavaClassMemberScope@5365
-    functions('requestFocus': Name@900) = ArrayList@6132[3] { JavaMethodDescriptor@6133['requestFocus'], JavaMethodDescriptor@6134['requestFocus'], JavaMethodDescriptor@6135['requestFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('requestFocusHelper': Name@905) = ArrayList@6136[2] { JavaMethodDescriptor@6137['requestFocusHelper'], JavaMethodDescriptor@6138['requestFocusHelper'] } // through LazyJavaClassMemberScope@5365
-    functions('requestFocusInWindow': Name@909) = ArrayList@6139[3] { JavaMethodDescriptor@6140['requestFocusInWindow'], JavaMethodDescriptor@6141['requestFocusInWindow'], JavaMethodDescriptor@6142['requestFocusInWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('reshape': Name@3317) = ArrayList@6143[1] { JavaMethodDescriptor@6144['reshape'] } // through LazyJavaClassMemberScope@5365
-    functions('reshapeNativePeer': Name@917) = ArrayList@6145[1] { JavaMethodDescriptor@6146['reshapeNativePeer'] } // through LazyJavaClassMemberScope@5365
-    functions('resize': Name@920) = ArrayList@6147[2] { JavaMethodDescriptor@6148['resize'], JavaMethodDescriptor@6149['resize'] } // through LazyJavaClassMemberScope@5365
-    functions('revalidate': Name@924) = ArrayList@6150[1] { JavaMethodDescriptor@6151['revalidate'] } // through LazyJavaClassMemberScope@5365
-    functions('setAlwaysOnTop': Name@3327) = ArrayList@6152[1] { JavaMethodDescriptor@6153['setAlwaysOnTop'] } // through LazyJavaClassMemberScope@5365
-    functions('setAutoFocusTransferOnDisposal': Name@928) = ArrayList@6154[1] { JavaMethodDescriptor@6155['setAutoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@5365
-    functions('setAutoRequestFocus': Name@3332) = ArrayList@6156[1] { JavaMethodDescriptor@6157['setAutoRequestFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('setBackground': Name@6158) = ArrayList@6159[1] { JavaMethodDescriptor@6160['setBackground'] } // through LazyJavaClassMemberScope@5365
-    functions('setBounds': Name@3338) = ArrayList@6161[2] { JavaMethodDescriptor@6162['setBounds'], JavaMethodDescriptor@6163['setBounds'] } // through LazyJavaClassMemberScope@5365
-    functions('setBoundsOp': Name@939) = ArrayList@6164[1] { JavaMethodDescriptor@6165['setBoundsOp'] } // through LazyJavaClassMemberScope@5365
-    functions('setClientSize': Name@3344) = ArrayList@6166[1] { JavaMethodDescriptor@6167['setClientSize'] } // through LazyJavaClassMemberScope@5365
-    functions('setComponentOrientation': Name@943) = ArrayList@6168[1] { JavaMethodDescriptor@6169['setComponentOrientation'] } // through LazyJavaClassMemberScope@5365
-    functions('setComponentZOrder': Name@2140) = ArrayList@6170[1] { JavaMethodDescriptor@6171['setComponentZOrder'] } // through LazyJavaClassMemberScope@5365
-    functions('setContentPane': Name@947) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setCursor': Name@6172) = ArrayList@6173[1] { JavaMethodDescriptor@6174['setCursor'] } // through LazyJavaClassMemberScope@5365
-    functions('setDefaultCloseOperation': Name@951) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setDropTarget': Name@952) = ArrayList@6175[1] { JavaMethodDescriptor@6176['setDropTarget'] } // through LazyJavaClassMemberScope@5365
-    functions('setEnabled': Name@955) = ArrayList@6177[1] { JavaMethodDescriptor@6178['setEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('setExtendedState': Name@958) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setFocusCycleRoot': Name@3361) = ArrayList@6179[1] { JavaMethodDescriptor@6180['setFocusCycleRoot'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusTraversalKeys': Name@2152) = ArrayList@6181[1] { JavaMethodDescriptor@6182['setFocusTraversalKeys'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusTraversalKeysEnabled': Name@963) = ArrayList@6183[1] { JavaMethodDescriptor@6184['setFocusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusTraversalKeys_NoIDCheck': Name@966) = ArrayList@6185[1] { JavaMethodDescriptor@6186['setFocusTraversalKeys_NoIDCheck'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusTraversalPolicy': Name@2159) = ArrayList@6187[1] { JavaMethodDescriptor@6188['setFocusTraversalPolicy'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusTraversalPolicyProvider': Name@2162) = ArrayList@6189[1] { JavaMethodDescriptor@6190['setFocusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusable': Name@971) = ArrayList@6191[1] { JavaMethodDescriptor@6192['setFocusable'] } // through LazyJavaClassMemberScope@5365
-    functions('setFocusableWindowState': Name@3376) = ArrayList@6193[1] { JavaMethodDescriptor@6194['setFocusableWindowState'] } // through LazyJavaClassMemberScope@5365
-    functions('setFont': Name@2167) = ArrayList@6195[1] { JavaMethodDescriptor@6196['setFont'] } // through LazyJavaClassMemberScope@5365
-    functions('setForeground': Name@978) = ArrayList@6197[1] { JavaMethodDescriptor@6198['setForeground'] } // through LazyJavaClassMemberScope@5365
-    functions('setGlassPane': Name@981) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setGraphicsConfiguration': Name@3383) = ArrayList@6199[1] { JavaMethodDescriptor@6200['setGraphicsConfiguration'] } // through LazyJavaClassMemberScope@5365
-    functions('setIconImage': Name@6201) = ArrayList@6202[1] { JavaMethodDescriptor@6203['setIconImage'] } // through LazyJavaClassMemberScope@5365
-    functions('setIconImages': Name@3389) = ArrayList@6204[1] { JavaMethodDescriptor@6205['setIconImages'] } // through LazyJavaClassMemberScope@5365
-    functions('setIgnoreRepaint': Name@987) = ArrayList@6206[1] { JavaMethodDescriptor@6207['setIgnoreRepaint'] } // through LazyJavaClassMemberScope@5365
-    functions('setJMenuBar': Name@990) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setLayeredPane': Name@991) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setLayout': Name@2176) = ArrayList@6208[1] { JavaMethodDescriptor@6209['setLayout'] } // through LazyJavaClassMemberScope@5365
-    functions('setLocale': Name@993) = ArrayList@6210[1] { JavaMethodDescriptor@6211['setLocale'] } // through LazyJavaClassMemberScope@5365
-    functions('setLocation': Name@3398) = ArrayList@6212[2] { JavaMethodDescriptor@6213['setLocation'], JavaMethodDescriptor@6214['setLocation'] } // through LazyJavaClassMemberScope@5365
-    functions('setLocationByPlatform': Name@3402) = ArrayList@6215[1] { JavaMethodDescriptor@6216['setLocationByPlatform'] } // through LazyJavaClassMemberScope@5365
-    functions('setLocationRelativeTo': Name@3405) = ArrayList@6217[1] { JavaMethodDescriptor@6218['setLocationRelativeTo'] } // through LazyJavaClassMemberScope@5365
-    functions('setMaximizedBounds': Name@1002) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setMaximumSize': Name@1003) = ArrayList@6219[1] { JavaMethodDescriptor@6220['setMaximumSize'] } // through LazyJavaClassMemberScope@5365
-    functions('setMenuBar': Name@1006) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setMinimumSize': Name@3416) = ArrayList@6221[1] { JavaMethodDescriptor@6222['setMinimumSize'] } // through LazyJavaClassMemberScope@5365
-    functions('setModalBlocked': Name@3419) = ArrayList@6223[1] { JavaMethodDescriptor@6224['setModalBlocked'] } // through LazyJavaClassMemberScope@5365
-    functions('setModalExclusionType': Name@3422) = ArrayList@6225[1] { JavaMethodDescriptor@6226['setModalExclusionType'] } // through LazyJavaClassMemberScope@5365
-    functions('setName': Name@1012) = ArrayList@6227[1] { JavaMethodDescriptor@6228['setName'] } // through LazyJavaClassMemberScope@5365
-    functions('setOpacity': Name@6229) = ArrayList@6230[1] { JavaMethodDescriptor@6231['setOpacity'] } // through LazyJavaClassMemberScope@5365
-    functions('setPreferredSize': Name@1016) = ArrayList@6232[1] { JavaMethodDescriptor@6233['setPreferredSize'] } // through LazyJavaClassMemberScope@5365
-    functions('setResizable': Name@1019) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setRootPane': Name@1020) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setRootPaneCheckingEnabled': Name@1021) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setShape': Name@6234) = ArrayList@6235[1] { JavaMethodDescriptor@6236['setShape'] } // through LazyJavaClassMemberScope@5365
-    functions('setSize': Name@3438) = ArrayList@6237[2] { JavaMethodDescriptor@6238['setSize'], JavaMethodDescriptor@6239['setSize'] } // through LazyJavaClassMemberScope@5365
-    functions('setState': Name@1027) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setTemporaryLostComponent': Name@3445) = ArrayList@6240[1] { JavaMethodDescriptor@6241['setTemporaryLostComponent'] } // through LazyJavaClassMemberScope@5365
-    functions('setTitle': Name@1029) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setTransferHandler': Name@1030) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setType': Name@3451) = ArrayList@6242[1] { JavaMethodDescriptor@6243['setType'] } // through LazyJavaClassMemberScope@5365
-    functions('setUndecorated': Name@1032) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('setVisible': Name@3457) = ArrayList@6244[1] { JavaMethodDescriptor@6245['setVisible'] } // through LazyJavaClassMemberScope@5365
-    functions('setWarningString': Name@3460) = ArrayList@6246[1] { JavaMethodDescriptor@6247['setWarningString'] } // through LazyJavaClassMemberScope@5365
-    functions('show': Name@3463) = ArrayList@6248[2] { JavaMethodDescriptor@6249['show'], JavaMethodDescriptor@6250['show'] } // through LazyJavaClassMemberScope@5365
-    functions('size': Name@1041) = ArrayList@6251[1] { JavaMethodDescriptor@6252['size'] } // through LazyJavaClassMemberScope@5365
-    functions('startLWModal': Name@2202) = ArrayList@6253[1] { JavaMethodDescriptor@6254['startLWModal'] } // through LazyJavaClassMemberScope@5365
-    functions('stopLWModal': Name@2205) = ArrayList@6255[1] { JavaMethodDescriptor@6256['stopLWModal'] } // through LazyJavaClassMemberScope@5365
-    functions('subtractAndApplyShape': Name@1046) = ArrayList@6257[1] { JavaMethodDescriptor@6258['subtractAndApplyShape'] } // through LazyJavaClassMemberScope@5365
-    functions('subtractAndApplyShapeBelowMe': Name@1049) = ArrayList@6259[1] { JavaMethodDescriptor@6260['subtractAndApplyShapeBelowMe'] } // through LazyJavaClassMemberScope@5365
-    functions('toBack': Name@3477) = ArrayList@6261[1] { JavaMethodDescriptor@6262['toBack'] } // through LazyJavaClassMemberScope@5365
-    functions('toBack_NoClientCode': Name@3480) = ArrayList@6263[1] { JavaMethodDescriptor@6264['toBack_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('toFront': Name@3483) = ArrayList@6265[1] { JavaMethodDescriptor@6266['toFront'] } // through LazyJavaClassMemberScope@5365
-    functions('toFront_NoClientCode': Name@3486) = ArrayList@6267[1] { JavaMethodDescriptor@6268['toFront_NoClientCode'] } // through LazyJavaClassMemberScope@5365
-    functions('toString': Name@1056) = ArrayList@6269[1] { JavaMethodDescriptor@6270['toString'] } // through LazyJavaClassMemberScope@5365
-    functions('transferFocus': Name@1059) = ArrayList@6271[2] { JavaMethodDescriptor@6272['transferFocus'], JavaMethodDescriptor@6273['transferFocus'] } // through LazyJavaClassMemberScope@5365
-    functions('transferFocusBackward': Name@1063) = ArrayList@6274[2] { JavaMethodDescriptor@6275['transferFocusBackward'], JavaMethodDescriptor@6276['transferFocusBackward'] } // through LazyJavaClassMemberScope@5365
-    functions('transferFocusDownCycle': Name@2220) = ArrayList@6277[1] { JavaMethodDescriptor@6278['transferFocusDownCycle'] } // through LazyJavaClassMemberScope@5365
-    functions('transferFocusUpCycle': Name@1068) = ArrayList@6279[1] { JavaMethodDescriptor@6280['transferFocusUpCycle'] } // through LazyJavaClassMemberScope@5365
-    functions('update': Name@2225) = ArrayList@6281[1] { JavaMethodDescriptor@6282['update'] } // through LazyJavaClassMemberScope@5365
-    functions('updateChildrenBlocking': Name@3503) = ArrayList@6283[1] { JavaMethodDescriptor@6284['updateChildrenBlocking'] } // through LazyJavaClassMemberScope@5365
-    functions('updateCursorImmediately': Name@1075) = ArrayList@6285[1] { JavaMethodDescriptor@6286['updateCursorImmediately'] } // through LazyJavaClassMemberScope@5365
-    functions('updateGraphicsData': Name@2230) = ArrayList@6287[1] { JavaMethodDescriptor@6288['updateGraphicsData'] } // through LazyJavaClassMemberScope@5365
-    functions('updateWindow': Name@3510) = ArrayList@6289[1] { JavaMethodDescriptor@6290['updateWindow'] } // through LazyJavaClassMemberScope@5365
-    functions('updateZOrder': Name@3513) = ArrayList@6291[1] { JavaMethodDescriptor@6292['updateZOrder'] } // through LazyJavaClassMemberScope@5365
-    functions('validate': Name@2235) = ArrayList@6293[1] { JavaMethodDescriptor@6294['validate'] } // through LazyJavaClassMemberScope@5365
-    functions('validateTree': Name@2238) = ArrayList@6295[1] { JavaMethodDescriptor@6296['validateTree'] } // through LazyJavaClassMemberScope@5365
-    functions('validateUnconditionally': Name@2241) = ArrayList@6297[1] { JavaMethodDescriptor@6298['validateUnconditionally'] } // through LazyJavaClassMemberScope@5365
-    functions('wait': Name@1090) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    functions('writeObject': Name@6299) = ArrayList@6300[1] { JavaMethodDescriptor@6301['writeObject'] } // through LazyJavaClassMemberScope@5365
-    memberIndex = computeMemberIndex$1@6302 // through LazyJavaClassMemberScope@5365
-    nestedClassIndex = LinkedHashMap@6303 // through LazyJavaClassMemberScope@5365
-    nestedClasses('Type': Name@6304) = LazyJavaClassDescriptor@5361['Type'] // through LazyJavaClassMemberScope@5365
-    properties('acc': Name@1097) = ArrayList@6305[1] { PropertyDescriptorImpl@6306['acc'] } // through LazyJavaClassMemberScope@5365
-    properties('accessibleContext': Name@1100) = ArrayList@6307[1] { PropertyDescriptorImpl@6308['accessibleContext'] } // through LazyJavaClassMemberScope@5365
-    properties('alwaysOnTop': Name@1103) = ArrayList@6309[1] { JavaPropertyDescriptor@6310['alwaysOnTop'] } // through LazyJavaClassMemberScope@5365
-    properties('anchor': Name@1104) = ArrayList@6311[1] { JavaPropertyDescriptor@6312['anchor'] } // through LazyJavaClassMemberScope@5365
-    properties('appContext': Name@1105) = ArrayList@6313[1] { PropertyDescriptorImpl@6314['appContext'] } // through LazyJavaClassMemberScope@5365
-    properties('autoFocusTransferOnDisposal': Name@1108) = ArrayList@6315[1] { PropertyDescriptorImpl@6316['autoFocusTransferOnDisposal'] } // through LazyJavaClassMemberScope@5365
-    properties('autoRequestFocus': Name@1111) = ArrayList@6317[1] { JavaPropertyDescriptor@6318['autoRequestFocus'] } // through LazyJavaClassMemberScope@5365
-    properties('background': Name@1112) = ArrayList@6319[1] { PropertyDescriptorImpl@6320['background'] } // through LazyJavaClassMemberScope@5365
-    properties('backgroundEraseDisabled': Name@1115) = ArrayList@6321[1] { PropertyDescriptorImpl@6322['backgroundEraseDisabled'] } // through LazyJavaClassMemberScope@5365
-    properties('beforeFirstShow': Name@1118) = ArrayList@6323[1] { JavaPropertyDescriptor@6324['beforeFirstShow'] } // through LazyJavaClassMemberScope@5365
-    properties('boundsOp': Name@1119) = ArrayList@6325[1] { PropertyDescriptorImpl@6326['boundsOp'] } // through LazyJavaClassMemberScope@5365
-    properties('bufferStrategy': Name@1122) = ArrayList@6327[1] { PropertyDescriptorImpl@6328['bufferStrategy'] } // through LazyJavaClassMemberScope@5365
-    properties('changeSupport': Name@1125) = ArrayList@6329[1] { PropertyDescriptorImpl@6330['changeSupport'] } // through LazyJavaClassMemberScope@5365
-    properties('coalescingEnabled': Name@1128) = ArrayList@6331[1] { PropertyDescriptorImpl@6332['coalescingEnabled'] } // through LazyJavaClassMemberScope@5365
-    properties('component': Name@1131) = ArrayList@6333[1] { PropertyDescriptorImpl@6334['component'] } // through LazyJavaClassMemberScope@5365
-    properties('componentListener': Name@1132) = ArrayList@6335[1] { PropertyDescriptorImpl@6336['componentListener'] } // through LazyJavaClassMemberScope@5365
-    properties('componentOrientation': Name@1135) = ArrayList@6337[1] { PropertyDescriptorImpl@6338['componentOrientation'] } // through LazyJavaClassMemberScope@5365
-    properties('componentSerializedDataVersion': Name@1138) = ArrayList@6339[1] { PropertyDescriptorImpl@6340['componentSerializedDataVersion'] } // through LazyJavaClassMemberScope@5365
-    properties('compoundShape': Name@1141) = ArrayList@6341[1] { PropertyDescriptorImpl@6342['compoundShape'] } // through LazyJavaClassMemberScope@5365
-    properties('containerListener': Name@1144) = ArrayList@6343[1] { PropertyDescriptorImpl@6344['containerListener'] } // through LazyJavaClassMemberScope@5365
-    properties('containerSerializedDataVersion': Name@1145) = ArrayList@6345[1] { PropertyDescriptorImpl@6346['containerSerializedDataVersion'] } // through LazyJavaClassMemberScope@5365
-    properties('cursor': Name@1146) = ArrayList@6347[1] { PropertyDescriptorImpl@6348['cursor'] } // through LazyJavaClassMemberScope@5365
-    properties('defaultCloseOperation': Name@1149) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('descendantsCount': Name@1150) = ArrayList@6349[1] { PropertyDescriptorImpl@6350['descendantsCount'] } // through LazyJavaClassMemberScope@5365
-    properties('dispatcher': Name@1151) = ArrayList@6351[1] { PropertyDescriptorImpl@6352['dispatcher'] } // through LazyJavaClassMemberScope@5365
-    properties('disposing': Name@1152) = ArrayList@6353[1] { JavaPropertyDescriptor@6354['disposing'] } // through LazyJavaClassMemberScope@5365
-    properties('dropTarget': Name@1153) = ArrayList@6355[1] { PropertyDescriptorImpl@6356['dropTarget'] } // through LazyJavaClassMemberScope@5365
-    properties('enabled': Name@1156) = ArrayList@6357[1] { PropertyDescriptorImpl@6358['enabled'] } // through LazyJavaClassMemberScope@5365
-    properties('eventCache': Name@1159) = ArrayList@6359[1] { PropertyDescriptorImpl@6360['eventCache'] } // through LazyJavaClassMemberScope@5365
-    properties('eventMask': Name@1162) = ArrayList@6361[1] { PropertyDescriptorImpl@6362['eventMask'] } // through LazyJavaClassMemberScope@5365
-    properties('focusCycleRoot': Name@1165) = ArrayList@6363[1] { PropertyDescriptorImpl@6364['focusCycleRoot'] } // through LazyJavaClassMemberScope@5365
-    properties('focusListener': Name@1166) = ArrayList@6365[1] { PropertyDescriptorImpl@6366['focusListener'] } // through LazyJavaClassMemberScope@5365
-    properties('focusMgr': Name@1169) = ArrayList@6367[1] { JavaPropertyDescriptor@6368['focusMgr'] } // through LazyJavaClassMemberScope@5365
-    properties('focusTraversalKeys': Name@1170) = ArrayList@6369[1] { PropertyDescriptorImpl@6370['focusTraversalKeys'] } // through LazyJavaClassMemberScope@5365
-    properties('focusTraversalKeysEnabled': Name@1173) = ArrayList@6371[1] { PropertyDescriptorImpl@6372['focusTraversalKeysEnabled'] } // through LazyJavaClassMemberScope@5365
-    properties('focusTraversalPolicy': Name@1176) = ArrayList@6373[1] { PropertyDescriptorImpl@6374['focusTraversalPolicy'] } // through LazyJavaClassMemberScope@5365
-    properties('focusTraversalPolicyProvider': Name@1177) = ArrayList@6375[1] { PropertyDescriptorImpl@6376['focusTraversalPolicyProvider'] } // through LazyJavaClassMemberScope@5365
-    properties('focusable': Name@1178) = ArrayList@6377[1] { PropertyDescriptorImpl@6378['focusable'] } // through LazyJavaClassMemberScope@5365
-    properties('focusableWindowState': Name@1181) = ArrayList@6379[1] { JavaPropertyDescriptor@6380['focusableWindowState'] } // through LazyJavaClassMemberScope@5365
-    properties('font': Name@1182) = ArrayList@6381[1] { PropertyDescriptorImpl@6382['font'] } // through LazyJavaClassMemberScope@5365
-    properties('foreground': Name@1185) = ArrayList@6383[1] { PropertyDescriptorImpl@6384['foreground'] } // through LazyJavaClassMemberScope@5365
-    properties('frameSerializedDataVersion': Name@1188) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('graphicsConfig': Name@1189) = ArrayList@6385[1] { PropertyDescriptorImpl@6386['graphicsConfig'] } // through LazyJavaClassMemberScope@5365
-    properties('height': Name@1192) = ArrayList@6387[1] { PropertyDescriptorImpl@6388['height'] } // through LazyJavaClassMemberScope@5365
-    properties('hierarchyBoundsListener': Name@1195) = ArrayList@6389[1] { PropertyDescriptorImpl@6390['hierarchyBoundsListener'] } // through LazyJavaClassMemberScope@5365
-    properties('hierarchyListener': Name@1198) = ArrayList@6391[1] { PropertyDescriptorImpl@6392['hierarchyListener'] } // through LazyJavaClassMemberScope@5365
-    properties('icons': Name@1201) = ArrayList@6393[1] { JavaPropertyDescriptor@6394['icons'] } // through LazyJavaClassMemberScope@5365
-    properties('ignoreRepaint': Name@1202) = ArrayList@6395[1] { PropertyDescriptorImpl@6396['ignoreRepaint'] } // through LazyJavaClassMemberScope@5365
-    properties('inputContext': Name@1205) = ArrayList@6397[1] { JavaPropertyDescriptor@6398['inputContext'] } // through LazyJavaClassMemberScope@5365
-    properties('inputContextLock': Name@1206) = ArrayList@6399[1] { JavaPropertyDescriptor@6400['inputContextLock'] } // through LazyJavaClassMemberScope@5365
-    properties('inputMethodListener': Name@1207) = ArrayList@6401[1] { PropertyDescriptorImpl@6402['inputMethodListener'] } // through LazyJavaClassMemberScope@5365
-    properties('isAddNotifyComplete': Name@1210) = ArrayList@6403[1] { PropertyDescriptorImpl@6404['isAddNotifyComplete'] } // through LazyJavaClassMemberScope@5365
-    properties('isFocusTraversableOverridden': Name@1213) = ArrayList@6405[1] { PropertyDescriptorImpl@6406['isFocusTraversableOverridden'] } // through LazyJavaClassMemberScope@5365
-    properties('isInShow': Name@1216) = ArrayList@6407[1] { JavaPropertyDescriptor@6408['isInShow'] } // through LazyJavaClassMemberScope@5365
-    properties('isPacked': Name@1217) = ArrayList@6409[1] { PropertyDescriptorImpl@6410['isPacked'] } // through LazyJavaClassMemberScope@5365
-    properties('isTrayIconWindow': Name@1220) = ArrayList@6411[1] { JavaPropertyDescriptor@6412['isTrayIconWindow'] } // through LazyJavaClassMemberScope@5365
-    properties('keyListener': Name@1221) = ArrayList@6413[1] { PropertyDescriptorImpl@6414['keyListener'] } // through LazyJavaClassMemberScope@5365
-    properties('layoutMgr': Name@1224) = ArrayList@6415[1] { PropertyDescriptorImpl@6416['layoutMgr'] } // through LazyJavaClassMemberScope@5365
-    properties('listeningBoundsChildren': Name@1225) = ArrayList@6417[1] { PropertyDescriptorImpl@6418['listeningBoundsChildren'] } // through LazyJavaClassMemberScope@5365
-    properties('listeningChildren': Name@1226) = ArrayList@6419[1] { PropertyDescriptorImpl@6420['listeningChildren'] } // through LazyJavaClassMemberScope@5365
-    properties('locale': Name@1227) = ArrayList@6421[1] { PropertyDescriptorImpl@6422['locale'] } // through LazyJavaClassMemberScope@5365
-    properties('locationByPlatform': Name@1230) = ArrayList@6423[1] { JavaPropertyDescriptor@6424['locationByPlatform'] } // through LazyJavaClassMemberScope@5365
-    properties('maxSize': Name@1231) = ArrayList@6425[1] { PropertyDescriptorImpl@6426['maxSize'] } // through LazyJavaClassMemberScope@5365
-    properties('maxSizeSet': Name@1234) = ArrayList@6427[1] { PropertyDescriptorImpl@6428['maxSizeSet'] } // through LazyJavaClassMemberScope@5365
-    properties('maximizedBounds': Name@1237) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('mbManagement': Name@1238) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('menuBar': Name@1239) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('minSize': Name@1240) = ArrayList@6429[1] { PropertyDescriptorImpl@6430['minSize'] } // through LazyJavaClassMemberScope@5365
-    properties('minSizeSet': Name@1243) = ArrayList@6431[1] { PropertyDescriptorImpl@6432['minSizeSet'] } // through LazyJavaClassMemberScope@5365
-    properties('mixingCutoutRegion': Name@1246) = ArrayList@6433[1] { PropertyDescriptorImpl@6434['mixingCutoutRegion'] } // through LazyJavaClassMemberScope@5365
-    properties('modalAppContext': Name@1249) = ArrayList@6435[1] { PropertyDescriptorImpl@6436['modalAppContext'] } // through LazyJavaClassMemberScope@5365
-    properties('modalBlocker': Name@1250) = ArrayList@6437[1] { JavaPropertyDescriptor@6438['modalBlocker'] } // through LazyJavaClassMemberScope@5365
-    properties('modalComp': Name@1251) = ArrayList@6439[1] { PropertyDescriptorImpl@6440['modalComp'] } // through LazyJavaClassMemberScope@5365
-    properties('modalExclusionType': Name@1252) = ArrayList@6441[1] { JavaPropertyDescriptor@6442['modalExclusionType'] } // through LazyJavaClassMemberScope@5365
-    properties('mouseListener': Name@1253) = ArrayList@6443[1] { PropertyDescriptorImpl@6444['mouseListener'] } // through LazyJavaClassMemberScope@5365
-    properties('mouseMotionListener': Name@1256) = ArrayList@6445[1] { PropertyDescriptorImpl@6446['mouseMotionListener'] } // through LazyJavaClassMemberScope@5365
-    properties('mouseWheelListener': Name@1259) = ArrayList@6447[1] { PropertyDescriptorImpl@6448['mouseWheelListener'] } // through LazyJavaClassMemberScope@5365
-    properties('name': Name@1262) = ArrayList@6449[1] { PropertyDescriptorImpl@6450['name'] } // through LazyJavaClassMemberScope@5365
-    properties('nameExplicitlySet': Name@1265) = ArrayList@6451[1] { PropertyDescriptorImpl@6452['nameExplicitlySet'] } // through LazyJavaClassMemberScope@5365
-    properties('newEventsOnly': Name@1268) = ArrayList@6453[1] { PropertyDescriptorImpl@6454['newEventsOnly'] } // through LazyJavaClassMemberScope@5365
-    properties('numOfHWComponents': Name@1271) = ArrayList@6455[1] { PropertyDescriptorImpl@6456['numOfHWComponents'] } // through LazyJavaClassMemberScope@5365
-    properties('numOfLWComponents': Name@1272) = ArrayList@6457[1] { PropertyDescriptorImpl@6458['numOfLWComponents'] } // through LazyJavaClassMemberScope@5365
-    properties('objectLock': Name@1273) = ArrayList@6459[1] { PropertyDescriptorImpl@6460['objectLock'] } // through LazyJavaClassMemberScope@5365
-    properties('opacity': Name@1276) = ArrayList@6461[1] { JavaPropertyDescriptor@6462['opacity'] } // through LazyJavaClassMemberScope@5365
-    properties('ownedWindowList': Name@1277) = ArrayList@6463[1] { JavaPropertyDescriptor@6464['ownedWindowList'] } // through LazyJavaClassMemberScope@5365
-    properties('ownedWindows': Name@1278) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('parent': Name@1279) = ArrayList@6465[1] { PropertyDescriptorImpl@6466['parent'] } // through LazyJavaClassMemberScope@5365
-    properties('peer': Name@1282) = ArrayList@6467[1] { PropertyDescriptorImpl@6468['peer'] } // through LazyJavaClassMemberScope@5365
-    properties('peerFont': Name@1285) = ArrayList@6469[1] { PropertyDescriptorImpl@6470['peerFont'] } // through LazyJavaClassMemberScope@5365
-    properties('popups': Name@1288) = ArrayList@6471[1] { PropertyDescriptorImpl@6472['popups'] } // through LazyJavaClassMemberScope@5365
-    properties('prefSize': Name@1291) = ArrayList@6473[1] { PropertyDescriptorImpl@6474['prefSize'] } // through LazyJavaClassMemberScope@5365
-    properties('prefSizeSet': Name@1294) = ArrayList@6475[1] { PropertyDescriptorImpl@6476['prefSizeSet'] } // through LazyJavaClassMemberScope@5365
-    properties('preserveBackgroundColor': Name@1297) = ArrayList@6477[1] { PropertyDescriptorImpl@6478['preserveBackgroundColor'] } // through LazyJavaClassMemberScope@5365
-    properties('printing': Name@1298) = ArrayList@6479[1] { PropertyDescriptorImpl@6480['printing'] } // through LazyJavaClassMemberScope@5365
-    properties('printingThreads': Name@1299) = ArrayList@6481[1] { PropertyDescriptorImpl@6482['printingThreads'] } // through LazyJavaClassMemberScope@5365
-    properties('resizable': Name@1300) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('rootPane': Name@1301) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('rootPaneCheckingEnabled': Name@1302) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('securityWarningAlignmentX': Name@1303) = ArrayList@6483[1] { JavaPropertyDescriptor@6484['securityWarningAlignmentX'] } // through LazyJavaClassMemberScope@5365
-    properties('securityWarningAlignmentY': Name@1304) = ArrayList@6485[1] { JavaPropertyDescriptor@6486['securityWarningAlignmentY'] } // through LazyJavaClassMemberScope@5365
-    properties('securityWarningHeight': Name@1305) = ArrayList@6487[1] { JavaPropertyDescriptor@6488['securityWarningHeight'] } // through LazyJavaClassMemberScope@5365
-    properties('securityWarningPointX': Name@1306) = ArrayList@6489[1] { JavaPropertyDescriptor@6490['securityWarningPointX'] } // through LazyJavaClassMemberScope@5365
-    properties('securityWarningPointY': Name@1307) = ArrayList@6491[1] { JavaPropertyDescriptor@6492['securityWarningPointY'] } // through LazyJavaClassMemberScope@5365
-    properties('securityWarningWidth': Name@1308) = ArrayList@6493[1] { JavaPropertyDescriptor@6494['securityWarningWidth'] } // through LazyJavaClassMemberScope@5365
-    properties('shape': Name@1309) = ArrayList@6495[1] { JavaPropertyDescriptor@6496['shape'] } // through LazyJavaClassMemberScope@5365
-    properties('showWithParent': Name@1310) = ArrayList@6497[1] { JavaPropertyDescriptor@6498['showWithParent'] } // through LazyJavaClassMemberScope@5365
-    properties('state': Name@1311) = ArrayList@6499[1] { JavaPropertyDescriptor@6500['state'] } // through LazyJavaClassMemberScope@5365
-    properties('syncLWRequests': Name@1312) = ArrayList@6501[1] { JavaPropertyDescriptor@6502['syncLWRequests'] } // through LazyJavaClassMemberScope@5365
-    properties('temporaryLostComponent': Name@1313) = ArrayList@6503[1] { JavaPropertyDescriptor@6504['temporaryLostComponent'] } // through LazyJavaClassMemberScope@5365
-    properties('title': Name@1314) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('transferHandler': Name@1315) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('type': Name@1316) = ArrayList@6505[1] { JavaPropertyDescriptor@6506['type'] } // through LazyJavaClassMemberScope@5365
-    properties('undecorated': Name@1317) = EmptyList@9[empty] // through LazyJavaClassMemberScope@5365
-    properties('valid': Name@1318) = ArrayList@6507[1] { PropertyDescriptorImpl@6508['valid'] } // through LazyJavaClassMemberScope@5365
-    properties('visible': Name@1321) = ArrayList@6509[1] { PropertyDescriptorImpl@6510['visible'] } // through LazyJavaClassMemberScope@5365
-    properties('warningString': Name@1324) = ArrayList@6511[1] { JavaPropertyDescriptor@6512['warningString'] } // through LazyJavaClassMemberScope@5365
-    properties('weakThis': Name@1325) = ArrayList@6513[1] { JavaPropertyDescriptor@6514['weakThis'] } // through LazyJavaClassMemberScope@5365
-    properties('width': Name@1326) = ArrayList@6515[1] { PropertyDescriptorImpl@6516['width'] } // through LazyJavaClassMemberScope@5365
-    properties('windowClosingException': Name@1329) = ArrayList@6517[1] { PropertyDescriptorImpl@6518['windowClosingException'] } // through LazyJavaClassMemberScope@5365
-    properties('windowFocusListener': Name@1332) = ArrayList@6519[1] { JavaPropertyDescriptor@6520['windowFocusListener'] } // through LazyJavaClassMemberScope@5365
-    properties('windowListener': Name@1333) = ArrayList@6521[1] { JavaPropertyDescriptor@6522['windowListener'] } // through LazyJavaClassMemberScope@5365
-    properties('windowSerializedDataVersion': Name@1334) = ArrayList@6523[1] { JavaPropertyDescriptor@6524['windowSerializedDataVersion'] } // through LazyJavaClassMemberScope@5365
-    properties('windowStateListener': Name@1335) = ArrayList@6525[1] { JavaPropertyDescriptor@6526['windowStateListener'] } // through LazyJavaClassMemberScope@5365
-    properties('x': Name@1336) = ArrayList@6527[1] { PropertyDescriptorImpl@6528['x'] } // through LazyJavaClassMemberScope@5365
-    properties('y': Name@1339) = ArrayList@6529[1] { PropertyDescriptorImpl@6530['y'] } // through LazyJavaClassMemberScope@5365
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@6531['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassTypeConstructor@1['AWTKeyStroke'] {
-    parameters = ArrayList@6533[empty]
-}
-
-LazyJavaClassTypeConstructor@3['BaselineResizeBehavior'] {
-    parameters = ArrayList@6534[empty]
-}
-
-LazyJavaClassTypeConstructor@5['Class'] {
-    parameters = ArrayList@6535[1] { LazyJavaTypeParameterDescriptor@6536['T'] }
-}
-
-LazyJavaClassTypeConstructor@1343['Component'] {
-    parameters = ArrayList@6537[empty]
-    supertypes = ArrayList@6538[1] { LazyJavaClassifierType@6539['Serializable'] }
-}
-
-LazyJavaClassTypeConstructor@2408['Container'] {
-    parameters = ArrayList@6540[empty]
-    supertypes = ArrayList@6541[1] { LazyJavaClassifierType@6542['Component'] }
-}
-
-LazyJavaClassTypeConstructor@2410['Dimension'] {
-    parameters = ArrayList@6543[empty]
-}
-
-LazyJavaClassTypeConstructor@2412['EventListener'] {
-    parameters = ArrayList@6544[empty]
-}
-
-LazyJavaClassTypeConstructor@2415['EventTargetFilter'] {
-    parameters = ArrayList@6545[empty]
-    supertypes = ArrayList@6546[1] { JetTypeImpl@6547['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3769['Frame'] {
-    parameters = ArrayList@6548[empty]
-    supertypes = ArrayList@6549[1] { LazyJavaClassifierType@6550['Window'] }
-}
-
-LazyJavaClassTypeConstructor@5055['JFrame'] {
-    parameters = ArrayList@6551[empty]
-    supertypes = ArrayList@6552[1] { LazyJavaClassifierType@6553['Frame'] }
-}
-
-LazyJavaClassTypeConstructor@5057['Locale'] {
-    parameters = ArrayList@6554[empty]
-}
-
-LazyJavaClassTypeConstructor@5059['ObjectInputStream'] {
-    parameters = ArrayList@6555[empty]
-}
-
-LazyJavaClassTypeConstructor@5061['ObjectOutputStream'] {
-    parameters = ArrayList@6556[empty]
-}
-
-LazyJavaClassTypeConstructor@5063['PrintStream'] {
-    parameters = ArrayList@6557[empty]
-}
-
-LazyJavaClassTypeConstructor@5065['RuntimeException'] {
-    parameters = ArrayList@6558[empty]
-}
-
-LazyJavaClassTypeConstructor@5360['Serializable'] {
-    parameters = ArrayList@6559[empty]
-    supertypes = ArrayList@6560[1] { JetTypeImpl@6547['Any'] }
-}
-
-LazyJavaClassTypeConstructor@5362['Type'] {
-    parameters = ArrayList@6561[empty]
-}
-
-LazyJavaClassTypeConstructor@6532['Window'] {
-    parameters = ArrayList@6562[empty]
-    supertypes = ArrayList@6563[1] { LazyJavaClassifierType@6564['Container'] }
-}
-
-LazyJavaClassifierType@6565['AWTEvent'] {
-    arguments = ArrayList@6566[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6568
-}
-
-LazyJavaClassifierType@6569['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6570
-}
-
-LazyJavaClassifierType@6571['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6572
-}
-
-LazyJavaClassifierType@6573['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6574
-}
-
-LazyJavaClassifierType@6575['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6576
-}
-
-LazyJavaClassifierType@6577['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6578
-}
-
-LazyJavaClassifierType@6579['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6580
-}
-
-LazyJavaClassifierType@6581['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6582
-}
-
-LazyJavaClassifierType@6583['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6584
-}
-
-LazyJavaClassifierType@6585['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6586
-}
-
-LazyJavaClassifierType@6587['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6588
-}
-
-LazyJavaClassifierType@6589['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6590
-}
-
-LazyJavaClassifierType@6591['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6592
-}
-
-LazyJavaClassifierType@6593['AWTEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6594
-}
-
-LazyJavaClassifierType@6595['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6597['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6598['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6599['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6600['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6601['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6602['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6603['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6604['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6605['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6606['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6607['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6608['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6609['AWTEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6610['AWTKeyStroke'] {
-    arguments = ArrayList@6611[empty]
-    classifier = JavaClassImpl@6612['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6613['AWTKeyStroke'] {
-    arguments = ArrayList@6614[empty]
-    classifier = JavaClassImpl@6615['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6616['AWTKeyStroke'] {
-    arguments = ArrayList@6617[empty]
-    classifier = JavaClassImpl@6618['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6619['AWTKeyStroke'] {
-    arguments = ArrayList@6620[empty]
-    classifier = JavaClassImpl@6621['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6622['AWTKeyStroke'] {
-    arguments = ArrayList@6623[empty]
-    classifier = JavaClassImpl@6624['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6625['AWTKeyStroke'] {
-    arguments = ArrayList@6626[empty]
-    classifier = JavaClassImpl@6627['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6628['AWTKeyStroke'] {
-    arguments = ArrayList@6629[empty]
-    classifier = JavaClassImpl@6630['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6631['AWTKeyStroke'] {
-    arguments = ArrayList@6632[empty]
-    classifier = JavaClassImpl@6633['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6634['AWTKeyStroke'] {
-    arguments = ArrayList@6635[empty]
-    classifier = JavaClassImpl@6636['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6637['AWTKeyStroke'] {
-    arguments = ArrayList@6638[empty]
-    classifier = JavaClassImpl@6639['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6640['AWTKeyStroke'] {
-    arguments = ArrayList@6641[empty]
-    classifier = JavaClassImpl@6642['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6643['AWTKeyStroke'] {
-    arguments = ArrayList@6644[empty]
-    classifier = JavaClassImpl@6645['AWTKeyStroke']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6646['AWTKeyStroke'] {
-    arguments = ArrayList@6647[empty]
-    classifier = JavaClassImpl@6627['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6648['AWTKeyStroke'] {
-    arguments = ArrayList@6649[empty]
-    classifier = JavaClassImpl@6621['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6650['AWTKeyStroke'] {
-    arguments = ArrayList@6651[empty]
-    classifier = JavaClassImpl@6618['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6652['AWTKeyStroke'] {
-    arguments = ArrayList@6653[empty]
-    classifier = JavaClassImpl@6612['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6654['AWTKeyStroke'] {
-    arguments = ArrayList@6655[empty]
-    classifier = JavaClassImpl@6642['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6656['AWTKeyStroke'] {
-    arguments = ArrayList@6657[empty]
-    classifier = JavaClassImpl@6630['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6658['AWTKeyStroke'] {
-    arguments = ArrayList@6659[empty]
-    classifier = JavaClassImpl@6633['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6660['AWTKeyStroke'] {
-    arguments = ArrayList@6661[empty]
-    classifier = JavaClassImpl@6645['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6662['AWTKeyStroke'] {
-    arguments = ArrayList@6663[empty]
-    classifier = JavaClassImpl@6624['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6664['AWTKeyStroke'] {
-    arguments = ArrayList@6665[empty]
-    classifier = JavaClassImpl@6615['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6666['AWTKeyStroke'] {
-    arguments = ArrayList@6667[empty]
-    classifier = JavaClassImpl@6636['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6668['AWTKeyStroke'] {
-    arguments = ArrayList@6669[empty]
-    classifier = JavaClassImpl@6639['AWTKeyStroke']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
-}
-
-LazyJavaClassifierType@6670['AccessControlContext'] {
-    arguments = ArrayList@6671[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6672
-}
-
-LazyJavaClassifierType@6673['AccessControlContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6674
-}
-
-LazyJavaClassifierType@6675['AccessControlContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6676['AccessControlContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6677['Accessible'] {
-    arguments = ArrayList@6678[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6679
-}
-
-LazyJavaClassifierType@6680['Accessible'] {
-    arguments = ArrayList@6681[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6682
-}
-
-LazyJavaClassifierType@6683['Accessible'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@6684
-}
-
-LazyJavaClassifierType@6685['Accessible'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@6686
-}
-
-LazyJavaClassifierType@6687['Accessible'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6688['Accessible'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6689['AccessibleContext'] {
-    arguments = ArrayList@6690[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6691
-}
-
-LazyJavaClassifierType@6692['AccessibleContext'] {
-    arguments = ArrayList@6693[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6694
-}
-
-LazyJavaClassifierType@6695['AccessibleContext'] {
-    arguments = ArrayList@6696[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6697
-}
-
-LazyJavaClassifierType@6698['AccessibleContext'] {
-    arguments = ArrayList@6699[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6700
-}
-
-LazyJavaClassifierType@6701['AccessibleContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6702
-}
-
-LazyJavaClassifierType@6703['AccessibleContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6704
-}
-
-LazyJavaClassifierType@6705['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6706['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6707['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6708['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6709['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6710['AccessibleContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6711['AccessibleStateSet'] {
-    arguments = ArrayList@6712[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6713
-}
-
-LazyJavaClassifierType@6714['AccessibleStateSet'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6715['AppContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6716
-}
-
-LazyJavaClassifierType@6717['AppContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6718
-}
-
-LazyJavaClassifierType@6719['AppContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6720['AppContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6721['BaselineResizeBehavior'] {
-    arguments = ArrayList@6722[empty]
-    classifier = JavaClassImpl@6723['BaselineResizeBehavior']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@3['BaselineResizeBehavior']
-}
-
-LazyJavaClassifierType@6724['BaselineResizeBehavior'] {
-    arguments = ArrayList@6725[empty]
-    classifier = JavaClassImpl@6723['BaselineResizeBehavior']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@3['BaselineResizeBehavior']
-}
-
-LazyJavaClassifierType@6726['BufferCapabilities'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6727
-}
-
-LazyJavaClassifierType@6728['BufferCapabilities'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6729
-}
-
-LazyJavaClassifierType@6730['BufferCapabilities'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6731['BufferCapabilities'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6732['BufferStrategy'] {
-    arguments = ArrayList@6733[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6734
-}
-
-LazyJavaClassifierType@6735['BufferStrategy'] {
-    arguments = ArrayList@6736[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6737
-}
-
-LazyJavaClassifierType@6738['BufferStrategy'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6739
-}
-
-LazyJavaClassifierType@6740['BufferStrategy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6741['BufferStrategy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6742['BufferStrategy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6743['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6744
-}
-
-LazyJavaClassifierType@6745['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6746
-}
-
-LazyJavaClassifierType@6747['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6748
-}
-
-LazyJavaClassifierType@6749['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6750
-}
-
-LazyJavaClassifierType@6751['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6752
-}
-
-LazyJavaClassifierType@6753['Cause'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6754
-}
-
-LazyJavaClassifierType@6755['Cause'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@6756
-}
-
-LazyJavaClassifierType@6757['Cause'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@6758
-}
-
-LazyJavaClassifierType@6759['Cause'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6760['Cause'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6761['Cause'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6762['Cause'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6763['Class<T>'] {
-    arguments = ArrayList@6764[1] { TypeProjectionImpl@6765 }
-    classifier = JavaClassImpl@6766['Class']
-    memberScope = SubstitutingScope@6767
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6768['Class<T>'] {
-    arguments = ArrayList@6769[1] { TypeProjectionImpl@6770 }
-    classifier = JavaClassImpl@6766['Class']
-    memberScope = SubstitutingScope@6771
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6772['Class<T>'] {
-    arguments = ArrayList@6773[1] { TypeProjectionImpl@6774 }
-    classifier = JavaClassImpl@6775['Class']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6776['Class<T>'] {
-    arguments = ArrayList@6777[1] { TypeProjectionImpl@6778 }
-    classifier = JavaClassImpl@6779['Class']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6780['Class<T>'] {
-    arguments = ArrayList@6781[1] { TypeProjectionImpl@6782 }
-    classifier = JavaClassImpl@6775['Class']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6783['Class<T>'] {
-    arguments = ArrayList@6784[1] { TypeProjectionImpl@6785 }
-    classifier = JavaClassImpl@6779['Class']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5['Class']
-}
-
-LazyJavaClassifierType@6786['Color'] {
-    arguments = ArrayList@6787[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6788
-}
-
-LazyJavaClassifierType@6789['Color'] {
-    arguments = ArrayList@6790[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6791
-}
-
-LazyJavaClassifierType@6792['Color'] {
-    arguments = ArrayList@6793[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6794
-}
-
-LazyJavaClassifierType@6795['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6796
-}
-
-LazyJavaClassifierType@6797['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6798
-}
-
-LazyJavaClassifierType@6799['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6800
-}
-
-LazyJavaClassifierType@6801['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6802
-}
-
-LazyJavaClassifierType@6803['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6804
-}
-
-LazyJavaClassifierType@6805['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6806
-}
-
-LazyJavaClassifierType@6807['Color'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6808
-}
-
-LazyJavaClassifierType@6809['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6810['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6811['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6812['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6813['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6814['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6815['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6816['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6817['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6818['Color'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6819['ColorModel'] {
-    arguments = ArrayList@6820[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@6821
-}
-
-LazyJavaClassifierType@6822['ColorModel'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6542['Component'] {
-    arguments = ArrayList@6823[empty]
-    classifier = JavaClassImpl@6824['Component']
-    memberScope = LazyJavaClassMemberScope@10
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6825['Component'] {
-    arguments = ArrayList@6826[empty]
-    classifier = JavaClassImpl@6827['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6828['Component'] {
-    arguments = ArrayList@6829[empty]
-    classifier = JavaClassImpl@6830['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6831['Component'] {
-    arguments = ArrayList@6832[empty]
-    classifier = JavaClassImpl@6833['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6834['Component'] {
-    arguments = ArrayList@6835[empty]
-    classifier = JavaClassImpl@6836['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6837['Component'] {
-    arguments = ArrayList@6838[empty]
-    classifier = JavaClassImpl@6839['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6840['Component'] {
-    arguments = ArrayList@6841[empty]
-    classifier = JavaClassImpl@6842['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6843['Component'] {
-    arguments = ArrayList@6844[empty]
-    classifier = JavaClassImpl@6845['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6846['Component'] {
-    arguments = ArrayList@6847[empty]
-    classifier = JavaClassImpl@6848['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6849['Component'] {
-    arguments = ArrayList@6850[empty]
-    classifier = JavaClassImpl@6851['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6852['Component'] {
-    arguments = ArrayList@6853[empty]
-    classifier = JavaClassImpl@6854['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6855['Component'] {
-    arguments = ArrayList@6856[empty]
-    classifier = JavaClassImpl@6857['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6858['Component'] {
-    arguments = ArrayList@6859[empty]
-    classifier = JavaClassImpl@6860['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6861['Component'] {
-    arguments = ArrayList@6862[empty]
-    classifier = JavaClassImpl@6863['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6864['Component'] {
-    arguments = ArrayList@6865[empty]
-    classifier = JavaClassImpl@6866['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6867['Component'] {
-    arguments = ArrayList@6868[empty]
-    classifier = JavaClassImpl@6869['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6870['Component'] {
-    arguments = ArrayList@6871[empty]
-    classifier = JavaClassImpl@6872['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6873['Component'] {
-    arguments = ArrayList@6874[empty]
-    classifier = JavaClassImpl@6875['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6876['Component'] {
-    arguments = ArrayList@6877[empty]
-    classifier = JavaClassImpl@6878['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6879['Component'] {
-    arguments = ArrayList@6880[empty]
-    classifier = JavaClassImpl@6881['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6882['Component'] {
-    arguments = ArrayList@6883[empty]
-    classifier = JavaClassImpl@6884['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6885['Component'] {
-    arguments = ArrayList@6886[empty]
-    classifier = JavaClassImpl@6887['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6888['Component'] {
-    arguments = ArrayList@6889[empty]
-    classifier = JavaClassImpl@6890['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6891['Component'] {
-    arguments = ArrayList@6892[empty]
-    classifier = JavaClassImpl@6893['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6894['Component'] {
-    arguments = ArrayList@6895[empty]
-    classifier = JavaClassImpl@6896['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6897['Component'] {
-    arguments = ArrayList@6898[empty]
-    classifier = JavaClassImpl@6899['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6900['Component'] {
-    arguments = ArrayList@6901[empty]
-    classifier = JavaClassImpl@6902['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6903['Component'] {
-    arguments = ArrayList@6904[empty]
-    classifier = JavaClassImpl@6905['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6906['Component'] {
-    arguments = ArrayList@6907[empty]
-    classifier = JavaClassImpl@6908['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6909['Component'] {
-    arguments = ArrayList@6910[empty]
-    classifier = JavaClassImpl@6911['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6912['Component'] {
-    arguments = ArrayList@6913[empty]
-    classifier = JavaClassImpl@6914['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6915['Component'] {
-    arguments = ArrayList@6916[empty]
-    classifier = JavaClassImpl@6917['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6918['Component'] {
-    arguments = ArrayList@6919[empty]
-    classifier = JavaClassImpl@6920['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6921['Component'] {
-    arguments = ArrayList@6922[empty]
-    classifier = JavaClassImpl@6923['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6924['Component'] {
-    arguments = ArrayList@6925[empty]
-    classifier = JavaClassImpl@6926['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6927['Component'] {
-    arguments = ArrayList@6928[empty]
-    classifier = JavaClassImpl@6929['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6930['Component'] {
-    arguments = ArrayList@6931[empty]
-    classifier = JavaClassImpl@6932['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6933['Component'] {
-    arguments = ArrayList@6934[empty]
-    classifier = JavaClassImpl@6935['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6936['Component'] {
-    arguments = ArrayList@6937[empty]
-    classifier = JavaClassImpl@6938['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6939['Component'] {
-    arguments = ArrayList@6940[empty]
-    classifier = JavaClassImpl@6941['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6942['Component'] {
-    arguments = ArrayList@6943[empty]
-    classifier = JavaClassImpl@6944['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6945['Component'] {
-    arguments = ArrayList@6946[empty]
-    classifier = JavaClassImpl@6947['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6948['Component'] {
-    arguments = ArrayList@6949[empty]
-    classifier = JavaClassImpl@6950['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6951['Component'] {
-    arguments = ArrayList@6952[empty]
-    classifier = JavaClassImpl@6953['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6954['Component'] {
-    arguments = ArrayList@6955[empty]
-    classifier = JavaClassImpl@6956['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6957['Component'] {
-    arguments = ArrayList@6958[empty]
-    classifier = JavaClassImpl@6959['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6960['Component'] {
-    arguments = ArrayList@6961[empty]
-    classifier = JavaClassImpl@6962['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6963['Component'] {
-    arguments = ArrayList@6964[empty]
-    classifier = JavaClassImpl@6965['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6966['Component'] {
-    arguments = ArrayList@6967[empty]
-    classifier = JavaClassImpl@6968['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6969['Component'] {
-    arguments = ArrayList@6970[empty]
-    classifier = JavaClassImpl@6971['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6972['Component'] {
-    arguments = ArrayList@6973[empty]
-    classifier = JavaClassImpl@6974['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6975['Component'] {
-    arguments = ArrayList@6976[empty]
-    classifier = JavaClassImpl@6977['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6978['Component'] {
-    arguments = ArrayList@6979[empty]
-    classifier = JavaClassImpl@6980['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6981['Component'] {
-    arguments = ArrayList@6982[empty]
-    classifier = JavaClassImpl@6983['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6984['Component'] {
-    arguments = ArrayList@6985[empty]
-    classifier = JavaClassImpl@6986['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6987['Component'] {
-    arguments = ArrayList@6988[empty]
-    classifier = JavaClassImpl@6989['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6990['Component'] {
-    arguments = ArrayList@6991[empty]
-    classifier = JavaClassImpl@6992['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6993['Component'] {
-    arguments = ArrayList@6994[empty]
-    classifier = JavaClassImpl@6995['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6996['Component'] {
-    arguments = ArrayList@6997[empty]
-    classifier = JavaClassImpl@6998['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@6999['Component'] {
-    arguments = ArrayList@7000[empty]
-    classifier = JavaClassImpl@7001['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7002['Component'] {
-    arguments = ArrayList@7003[empty]
-    classifier = JavaClassImpl@7004['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7005['Component'] {
-    arguments = ArrayList@7006[empty]
-    classifier = JavaClassImpl@7007['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7008['Component'] {
-    arguments = ArrayList@7009[empty]
-    classifier = JavaClassImpl@7010['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7011['Component'] {
-    arguments = ArrayList@7012[empty]
-    classifier = JavaClassImpl@7013['Component']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7014['Component'] {
-    arguments = ArrayList@7015[empty]
-    classifier = JavaClassImpl@6851['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7016['Component'] {
-    arguments = ArrayList@7017[empty]
-    classifier = JavaClassImpl@6947['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7018['Component'] {
-    arguments = ArrayList@7019[empty]
-    classifier = JavaClassImpl@6830['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7020['Component'] {
-    arguments = ArrayList@7021[empty]
-    classifier = JavaClassImpl@6917['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7022['Component'] {
-    arguments = ArrayList@7023[empty]
-    classifier = JavaClassImpl@6884['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7024['Component'] {
-    arguments = ArrayList@7025[empty]
-    classifier = JavaClassImpl@6920['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7026['Component'] {
-    arguments = ArrayList@7027[empty]
-    classifier = JavaClassImpl@6866['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7028['Component'] {
-    arguments = ArrayList@7029[empty]
-    classifier = JavaClassImpl@6887['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7030['Component'] {
-    arguments = ArrayList@7031[empty]
-    classifier = JavaClassImpl@6986['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7032['Component'] {
-    arguments = ArrayList@7033[empty]
-    classifier = JavaClassImpl@6893['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7034['Component'] {
-    arguments = ArrayList@7035[empty]
-    classifier = JavaClassImpl@6905['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7036['Component'] {
-    arguments = ArrayList@7037[empty]
-    classifier = JavaClassImpl@6959['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7038['Component'] {
-    arguments = ArrayList@7039[empty]
-    classifier = JavaClassImpl@6926['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7040['Component'] {
-    arguments = ArrayList@7041[empty]
-    classifier = JavaClassImpl@6950['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7042['Component'] {
-    arguments = ArrayList@7043[empty]
-    classifier = JavaClassImpl@6923['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7044['Component'] {
-    arguments = ArrayList@7045[empty]
-    classifier = JavaClassImpl@6896['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7046['Component'] {
-    arguments = ArrayList@7047[empty]
-    classifier = JavaClassImpl@6974['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7048['Component'] {
-    arguments = ArrayList@7049[empty]
-    classifier = JavaClassImpl@6929['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7050['Component'] {
-    arguments = ArrayList@7051[empty]
-    classifier = JavaClassImpl@6965['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7052['Component'] {
-    arguments = ArrayList@7053[empty]
-    classifier = JavaClassImpl@7001['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7054['Component'] {
-    arguments = ArrayList@7055[empty]
-    classifier = JavaClassImpl@6845['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7056['Component'] {
-    arguments = ArrayList@7057[empty]
-    classifier = JavaClassImpl@6992['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7058['Component'] {
-    arguments = ArrayList@7059[empty]
-    classifier = JavaClassImpl@6854['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7060['Component'] {
-    arguments = ArrayList@7061[empty]
-    classifier = JavaClassImpl@6998['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7062['Component'] {
-    arguments = ArrayList@7063[empty]
-    classifier = JavaClassImpl@6881['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7064['Component'] {
-    arguments = ArrayList@7065[empty]
-    classifier = JavaClassImpl@6833['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7066['Component'] {
-    arguments = ArrayList@7067[empty]
-    classifier = JavaClassImpl@6962['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7068['Component'] {
-    arguments = ArrayList@7069[empty]
-    classifier = JavaClassImpl@6902['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7070['Component'] {
-    arguments = ArrayList@7071[empty]
-    classifier = JavaClassImpl@6980['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7072['Component'] {
-    arguments = ArrayList@7073[empty]
-    classifier = JavaClassImpl@7004['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7074['Component'] {
-    arguments = ArrayList@7075[empty]
-    classifier = JavaClassImpl@6890['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7076['Component'] {
-    arguments = ArrayList@7077[empty]
-    classifier = JavaClassImpl@6899['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7078['Component'] {
-    arguments = ArrayList@7079[empty]
-    classifier = JavaClassImpl@6848['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7080['Component'] {
-    arguments = ArrayList@7081[empty]
-    classifier = JavaClassImpl@6836['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7082['Component'] {
-    arguments = ArrayList@7083[empty]
-    classifier = JavaClassImpl@6857['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7084['Component'] {
-    arguments = ArrayList@7085[empty]
-    classifier = JavaClassImpl@6878['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7086['Component'] {
-    arguments = ArrayList@7087[empty]
-    classifier = JavaClassImpl@6842['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7088['Component'] {
-    arguments = ArrayList@7089[empty]
-    classifier = JavaClassImpl@7010['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7090['Component'] {
-    arguments = ArrayList@7091[empty]
-    classifier = JavaClassImpl@6968['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7092['Component'] {
-    arguments = ArrayList@7093[empty]
-    classifier = JavaClassImpl@6938['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7094['Component'] {
-    arguments = ArrayList@7095[empty]
-    classifier = JavaClassImpl@6827['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7096['Component'] {
-    arguments = ArrayList@7097[empty]
-    classifier = JavaClassImpl@7013['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7098['Component'] {
-    arguments = ArrayList@7099[empty]
-    classifier = JavaClassImpl@6869['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7100['Component'] {
-    arguments = ArrayList@7101[empty]
-    classifier = JavaClassImpl@6872['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7102['Component'] {
-    arguments = ArrayList@7103[empty]
-    classifier = JavaClassImpl@6956['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7104['Component'] {
-    arguments = ArrayList@7105[empty]
-    classifier = JavaClassImpl@6911['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7106['Component'] {
-    arguments = ArrayList@7107[empty]
-    classifier = JavaClassImpl@6989['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7108['Component'] {
-    arguments = ArrayList@7109[empty]
-    classifier = JavaClassImpl@6971['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7110['Component'] {
-    arguments = ArrayList@7111[empty]
-    classifier = JavaClassImpl@6977['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7112['Component'] {
-    arguments = ArrayList@7113[empty]
-    classifier = JavaClassImpl@6860['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7114['Component'] {
-    arguments = ArrayList@7115[empty]
-    classifier = JavaClassImpl@6875['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7116['Component'] {
-    arguments = ArrayList@7117[empty]
-    classifier = JavaClassImpl@6953['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7118['Component'] {
-    arguments = ArrayList@7119[empty]
-    classifier = JavaClassImpl@7007['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7120['Component'] {
-    arguments = ArrayList@7121[empty]
-    classifier = JavaClassImpl@6944['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7122['Component'] {
-    arguments = ArrayList@7123[empty]
-    classifier = JavaClassImpl@6995['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7124['Component'] {
-    arguments = ArrayList@7125[empty]
-    classifier = JavaClassImpl@6863['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7126['Component'] {
-    arguments = ArrayList@7127[empty]
-    classifier = JavaClassImpl@6914['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7128['Component'] {
-    arguments = ArrayList@7129[empty]
-    classifier = JavaClassImpl@6935['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7130['Component'] {
-    arguments = ArrayList@7131[empty]
-    classifier = JavaClassImpl@6932['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7132['Component'] {
-    arguments = ArrayList@7133[empty]
-    classifier = JavaClassImpl@6983['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7134['Component'] {
-    arguments = ArrayList@7135[empty]
-    classifier = JavaClassImpl@6908['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7136['Component'] {
-    arguments = ArrayList@7137[empty]
-    classifier = JavaClassImpl@6941['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7138['Component'] {
-    arguments = ArrayList@7139[empty]
-    classifier = JavaClassImpl@6839['Component']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
-}
-
-LazyJavaClassifierType@7140['ComponentEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7141
-}
-
-LazyJavaClassifierType@7142['ComponentEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7143['ComponentListener'] {
-    arguments = ArrayList@7144[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7145
-}
-
-LazyJavaClassifierType@7146['ComponentListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7147
-}
-
-LazyJavaClassifierType@7148['ComponentListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7149
-}
-
-LazyJavaClassifierType@7150['ComponentListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7151
-}
-
-LazyJavaClassifierType@7152['ComponentListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7153
-}
-
-LazyJavaClassifierType@7154['ComponentListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7155['ComponentListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7156['ComponentListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7157['ComponentOrientation'] {
-    arguments = ArrayList@7158[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7159
-}
-
-LazyJavaClassifierType@7160['ComponentOrientation'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7161
-}
-
-LazyJavaClassifierType@7162['ComponentOrientation'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7163
-}
-
-LazyJavaClassifierType@7164['ComponentOrientation'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7165
-}
-
-LazyJavaClassifierType@7166['ComponentOrientation'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7167
-}
-
-LazyJavaClassifierType@7168['ComponentOrientation'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7169['ComponentOrientation'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7170['ComponentOrientation'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7171['ComponentOrientation'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7172['ComponentOrientation'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7173['ComponentPeer'] {
-    arguments = ArrayList@7174[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7175
-}
-
-LazyJavaClassifierType@7176['ComponentPeer'] {
-    arguments = ArrayList@7177[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7178
-}
-
-LazyJavaClassifierType@7179['ComponentPeer'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7180
-}
-
-LazyJavaClassifierType@7181['ComponentPeer'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7182['ComponentPeer'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7183['ComponentPeer'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6564['Container'] {
-    arguments = ArrayList@7184[empty]
-    classifier = JavaClassImpl@7185['Container']
-    memberScope = LazyJavaClassMemberScope@1346
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7186['Container'] {
-    arguments = ArrayList@7187[empty]
-    classifier = JavaClassImpl@7188['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7189['Container'] {
-    arguments = ArrayList@7190[empty]
-    classifier = JavaClassImpl@7191['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7192['Container'] {
-    arguments = ArrayList@7193[empty]
-    classifier = JavaClassImpl@7194['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7195['Container'] {
-    arguments = ArrayList@7196[empty]
-    classifier = JavaClassImpl@7197['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7198['Container'] {
-    arguments = ArrayList@7199[empty]
-    classifier = JavaClassImpl@7200['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7201['Container'] {
-    arguments = ArrayList@7202[empty]
-    classifier = JavaClassImpl@7203['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7204['Container'] {
-    arguments = ArrayList@7205[empty]
-    classifier = JavaClassImpl@7206['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7207['Container'] {
-    arguments = ArrayList@7208[empty]
-    classifier = JavaClassImpl@7209['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7210['Container'] {
-    arguments = ArrayList@7211[empty]
-    classifier = JavaClassImpl@7212['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7213['Container'] {
-    arguments = ArrayList@7214[empty]
-    classifier = JavaClassImpl@7215['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7216['Container'] {
-    arguments = ArrayList@7217[empty]
-    classifier = JavaClassImpl@7218['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7219['Container'] {
-    arguments = ArrayList@7220[empty]
-    classifier = JavaClassImpl@7221['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7222['Container'] {
-    arguments = ArrayList@7223[empty]
-    classifier = JavaClassImpl@7224['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7225['Container'] {
-    arguments = ArrayList@7226[empty]
-    classifier = JavaClassImpl@7227['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7228['Container'] {
-    arguments = ArrayList@7229[empty]
-    classifier = JavaClassImpl@7230['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7231['Container'] {
-    arguments = ArrayList@7232[empty]
-    classifier = JavaClassImpl@7233['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7234['Container'] {
-    arguments = ArrayList@7235[empty]
-    classifier = JavaClassImpl@7236['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7237['Container'] {
-    arguments = ArrayList@7238[empty]
-    classifier = JavaClassImpl@7239['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7240['Container'] {
-    arguments = ArrayList@7241[empty]
-    classifier = JavaClassImpl@7242['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7243['Container'] {
-    arguments = ArrayList@7244[empty]
-    classifier = JavaClassImpl@7245['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7246['Container'] {
-    arguments = ArrayList@7247[empty]
-    classifier = JavaClassImpl@7248['Container']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7249['Container'] {
-    arguments = ArrayList@7250[empty]
-    classifier = JavaClassImpl@7239['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7251['Container'] {
-    arguments = ArrayList@7252[empty]
-    classifier = JavaClassImpl@7230['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7253['Container'] {
-    arguments = ArrayList@7254[empty]
-    classifier = JavaClassImpl@7200['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7255['Container'] {
-    arguments = ArrayList@7256[empty]
-    classifier = JavaClassImpl@7209['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7257['Container'] {
-    arguments = ArrayList@7258[empty]
-    classifier = JavaClassImpl@7224['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7259['Container'] {
-    arguments = ArrayList@7260[empty]
-    classifier = JavaClassImpl@7218['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7261['Container'] {
-    arguments = ArrayList@7262[empty]
-    classifier = JavaClassImpl@7191['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7263['Container'] {
-    arguments = ArrayList@7264[empty]
-    classifier = JavaClassImpl@7206['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7265['Container'] {
-    arguments = ArrayList@7266[empty]
-    classifier = JavaClassImpl@7236['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7267['Container'] {
-    arguments = ArrayList@7268[empty]
-    classifier = JavaClassImpl@7227['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7269['Container'] {
-    arguments = ArrayList@7270[empty]
-    classifier = JavaClassImpl@7245['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7271['Container'] {
-    arguments = ArrayList@7272[empty]
-    classifier = JavaClassImpl@7203['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7273['Container'] {
-    arguments = ArrayList@7274[empty]
-    classifier = JavaClassImpl@7248['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7275['Container'] {
-    arguments = ArrayList@7276[empty]
-    classifier = JavaClassImpl@7233['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7277['Container'] {
-    arguments = ArrayList@7278[empty]
-    classifier = JavaClassImpl@7212['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7279['Container'] {
-    arguments = ArrayList@7280[empty]
-    classifier = JavaClassImpl@7215['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7281['Container'] {
-    arguments = ArrayList@7282[empty]
-    classifier = JavaClassImpl@7197['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7283['Container'] {
-    arguments = ArrayList@7284[empty]
-    classifier = JavaClassImpl@7194['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7285['Container'] {
-    arguments = ArrayList@7286[empty]
-    classifier = JavaClassImpl@7242['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7287['Container'] {
-    arguments = ArrayList@7288[empty]
-    classifier = JavaClassImpl@7221['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7289['Container'] {
-    arguments = ArrayList@7290[empty]
-    classifier = JavaClassImpl@7188['Container']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
-}
-
-LazyJavaClassifierType@7291['ContainerEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7292
-}
-
-LazyJavaClassifierType@7293['ContainerEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7294['ContainerListener'] {
-    arguments = ArrayList@7295[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7296
-}
-
-LazyJavaClassifierType@7297['ContainerListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7298
-}
-
-LazyJavaClassifierType@7299['ContainerListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7300
-}
-
-LazyJavaClassifierType@7301['ContainerListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7302
-}
-
-LazyJavaClassifierType@7303['ContainerListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7304
-}
-
-LazyJavaClassifierType@7305['ContainerListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7306['ContainerListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7307['ContainerListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7308['ContainerPeer'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7309
-}
-
-LazyJavaClassifierType@7310['ContainerPeer'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7311['Cursor'] {
-    arguments = ArrayList@7312[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7313
-}
-
-LazyJavaClassifierType@7314['Cursor'] {
-    arguments = ArrayList@7315[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7316
-}
-
-LazyJavaClassifierType@7317['Cursor'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7318
-}
-
-LazyJavaClassifierType@7319['Cursor'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7320
-}
-
-LazyJavaClassifierType@7321['Cursor'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7322
-}
-
-LazyJavaClassifierType@7323['Cursor'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7324
-}
-
-LazyJavaClassifierType@7325['Cursor'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7326['Cursor'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7327['Cursor'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7328['Cursor'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7329['Dialog'] {
-    arguments = ArrayList@7330[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7331
-}
-
-LazyJavaClassifierType@7332['Dialog'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7333
-}
-
-LazyJavaClassifierType@7334['Dialog'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7335
-}
-
-LazyJavaClassifierType@7336['Dialog'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7337['Dialog'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7338['Dialog'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7339['Dimension'] {
-    arguments = ArrayList@7340[empty]
-    classifier = JavaClassImpl@7341['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7342['Dimension'] {
-    arguments = ArrayList@7343[empty]
-    classifier = JavaClassImpl@7344['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7345['Dimension'] {
-    arguments = ArrayList@7346[empty]
-    classifier = JavaClassImpl@7347['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7348['Dimension'] {
-    arguments = ArrayList@7349[empty]
-    classifier = JavaClassImpl@7350['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7351['Dimension'] {
-    arguments = ArrayList@7352[empty]
-    classifier = JavaClassImpl@7353['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7354['Dimension'] {
-    arguments = ArrayList@7355[empty]
-    classifier = JavaClassImpl@7356['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7357['Dimension'] {
-    arguments = ArrayList@7358[empty]
-    classifier = JavaClassImpl@7359['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7360['Dimension'] {
-    arguments = ArrayList@7361[empty]
-    classifier = JavaClassImpl@7362['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7363['Dimension'] {
-    arguments = ArrayList@7364[empty]
-    classifier = JavaClassImpl@7365['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7366['Dimension'] {
-    arguments = ArrayList@7367[empty]
-    classifier = JavaClassImpl@7368['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7369['Dimension'] {
-    arguments = ArrayList@7370[empty]
-    classifier = JavaClassImpl@7371['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7372['Dimension'] {
-    arguments = ArrayList@7373[empty]
-    classifier = JavaClassImpl@7374['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7375['Dimension'] {
-    arguments = ArrayList@7376[empty]
-    classifier = JavaClassImpl@7377['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7378['Dimension'] {
-    arguments = ArrayList@7379[empty]
-    classifier = JavaClassImpl@7380['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7381['Dimension'] {
-    arguments = ArrayList@7382[empty]
-    classifier = JavaClassImpl@7383['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7384['Dimension'] {
-    arguments = ArrayList@7385[empty]
-    classifier = JavaClassImpl@7386['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7387['Dimension'] {
-    arguments = ArrayList@7388[empty]
-    classifier = JavaClassImpl@7389['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7390['Dimension'] {
-    arguments = ArrayList@7391[empty]
-    classifier = JavaClassImpl@7392['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7393['Dimension'] {
-    arguments = ArrayList@7394[empty]
-    classifier = JavaClassImpl@7395['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7396['Dimension'] {
-    arguments = ArrayList@7397[empty]
-    classifier = JavaClassImpl@7398['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7399['Dimension'] {
-    arguments = ArrayList@7400[empty]
-    classifier = JavaClassImpl@7401['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7402['Dimension'] {
-    arguments = ArrayList@7403[empty]
-    classifier = JavaClassImpl@7404['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7405['Dimension'] {
-    arguments = ArrayList@7406[empty]
-    classifier = JavaClassImpl@7407['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7408['Dimension'] {
-    arguments = ArrayList@7409[empty]
-    classifier = JavaClassImpl@7410['Dimension']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7411['Dimension'] {
-    arguments = ArrayList@7412[empty]
-    classifier = JavaClassImpl@7380['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7413['Dimension'] {
-    arguments = ArrayList@7414[empty]
-    classifier = JavaClassImpl@7398['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7415['Dimension'] {
-    arguments = ArrayList@7416[empty]
-    classifier = JavaClassImpl@7347['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7417['Dimension'] {
-    arguments = ArrayList@7418[empty]
-    classifier = JavaClassImpl@7359['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7419['Dimension'] {
-    arguments = ArrayList@7420[empty]
-    classifier = JavaClassImpl@7365['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7421['Dimension'] {
-    arguments = ArrayList@7422[empty]
-    classifier = JavaClassImpl@7350['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7423['Dimension'] {
-    arguments = ArrayList@7424[empty]
-    classifier = JavaClassImpl@7377['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7425['Dimension'] {
-    arguments = ArrayList@7426[empty]
-    classifier = JavaClassImpl@7392['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7427['Dimension'] {
-    arguments = ArrayList@7428[empty]
-    classifier = JavaClassImpl@7353['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7429['Dimension'] {
-    arguments = ArrayList@7430[empty]
-    classifier = JavaClassImpl@7362['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7431['Dimension'] {
-    arguments = ArrayList@7432[empty]
-    classifier = JavaClassImpl@7344['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7433['Dimension'] {
-    arguments = ArrayList@7434[empty]
-    classifier = JavaClassImpl@7383['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7435['Dimension'] {
-    arguments = ArrayList@7436[empty]
-    classifier = JavaClassImpl@7386['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7437['Dimension'] {
-    arguments = ArrayList@7438[empty]
-    classifier = JavaClassImpl@7371['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7439['Dimension'] {
-    arguments = ArrayList@7440[empty]
-    classifier = JavaClassImpl@7389['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7441['Dimension'] {
-    arguments = ArrayList@7442[empty]
-    classifier = JavaClassImpl@7404['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7443['Dimension'] {
-    arguments = ArrayList@7444[empty]
-    classifier = JavaClassImpl@7395['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7445['Dimension'] {
-    arguments = ArrayList@7446[empty]
-    classifier = JavaClassImpl@7407['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7447['Dimension'] {
-    arguments = ArrayList@7448[empty]
-    classifier = JavaClassImpl@7410['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7449['Dimension'] {
-    arguments = ArrayList@7450[empty]
-    classifier = JavaClassImpl@7368['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7451['Dimension'] {
-    arguments = ArrayList@7452[empty]
-    classifier = JavaClassImpl@7356['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7453['Dimension'] {
-    arguments = ArrayList@7454[empty]
-    classifier = JavaClassImpl@7374['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7455['Dimension'] {
-    arguments = ArrayList@7456[empty]
-    classifier = JavaClassImpl@7341['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7457['Dimension'] {
-    arguments = ArrayList@7458[empty]
-    classifier = JavaClassImpl@7401['Dimension']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
-}
-
-LazyJavaClassifierType@7459['DropTarget'] {
-    arguments = ArrayList@7460[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7461
-}
-
-LazyJavaClassifierType@7462['DropTarget'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7463
-}
-
-LazyJavaClassifierType@7464['DropTarget'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7465
-}
-
-LazyJavaClassifierType@7466['DropTarget'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7467['DropTarget'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7468['DropTarget'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7469['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7470
-}
-
-LazyJavaClassifierType@7471['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7472
-}
-
-LazyJavaClassifierType@7473['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7474
-}
-
-LazyJavaClassifierType@7475['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7476
-}
-
-LazyJavaClassifierType@7477['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7478
-}
-
-LazyJavaClassifierType@7479['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7480
-}
-
-LazyJavaClassifierType@7481['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7482
-}
-
-LazyJavaClassifierType@7483['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7484
-}
-
-LazyJavaClassifierType@7485['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7486
-}
-
-LazyJavaClassifierType@7487['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7488
-}
-
-LazyJavaClassifierType@7489['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7490
-}
-
-LazyJavaClassifierType@7491['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7492
-}
-
-LazyJavaClassifierType@7493['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7494
-}
-
-LazyJavaClassifierType@7495['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7496
-}
-
-LazyJavaClassifierType@7497['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7498
-}
-
-LazyJavaClassifierType@7499['Event'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7500
-}
-
-LazyJavaClassifierType@7501['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7502['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7503['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7504['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7505['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7506['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7507['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7508['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7509['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7510['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7511['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7512['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7513['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7514['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7515['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7516['Event'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7517['EventListener'] {
-    arguments = ArrayList@7518[empty]
-    classifier = JavaClassImpl@7519['EventListener']
-    memberScope = LazyJavaClassMemberScope@7520
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7521['EventListener'] {
-    arguments = ArrayList@7522[empty]
-    classifier = JavaClassImpl@7519['EventListener']
-    memberScope = LazyJavaClassMemberScope@7520
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7523['EventListener'] {
-    arguments = ArrayList@7524[empty]
-    classifier = JavaClassImpl@7525['EventListener']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7526['EventListener'] {
-    arguments = ArrayList@7527[empty]
-    classifier = JavaClassImpl@7528['EventListener']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7529['EventListener'] {
-    arguments = ArrayList@7530[empty]
-    classifier = JavaClassImpl@7528['EventListener']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7531['EventListener'] {
-    arguments = ArrayList@7532[empty]
-    classifier = JavaClassImpl@7525['EventListener']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2412['EventListener']
-}
-
-LazyJavaClassifierType@7533['EventQueueItem'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7534
-}
-
-LazyJavaClassifierType@7535['EventQueueItem'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7536
-}
-
-LazyJavaClassifierType@7537['EventTargetFilter'] {
-    arguments = ArrayList@7538[empty]
-    classifier = JavaClassImpl@7539['EventTargetFilter']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
-}
-
-LazyJavaClassifierType@7540['EventTargetFilter'] {
-    arguments = ArrayList@7541[empty]
-    classifier = JavaClassImpl@7542['EventTargetFilter']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
-}
-
-LazyJavaClassifierType@7543['EventTargetFilter'] {
-    arguments = ArrayList@7544[empty]
-    classifier = JavaClassImpl@7542['EventTargetFilter']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
-}
-
-LazyJavaClassifierType@7545['EventTargetFilter'] {
-    arguments = ArrayList@7546[empty]
-    classifier = JavaClassImpl@7539['EventTargetFilter']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
-}
-
-LazyJavaClassifierType@7547['FocusEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7548
-}
-
-LazyJavaClassifierType@7549['FocusEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7550['FocusListener'] {
-    arguments = ArrayList@7551[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7552
-}
-
-LazyJavaClassifierType@7553['FocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7554
-}
-
-LazyJavaClassifierType@7555['FocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7556
-}
-
-LazyJavaClassifierType@7557['FocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7558
-}
-
-LazyJavaClassifierType@7559['FocusListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7560
-}
-
-LazyJavaClassifierType@7561['FocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7562['FocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7563['FocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7564['FocusManager'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7565
-}
-
-LazyJavaClassifierType@7566['FocusManager'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7567['FocusTraversalPolicy'] {
-    arguments = ArrayList@7568[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7569
-}
-
-LazyJavaClassifierType@7570['FocusTraversalPolicy'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7571
-}
-
-LazyJavaClassifierType@7572['FocusTraversalPolicy'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7573
-}
-
-LazyJavaClassifierType@7574['FocusTraversalPolicy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7575['FocusTraversalPolicy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7576['FocusTraversalPolicy'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7577['Font'] {
-    arguments = ArrayList@7578[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7579
-}
-
-LazyJavaClassifierType@7580['Font'] {
-    arguments = ArrayList@7581[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7582
-}
-
-LazyJavaClassifierType@7583['Font'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7584
-}
-
-LazyJavaClassifierType@7585['Font'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7586
-}
-
-LazyJavaClassifierType@7587['Font'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7588
-}
-
-LazyJavaClassifierType@7589['Font'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7590
-}
-
-LazyJavaClassifierType@7591['Font'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7592
-}
-
-LazyJavaClassifierType@7593['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7594['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7595['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7596['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7597['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7598['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7599['Font'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7600['FontMetrics'] {
-    arguments = ArrayList@7601[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7602
-}
-
-LazyJavaClassifierType@7603['FontMetrics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6553['Frame'] {
-    arguments = ArrayList@7604[empty]
-    classifier = JavaClassImpl@7605['Frame']
-    memberScope = LazyJavaClassMemberScope@2418
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@3769['Frame']
-}
-
-LazyJavaClassifierType@7606['Graphics'] {
-    arguments = ArrayList@7607[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7608
-}
-
-LazyJavaClassifierType@7609['Graphics'] {
-    arguments = ArrayList@7610[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7611
-}
-
-LazyJavaClassifierType@7612['Graphics'] {
-    arguments = ArrayList@7613[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7614
-}
-
-LazyJavaClassifierType@7615['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7616
-}
-
-LazyJavaClassifierType@7617['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7618
-}
-
-LazyJavaClassifierType@7619['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7620
-}
-
-LazyJavaClassifierType@7621['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7622
-}
-
-LazyJavaClassifierType@7623['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7624
-}
-
-LazyJavaClassifierType@7625['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7626
-}
-
-LazyJavaClassifierType@7627['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7628
-}
-
-LazyJavaClassifierType@7629['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7630
-}
-
-LazyJavaClassifierType@7631['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7632
-}
-
-LazyJavaClassifierType@7633['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7634
-}
-
-LazyJavaClassifierType@7635['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7636
-}
-
-LazyJavaClassifierType@7637['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7638
-}
-
-LazyJavaClassifierType@7639['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7640
-}
-
-LazyJavaClassifierType@7641['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7642
-}
-
-LazyJavaClassifierType@7643['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7644
-}
-
-LazyJavaClassifierType@7645['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7646
-}
-
-LazyJavaClassifierType@7647['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7648
-}
-
-LazyJavaClassifierType@7649['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7650
-}
-
-LazyJavaClassifierType@7651['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7652
-}
-
-LazyJavaClassifierType@7653['Graphics'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7654
-}
-
-LazyJavaClassifierType@7655['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7656['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7657['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7658['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7659['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7660['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7661['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7662['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7663['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7664['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7665['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7666['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7667['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7668['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7669['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7670['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7671['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7672['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7673['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7674['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7675['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7676['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7677['Graphics'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7678['GraphicsConfiguration'] {
-    arguments = ArrayList@7679[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7680
-}
-
-LazyJavaClassifierType@7681['GraphicsConfiguration'] {
-    arguments = ArrayList@7682[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7683
-}
-
-LazyJavaClassifierType@7684['GraphicsConfiguration'] {
-    arguments = ArrayList@7685[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7686
-}
-
-LazyJavaClassifierType@7687['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7688
-}
-
-LazyJavaClassifierType@7689['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7690
-}
-
-LazyJavaClassifierType@7691['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7692
-}
-
-LazyJavaClassifierType@7693['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7694
-}
-
-LazyJavaClassifierType@7695['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7696
-}
-
-LazyJavaClassifierType@7697['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7698
-}
-
-LazyJavaClassifierType@7699['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7700
-}
-
-LazyJavaClassifierType@7701['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7702
-}
-
-LazyJavaClassifierType@7703['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7704
-}
-
-LazyJavaClassifierType@7705['GraphicsConfiguration'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7706
-}
-
-LazyJavaClassifierType@7707['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7708['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7709['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7710['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7711['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7712['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7713['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7714['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7715['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7716['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7717['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7718['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7719['GraphicsConfiguration'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7720['HasGetTransferHandler'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@7721
-}
-
-LazyJavaClassifierType@7722['HierarchyBoundsListener'] {
-    arguments = ArrayList@7723[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7724
-}
-
-LazyJavaClassifierType@7725['HierarchyBoundsListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7726
-}
-
-LazyJavaClassifierType@7727['HierarchyBoundsListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7728
-}
-
-LazyJavaClassifierType@7729['HierarchyBoundsListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7730
-}
-
-LazyJavaClassifierType@7731['HierarchyBoundsListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7732
-}
-
-LazyJavaClassifierType@7733['HierarchyBoundsListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7734['HierarchyBoundsListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7735['HierarchyBoundsListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7736['HierarchyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7737
-}
-
-LazyJavaClassifierType@7738['HierarchyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7739
-}
-
-LazyJavaClassifierType@7740['HierarchyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7741['HierarchyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7742['HierarchyListener'] {
-    arguments = ArrayList@7743[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7744
-}
-
-LazyJavaClassifierType@7745['HierarchyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7746
-}
-
-LazyJavaClassifierType@7747['HierarchyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7748
-}
-
-LazyJavaClassifierType@7749['HierarchyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7750
-}
-
-LazyJavaClassifierType@7751['HierarchyListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7752
-}
-
-LazyJavaClassifierType@7753['HierarchyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7754['HierarchyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7755['HierarchyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7756['Image'] {
-    arguments = ArrayList@7757[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7758
-}
-
-LazyJavaClassifierType@7759['Image'] {
-    arguments = ArrayList@7760[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7761
-}
-
-LazyJavaClassifierType@7762['Image'] {
-    arguments = ArrayList@7763[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7764
-}
-
-LazyJavaClassifierType@7765['Image'] {
-    arguments = ArrayList@7766[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7767
-}
-
-LazyJavaClassifierType@7768['Image'] {
-    arguments = ArrayList@7769[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7770
-}
-
-LazyJavaClassifierType@7771['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7772
-}
-
-LazyJavaClassifierType@7773['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7774
-}
-
-LazyJavaClassifierType@7775['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7776
-}
-
-LazyJavaClassifierType@7777['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7778
-}
-
-LazyJavaClassifierType@7779['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7780
-}
-
-LazyJavaClassifierType@7781['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7782
-}
-
-LazyJavaClassifierType@7783['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7784
-}
-
-LazyJavaClassifierType@7785['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7786
-}
-
-LazyJavaClassifierType@7787['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7788
-}
-
-LazyJavaClassifierType@7789['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7790
-}
-
-LazyJavaClassifierType@7791['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7792
-}
-
-LazyJavaClassifierType@7793['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7794
-}
-
-LazyJavaClassifierType@7795['Image'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7796
-}
-
-LazyJavaClassifierType@7797['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7798['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7799['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7800['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7801['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7802['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7803['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7804['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7805['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7806['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7807['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7808['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7809['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7810['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7811['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7812['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7813['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7814['Image'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7815['ImageCapabilities'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7816
-}
-
-LazyJavaClassifierType@7817['ImageCapabilities'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7818['ImageObserver'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7819
-}
-
-LazyJavaClassifierType@7820['ImageObserver'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7821
-}
-
-LazyJavaClassifierType@7822['ImageObserver'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7823
-}
-
-LazyJavaClassifierType@7824['ImageObserver'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7825
-}
-
-LazyJavaClassifierType@7826['ImageObserver'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@7827
-}
-
-LazyJavaClassifierType@7828['ImageObserver'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7829['ImageObserver'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7830['ImageObserver'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7831['ImageObserver'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7832['ImageProducer'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7833
-}
-
-LazyJavaClassifierType@7834['ImageProducer'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7835['InputContext'] {
-    arguments = ArrayList@7836[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7837
-}
-
-LazyJavaClassifierType@7838['InputContext'] {
-    arguments = ArrayList@7839[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7840
-}
-
-LazyJavaClassifierType@7841['InputContext'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7842
-}
-
-LazyJavaClassifierType@7843['InputContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7844['InputContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7845['InputContext'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7846['InputMethodEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7847
-}
-
-LazyJavaClassifierType@7848['InputMethodEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7849['InputMethodListener'] {
-    arguments = ArrayList@7850[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7851
-}
-
-LazyJavaClassifierType@7852['InputMethodListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7853
-}
-
-LazyJavaClassifierType@7854['InputMethodListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7855
-}
-
-LazyJavaClassifierType@7856['InputMethodListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7857
-}
-
-LazyJavaClassifierType@7858['InputMethodListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7859
-}
-
-LazyJavaClassifierType@7860['InputMethodListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7861['InputMethodListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7862['InputMethodListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7863['InputMethodRequests'] {
-    arguments = ArrayList@7864[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7865
-}
-
-LazyJavaClassifierType@7866['InputMethodRequests'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7867['Insets'] {
-    arguments = ArrayList@7868[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7869
-}
-
-LazyJavaClassifierType@7870['Insets'] {
-    arguments = ArrayList@7871[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7872
-}
-
-LazyJavaClassifierType@7873['Insets'] {
-    arguments = ArrayList@7874[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7875
-}
-
-LazyJavaClassifierType@7876['Insets'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7877['Insets'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7878['Insets'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7879['JLayeredPane'] {
-    arguments = ArrayList@7880[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7881
-}
-
-LazyJavaClassifierType@7882['JLayeredPane'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7883
-}
-
-LazyJavaClassifierType@7884['JLayeredPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7885['JLayeredPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7886['JMenuBar'] {
-    arguments = ArrayList@7887[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7888
-}
-
-LazyJavaClassifierType@7889['JMenuBar'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7890
-}
-
-LazyJavaClassifierType@7891['JMenuBar'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7892['JMenuBar'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7893['JRootPane'] {
-    arguments = ArrayList@7894[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7895
-}
-
-LazyJavaClassifierType@7896['JRootPane'] {
-    arguments = ArrayList@7897[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7898
-}
-
-LazyJavaClassifierType@7899['JRootPane'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7900
-}
-
-LazyJavaClassifierType@7901['JRootPane'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7902
-}
-
-LazyJavaClassifierType@7903['JRootPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7904['JRootPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7905['JRootPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7906['JRootPane'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7907['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7908
-}
-
-LazyJavaClassifierType@7909['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7910
-}
-
-LazyJavaClassifierType@7911['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7912
-}
-
-LazyJavaClassifierType@7913['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7914
-}
-
-LazyJavaClassifierType@7915['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7916
-}
-
-LazyJavaClassifierType@7917['KeyEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7918
-}
-
-LazyJavaClassifierType@7919['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7920['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7921['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7922['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7923['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7924['KeyEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7925['KeyListener'] {
-    arguments = ArrayList@7926[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7927
-}
-
-LazyJavaClassifierType@7928['KeyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7929
-}
-
-LazyJavaClassifierType@7930['KeyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7931
-}
-
-LazyJavaClassifierType@7932['KeyListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7933
-}
-
-LazyJavaClassifierType@7934['KeyListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@7935
-}
-
-LazyJavaClassifierType@7936['KeyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7937['KeyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7938['KeyListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7939['LayoutManager'] {
-    arguments = ArrayList@7940[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7941
-}
-
-LazyJavaClassifierType@7942['LayoutManager'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7943
-}
-
-LazyJavaClassifierType@7944['LayoutManager'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7945
-}
-
-LazyJavaClassifierType@7946['LayoutManager'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7947
-}
-
-LazyJavaClassifierType@7948['LayoutManager'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7949['LayoutManager'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7950['LayoutManager'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7951['LayoutManager'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7952['LightweightDispatcher'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@7953
-}
-
-LazyJavaClassifierType@7954['LightweightDispatcher'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@7955['List<? extends Image>'] {
-    arguments = ArrayList@7956[1] { TypeProjectionImpl@7957 }
-    classifier = JavaClassImpl@7958['List']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@7959
-}
-
-LazyJavaClassifierType@7960['List<? extends Image>'] {
-    arguments = ArrayList@7961[1] { TypeProjectionImpl@7962 }
-    classifier = JavaClassImpl@7958['List']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@7963
-}
-
-LazyJavaClassifierType@7964['List<Component>'] {
-    arguments = ArrayList@7965[1] { TypeProjectionImpl@7966 }
-    classifier = JavaClassImpl@7967['List']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@7959
-}
-
-LazyJavaClassifierType@7968['List<Component>'] {
-    arguments = ArrayList@7969[1] { TypeProjectionImpl@7970 }
-    classifier = JavaClassImpl@7967['List']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@7963
-}
-
-LazyJavaClassifierType@7971['List<Image>'] {
-    arguments = ArrayList@7972[1] { TypeProjectionImpl@7973 }
-    classifier = JavaClassImpl@7974['List']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@7959
-}
-
-LazyJavaClassifierType@7975['List<Image>'] {
-    arguments = ArrayList@7976[1] { TypeProjectionImpl@7977 }
-    classifier = JavaClassImpl@7978['List']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@7959
-}
-
-LazyJavaClassifierType@7979['List<Image>'] {
-    arguments = ArrayList@7980[1] { TypeProjectionImpl@7981 }
-    classifier = JavaClassImpl@7978['List']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@7963
-}
-
-LazyJavaClassifierType@7982['List<Image>'] {
-    arguments = ArrayList@7983[1] { TypeProjectionImpl@7984 }
-    classifier = JavaClassImpl@7974['List']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@7963
-}
-
-LazyJavaClassifierType@7985['Locale'] {
-    arguments = ArrayList@7986[empty]
-    classifier = JavaClassImpl@7987['Locale']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@7988['Locale'] {
-    arguments = ArrayList@7989[empty]
-    classifier = JavaClassImpl@7990['Locale']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@7991['Locale'] {
-    arguments = ArrayList@7992[empty]
-    classifier = JavaClassImpl@7993['Locale']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@7994['Locale'] {
-    arguments = ArrayList@7995[empty]
-    classifier = JavaClassImpl@7996['Locale']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@7997['Locale'] {
-    arguments = ArrayList@7998[empty]
-    classifier = JavaClassImpl@7996['Locale']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@7999['Locale'] {
-    arguments = ArrayList@8000[empty]
-    classifier = JavaClassImpl@7987['Locale']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@8001['Locale'] {
-    arguments = ArrayList@8002[empty]
-    classifier = JavaClassImpl@7993['Locale']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@8003['Locale'] {
-    arguments = ArrayList@8004[empty]
-    classifier = JavaClassImpl@7990['Locale']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
-}
-
-LazyJavaClassifierType@8005['MenuBar'] {
-    arguments = ArrayList@8006[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8007
-}
-
-LazyJavaClassifierType@8008['MenuBar'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8009
-}
-
-LazyJavaClassifierType@8010['MenuBar'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8011
-}
-
-LazyJavaClassifierType@8012['MenuBar'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8013['MenuBar'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8014['MenuBar'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8015['MenuComponent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8016
-}
-
-LazyJavaClassifierType@8017['MenuComponent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8018
-}
-
-LazyJavaClassifierType@8019['MenuComponent'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8020
-}
-
-LazyJavaClassifierType@8021['MenuComponent'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8022
-}
-
-LazyJavaClassifierType@8023['MenuContainer'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@8024
-}
-
-LazyJavaClassifierType@8025['MenuContainer'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@8026
-}
-
-LazyJavaClassifierType@8027['ModalExclusionType'] {
-    arguments = ArrayList@8028[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8029
-}
-
-LazyJavaClassifierType@8030['ModalExclusionType'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8031
-}
-
-LazyJavaClassifierType@8032['ModalExclusionType'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8033
-}
-
-LazyJavaClassifierType@8034['ModalExclusionType'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8035
-}
-
-LazyJavaClassifierType@8036['ModalExclusionType'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8037['ModalExclusionType'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8038['ModalExclusionType'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8039['ModalExclusionType'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8040['MouseEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8041
-}
-
-LazyJavaClassifierType@8042['MouseEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8043
-}
-
-LazyJavaClassifierType@8044['MouseEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8045['MouseEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8046['MouseListener'] {
-    arguments = ArrayList@8047[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8048
-}
-
-LazyJavaClassifierType@8049['MouseListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8050
-}
-
-LazyJavaClassifierType@8051['MouseListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8052
-}
-
-LazyJavaClassifierType@8053['MouseListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8054
-}
-
-LazyJavaClassifierType@8055['MouseListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8056
-}
-
-LazyJavaClassifierType@8057['MouseListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8058['MouseListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8059['MouseListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8060['MouseMotionListener'] {
-    arguments = ArrayList@8061[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8062
-}
-
-LazyJavaClassifierType@8063['MouseMotionListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8064
-}
-
-LazyJavaClassifierType@8065['MouseMotionListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8066
-}
-
-LazyJavaClassifierType@8067['MouseMotionListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8068
-}
-
-LazyJavaClassifierType@8069['MouseMotionListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8070
-}
-
-LazyJavaClassifierType@8071['MouseMotionListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8072['MouseMotionListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8073['MouseMotionListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8074['MouseWheelEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8075
-}
-
-LazyJavaClassifierType@8076['MouseWheelEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8077
-}
-
-LazyJavaClassifierType@8078['MouseWheelEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8079
-}
-
-LazyJavaClassifierType@8080['MouseWheelEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8081
-}
-
-LazyJavaClassifierType@8082['MouseWheelEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8083
-}
-
-LazyJavaClassifierType@8084['MouseWheelEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8085['MouseWheelEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8086['MouseWheelEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8087['MouseWheelEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8088['MouseWheelEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8089['MouseWheelListener'] {
-    arguments = ArrayList@8090[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8091
-}
-
-LazyJavaClassifierType@8092['MouseWheelListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8093
-}
-
-LazyJavaClassifierType@8094['MouseWheelListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8095
-}
-
-LazyJavaClassifierType@8096['MouseWheelListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8097
-}
-
-LazyJavaClassifierType@8098['MouseWheelListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8099
-}
-
-LazyJavaClassifierType@8100['MouseWheelListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8101['MouseWheelListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8102['MouseWheelListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8103['Object'] {
-    arguments = ArrayList@8104[empty]
-    classifier = JavaClassImpl@8105['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8107['Object'] {
-    arguments = ArrayList@8108[empty]
-    classifier = JavaClassImpl@8109['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8110['Object'] {
-    arguments = ArrayList@8111[empty]
-    classifier = JavaClassImpl@8112['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8113['Object'] {
-    arguments = ArrayList@8114[empty]
-    classifier = JavaClassImpl@8115['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8116['Object'] {
-    arguments = ArrayList@8117[empty]
-    classifier = JavaClassImpl@8118['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8119['Object'] {
-    arguments = ArrayList@8120[empty]
-    classifier = JavaClassImpl@8121['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8122['Object'] {
-    arguments = ArrayList@8123[empty]
-    classifier = JavaClassImpl@8124['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8125['Object'] {
-    arguments = ArrayList@8126[empty]
-    classifier = JavaClassImpl@8127['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8128['Object'] {
-    arguments = ArrayList@8129[empty]
-    classifier = JavaClassImpl@8130['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8131['Object'] {
-    arguments = ArrayList@8132[empty]
-    classifier = JavaClassImpl@8133['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8134['Object'] {
-    arguments = ArrayList@8135[empty]
-    classifier = JavaClassImpl@8136['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8137['Object'] {
-    arguments = ArrayList@8138[empty]
-    classifier = JavaClassImpl@8139['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8140['Object'] {
-    arguments = ArrayList@8141[empty]
-    classifier = JavaClassImpl@8142['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8143['Object'] {
-    arguments = ArrayList@8144[empty]
-    classifier = JavaClassImpl@8145['Object']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8146['Object'] {
-    arguments = ArrayList@8147[empty]
-    classifier = JavaClassImpl@8142['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8148['Object'] {
-    arguments = ArrayList@8149[empty]
-    classifier = JavaClassImpl@8130['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8150['Object'] {
-    arguments = ArrayList@8151[empty]
-    classifier = JavaClassImpl@8136['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8152['Object'] {
-    arguments = ArrayList@8153[empty]
-    classifier = JavaClassImpl@8121['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8154['Object'] {
-    arguments = ArrayList@8155[empty]
-    classifier = JavaClassImpl@8127['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8156['Object'] {
-    arguments = ArrayList@8157[empty]
-    classifier = JavaClassImpl@8124['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8158['Object'] {
-    arguments = ArrayList@8159[empty]
-    classifier = JavaClassImpl@8145['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8160['Object'] {
-    arguments = ArrayList@8161[empty]
-    classifier = JavaClassImpl@8133['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8162['Object'] {
-    arguments = ArrayList@8163[empty]
-    classifier = JavaClassImpl@8118['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8164['Object'] {
-    arguments = ArrayList@8165[empty]
-    classifier = JavaClassImpl@8115['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8166['Object'] {
-    arguments = ArrayList@8167[empty]
-    classifier = JavaClassImpl@8139['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8168['Object'] {
-    arguments = ArrayList@8169[empty]
-    classifier = JavaClassImpl@8109['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8170['Object'] {
-    arguments = ArrayList@8171[empty]
-    classifier = JavaClassImpl@8112['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8172['Object'] {
-    arguments = ArrayList@8173[empty]
-    classifier = JavaClassImpl@8105['Object']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8174['Object'] {
-    classifier = JavaClassImpl@8175['Object']
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8176['Object'] {
-    classifier = JavaClassImpl@8177['Object']
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8178['Object'] {
-    classifier = JavaClassImpl@8179['Object']
-    typeConstructor = DeserializedClassTypeConstructor@8106
-}
-
-LazyJavaClassifierType@8180['ObjectInputStream'] {
-    arguments = ArrayList@8181[empty]
-    classifier = JavaClassImpl@8182['ObjectInputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8183['ObjectInputStream'] {
-    arguments = ArrayList@8184[empty]
-    classifier = JavaClassImpl@8185['ObjectInputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8186['ObjectInputStream'] {
-    arguments = ArrayList@8187[empty]
-    classifier = JavaClassImpl@8188['ObjectInputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8189['ObjectInputStream'] {
-    arguments = ArrayList@8190[empty]
-    classifier = JavaClassImpl@8191['ObjectInputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8192['ObjectInputStream'] {
-    arguments = ArrayList@8193[empty]
-    classifier = JavaClassImpl@8194['ObjectInputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8195['ObjectInputStream'] {
-    arguments = ArrayList@8196[empty]
-    classifier = JavaClassImpl@8182['ObjectInputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8197['ObjectInputStream'] {
-    arguments = ArrayList@8198[empty]
-    classifier = JavaClassImpl@8191['ObjectInputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8199['ObjectInputStream'] {
-    arguments = ArrayList@8200[empty]
-    classifier = JavaClassImpl@8185['ObjectInputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8201['ObjectInputStream'] {
-    arguments = ArrayList@8202[empty]
-    classifier = JavaClassImpl@8188['ObjectInputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8203['ObjectInputStream'] {
-    arguments = ArrayList@8204[empty]
-    classifier = JavaClassImpl@8194['ObjectInputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
-}
-
-LazyJavaClassifierType@8205['ObjectOutputStream'] {
-    arguments = ArrayList@8206[empty]
-    classifier = JavaClassImpl@8207['ObjectOutputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8208['ObjectOutputStream'] {
-    arguments = ArrayList@8209[empty]
-    classifier = JavaClassImpl@8210['ObjectOutputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8211['ObjectOutputStream'] {
-    arguments = ArrayList@8212[empty]
-    classifier = JavaClassImpl@8213['ObjectOutputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8214['ObjectOutputStream'] {
-    arguments = ArrayList@8215[empty]
-    classifier = JavaClassImpl@8216['ObjectOutputStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8217['ObjectOutputStream'] {
-    arguments = ArrayList@8218[empty]
-    classifier = JavaClassImpl@8210['ObjectOutputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8219['ObjectOutputStream'] {
-    arguments = ArrayList@8220[empty]
-    classifier = JavaClassImpl@8213['ObjectOutputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8221['ObjectOutputStream'] {
-    arguments = ArrayList@8222[empty]
-    classifier = JavaClassImpl@8216['ObjectOutputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8223['ObjectOutputStream'] {
-    arguments = ArrayList@8224[empty]
-    classifier = JavaClassImpl@8207['ObjectOutputStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@8225['Point'] {
-    arguments = ArrayList@8226[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8227
-}
-
-LazyJavaClassifierType@8228['Point'] {
-    arguments = ArrayList@8229[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8230
-}
-
-LazyJavaClassifierType@8231['Point'] {
-    arguments = ArrayList@8232[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8233
-}
-
-LazyJavaClassifierType@8234['Point'] {
-    arguments = ArrayList@8235[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8236
-}
-
-LazyJavaClassifierType@8237['Point'] {
-    arguments = ArrayList@8238[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8239
-}
-
-LazyJavaClassifierType@8240['Point'] {
-    arguments = ArrayList@8241[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8242
-}
-
-LazyJavaClassifierType@8243['Point'] {
-    arguments = ArrayList@8244[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8245
-}
-
-LazyJavaClassifierType@8246['Point'] {
-    arguments = ArrayList@8247[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8248
-}
-
-LazyJavaClassifierType@8249['Point'] {
-    arguments = ArrayList@8250[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8251
-}
-
-LazyJavaClassifierType@8252['Point'] {
-    arguments = ArrayList@8253[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8254
-}
-
-LazyJavaClassifierType@8255['Point'] {
-    arguments = ArrayList@8256[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8257
-}
-
-LazyJavaClassifierType@8258['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8259
-}
-
-LazyJavaClassifierType@8260['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8261
-}
-
-LazyJavaClassifierType@8262['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8263
-}
-
-LazyJavaClassifierType@8264['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8265
-}
-
-LazyJavaClassifierType@8266['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8267
-}
-
-LazyJavaClassifierType@8268['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8269
-}
-
-LazyJavaClassifierType@8270['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8271
-}
-
-LazyJavaClassifierType@8272['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8273
-}
-
-LazyJavaClassifierType@8274['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8275
-}
-
-LazyJavaClassifierType@8276['Point'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8277
-}
-
-LazyJavaClassifierType@8278['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8279['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8280['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8281['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8282['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8283['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8284['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8285['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8286['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8287['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8288['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8289['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8290['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8291['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8292['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8293['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8294['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8295['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8296['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8297['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8298['Point'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8299['Point2D'] {
-    arguments = ArrayList@8300[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8301
-}
-
-LazyJavaClassifierType@8302['Point2D'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8303['PointerInfo'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8304
-}
-
-LazyJavaClassifierType@8305['PointerInfo'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8306['PopupMenu'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8307
-}
-
-LazyJavaClassifierType@8308['PopupMenu'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8309['PrintStream'] {
-    arguments = ArrayList@8310[empty]
-    classifier = JavaClassImpl@8311['PrintStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8312['PrintStream'] {
-    arguments = ArrayList@8313[empty]
-    classifier = JavaClassImpl@8314['PrintStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8315['PrintStream'] {
-    arguments = ArrayList@8316[empty]
-    classifier = JavaClassImpl@8317['PrintStream']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8318['PrintStream'] {
-    arguments = ArrayList@8319[empty]
-    classifier = JavaClassImpl@8314['PrintStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8320['PrintStream'] {
-    arguments = ArrayList@8321[empty]
-    classifier = JavaClassImpl@8317['PrintStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8322['PrintStream'] {
-    arguments = ArrayList@8323[empty]
-    classifier = JavaClassImpl@8311['PrintStream']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
-}
-
-LazyJavaClassifierType@8324['PrintWriter'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8325
-}
-
-LazyJavaClassifierType@8326['PrintWriter'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8327
-}
-
-LazyJavaClassifierType@8328['PrintWriter'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8329
-}
-
-LazyJavaClassifierType@8330['PrintWriter'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8331['PrintWriter'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8332['PrintWriter'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8333['PropertyChangeListener'] {
-    arguments = ArrayList@8334[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8335
-}
-
-LazyJavaClassifierType@8336['PropertyChangeListener'] {
-    arguments = ArrayList@8337[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8338
-}
-
-LazyJavaClassifierType@8339['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8340
-}
-
-LazyJavaClassifierType@8341['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8342
-}
-
-LazyJavaClassifierType@8343['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8344
-}
-
-LazyJavaClassifierType@8345['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8346
-}
-
-LazyJavaClassifierType@8347['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8348
-}
-
-LazyJavaClassifierType@8349['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8350
-}
-
-LazyJavaClassifierType@8351['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8352
-}
-
-LazyJavaClassifierType@8353['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8354
-}
-
-LazyJavaClassifierType@8355['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8356
-}
-
-LazyJavaClassifierType@8357['PropertyChangeListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8358
-}
-
-LazyJavaClassifierType@8359['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8360['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8361['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8362['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8363['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8364['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8365['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8366['PropertyChangeListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8367['PropertyChangeSupport'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8368
-}
-
-LazyJavaClassifierType@8369['PropertyChangeSupport'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8370['Rectangle'] {
-    arguments = ArrayList@8371[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8372
-}
-
-LazyJavaClassifierType@8373['Rectangle'] {
-    arguments = ArrayList@8374[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8375
-}
-
-LazyJavaClassifierType@8376['Rectangle'] {
-    arguments = ArrayList@8377[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8378
-}
-
-LazyJavaClassifierType@8379['Rectangle'] {
-    arguments = ArrayList@8380[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8381
-}
-
-LazyJavaClassifierType@8382['Rectangle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8383
-}
-
-LazyJavaClassifierType@8384['Rectangle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8385
-}
-
-LazyJavaClassifierType@8386['Rectangle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8387
-}
-
-LazyJavaClassifierType@8388['Rectangle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8389
-}
-
-LazyJavaClassifierType@8390['Rectangle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8391
-}
-
-LazyJavaClassifierType@8392['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8393['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8394['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8395['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8396['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8397['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8398['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8399['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8400['Rectangle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8401['Region'] {
-    arguments = ArrayList@8402[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8403
-}
-
-LazyJavaClassifierType@8404['Region'] {
-    arguments = ArrayList@8405[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8406
-}
-
-LazyJavaClassifierType@8407['Region'] {
-    arguments = ArrayList@8408[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8409
-}
-
-LazyJavaClassifierType@8410['Region'] {
-    arguments = ArrayList@8411[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8412
-}
-
-LazyJavaClassifierType@8413['Region'] {
-    arguments = ArrayList@8414[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8415
-}
-
-LazyJavaClassifierType@8416['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8417
-}
-
-LazyJavaClassifierType@8418['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8419
-}
-
-LazyJavaClassifierType@8420['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8421
-}
-
-LazyJavaClassifierType@8422['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8423
-}
-
-LazyJavaClassifierType@8424['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8425
-}
-
-LazyJavaClassifierType@8426['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8427
-}
-
-LazyJavaClassifierType@8428['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8429
-}
-
-LazyJavaClassifierType@8430['Region'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8431
-}
-
-LazyJavaClassifierType@8432['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8433['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8434['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8435['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8436['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8437['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8438['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8439['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8440['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8441['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8442['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8443['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8444['Region'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8445['ResourceBundle'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8446
-}
-
-LazyJavaClassifierType@8447['ResourceBundle'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8448['RootPaneContainer'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@8449
-}
-
-LazyJavaClassifierType@8450['RuntimeException'] {
-    arguments = ArrayList@8451[empty]
-    classifier = JavaClassImpl@8452['RuntimeException']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5065['RuntimeException']
-}
-
-LazyJavaClassifierType@8453['RuntimeException'] {
-    arguments = ArrayList@8454[empty]
-    classifier = JavaClassImpl@8452['RuntimeException']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5065['RuntimeException']
-}
-
-LazyJavaClassifierType@6539['Serializable'] {
-    arguments = ArrayList@8455[empty]
-    classifier = JavaClassImpl@8456['Serializable']
-    memberScope = LazyJavaClassMemberScope@5068
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5360['Serializable']
-}
-
-LazyJavaClassifierType@8457['Set'] {
-    arguments = ArrayList@8458[1] { LazyStarProjection@8459 }
-    classifier = JavaClassImpl@8460['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8462['Set'] {
-    arguments = ArrayList@8463[1] { LazyStarProjection@8464 }
-    classifier = JavaClassImpl@8465['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8466['Set'] {
-    arguments = ArrayList@8467[1] { LazyStarProjection@8468 }
-    classifier = JavaClassImpl@8469['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8470['Set'] {
-    arguments = ArrayList@8471[1] { LazyStarProjection@8472 }
-    classifier = JavaClassImpl@8465['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8474['Set'] {
-    arguments = ArrayList@8475[1] { LazyStarProjection@8476 }
-    classifier = JavaClassImpl@8469['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8477['Set'] {
-    arguments = ArrayList@8478[1] { LazyStarProjection@8479 }
-    classifier = JavaClassImpl@8460['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8480['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8481[1] { TypeProjectionImpl@8482 }
-    classifier = JavaClassImpl@8483['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8484['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8485[1] { TypeProjectionImpl@8486 }
-    classifier = JavaClassImpl@8487['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8488['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8489[1] { TypeProjectionImpl@8490 }
-    classifier = JavaClassImpl@8491['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8492['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8493[1] { TypeProjectionImpl@8494 }
-    classifier = JavaClassImpl@8487['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8495['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8496[1] { TypeProjectionImpl@8497 }
-    classifier = JavaClassImpl@8491['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8498['Set<? extends AWTKeyStroke>'] {
-    arguments = ArrayList@8499[1] { TypeProjectionImpl@8500 }
-    classifier = JavaClassImpl@8483['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8501['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8502[1] { TypeProjectionImpl@8503 }
-    classifier = JavaClassImpl@8504['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8505['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8506[1] { TypeProjectionImpl@8507 }
-    classifier = JavaClassImpl@8508['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8509['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8510[1] { TypeProjectionImpl@8511 }
-    classifier = JavaClassImpl@8512['Set']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8461
-}
-
-LazyJavaClassifierType@8513['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8514[1] { TypeProjectionImpl@8515 }
-    classifier = JavaClassImpl@8512['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8516['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8517[1] { TypeProjectionImpl@8518 }
-    classifier = JavaClassImpl@8504['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8519['Set<AWTKeyStroke>'] {
-    arguments = ArrayList@8520[1] { TypeProjectionImpl@8521 }
-    classifier = JavaClassImpl@8508['Set']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8473
-}
-
-LazyJavaClassifierType@8522['Shape'] {
-    arguments = ArrayList@8523[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8524
-}
-
-LazyJavaClassifierType@8525['Shape'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8526
-}
-
-LazyJavaClassifierType@8527['Shape'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8528
-}
-
-LazyJavaClassifierType@8529['Shape'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8530
-}
-
-LazyJavaClassifierType@8531['Shape'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8532['Shape'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8533['Shape'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8534['Shape'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8535['String'] {
-    arguments = ArrayList@8536[empty]
-    classifier = JavaClassImpl@8537['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8539['String'] {
-    arguments = ArrayList@8540[empty]
-    classifier = JavaClassImpl@8541['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8542['String'] {
-    arguments = ArrayList@8543[empty]
-    classifier = JavaClassImpl@8544['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8545['String'] {
-    arguments = ArrayList@8546[empty]
-    classifier = JavaClassImpl@8547['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8548['String'] {
-    arguments = ArrayList@8549[empty]
-    classifier = JavaClassImpl@8550['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8551['String'] {
-    arguments = ArrayList@8552[empty]
-    classifier = JavaClassImpl@8553['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8554['String'] {
-    arguments = ArrayList@8555[empty]
-    classifier = JavaClassImpl@8556['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8557['String'] {
-    arguments = ArrayList@8558[empty]
-    classifier = JavaClassImpl@8559['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8560['String'] {
-    arguments = ArrayList@8561[empty]
-    classifier = JavaClassImpl@8562['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8563['String'] {
-    arguments = ArrayList@8564[empty]
-    classifier = JavaClassImpl@8565['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8566['String'] {
-    arguments = ArrayList@8567[empty]
-    classifier = JavaClassImpl@8568['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8569['String'] {
-    arguments = ArrayList@8570[empty]
-    classifier = JavaClassImpl@8571['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8572['String'] {
-    arguments = ArrayList@8573[empty]
-    classifier = JavaClassImpl@8574['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8575['String'] {
-    arguments = ArrayList@8576[empty]
-    classifier = JavaClassImpl@8577['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8578['String'] {
-    arguments = ArrayList@8579[empty]
-    classifier = JavaClassImpl@8580['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8581['String'] {
-    arguments = ArrayList@8582[empty]
-    classifier = JavaClassImpl@8583['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8584['String'] {
-    arguments = ArrayList@8585[empty]
-    classifier = JavaClassImpl@8586['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8587['String'] {
-    arguments = ArrayList@8588[empty]
-    classifier = JavaClassImpl@8589['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8590['String'] {
-    arguments = ArrayList@8591[empty]
-    classifier = JavaClassImpl@8592['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8593['String'] {
-    arguments = ArrayList@8594[empty]
-    classifier = JavaClassImpl@8595['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8596['String'] {
-    arguments = ArrayList@8597[empty]
-    classifier = JavaClassImpl@8598['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8599['String'] {
-    arguments = ArrayList@8600[empty]
-    classifier = JavaClassImpl@8601['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8602['String'] {
-    arguments = ArrayList@8603[empty]
-    classifier = JavaClassImpl@8604['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8605['String'] {
-    arguments = ArrayList@8606[empty]
-    classifier = JavaClassImpl@8607['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8608['String'] {
-    arguments = ArrayList@8609[empty]
-    classifier = JavaClassImpl@8610['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8611['String'] {
-    arguments = ArrayList@8612[empty]
-    classifier = JavaClassImpl@8613['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8614['String'] {
-    arguments = ArrayList@8615[empty]
-    classifier = JavaClassImpl@8616['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8617['String'] {
-    arguments = ArrayList@8618[empty]
-    classifier = JavaClassImpl@8619['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8620['String'] {
-    arguments = ArrayList@8621[empty]
-    classifier = JavaClassImpl@8622['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8623['String'] {
-    arguments = ArrayList@8624[empty]
-    classifier = JavaClassImpl@8625['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8626['String'] {
-    arguments = ArrayList@8627[empty]
-    classifier = JavaClassImpl@8628['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8629['String'] {
-    arguments = ArrayList@8630[empty]
-    classifier = JavaClassImpl@8631['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8632['String'] {
-    arguments = ArrayList@8633[empty]
-    classifier = JavaClassImpl@8634['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8635['String'] {
-    arguments = ArrayList@8636[empty]
-    classifier = JavaClassImpl@8637['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8638['String'] {
-    arguments = ArrayList@8639[empty]
-    classifier = JavaClassImpl@8640['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8641['String'] {
-    arguments = ArrayList@8642[empty]
-    classifier = JavaClassImpl@8643['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8644['String'] {
-    arguments = ArrayList@8645[empty]
-    classifier = JavaClassImpl@8646['String']
-    nullable = 'false': Boolean@6567
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8647['String'] {
-    arguments = ArrayList@8648[empty]
-    classifier = JavaClassImpl@8631['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8649['String'] {
-    arguments = ArrayList@8650[empty]
-    classifier = JavaClassImpl@8643['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8651['String'] {
-    arguments = ArrayList@8652[empty]
-    classifier = JavaClassImpl@8598['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8653['String'] {
-    arguments = ArrayList@8654[empty]
-    classifier = JavaClassImpl@8619['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8655['String'] {
-    arguments = ArrayList@8656[empty]
-    classifier = JavaClassImpl@8568['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8657['String'] {
-    arguments = ArrayList@8658[empty]
-    classifier = JavaClassImpl@8601['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8659['String'] {
-    arguments = ArrayList@8660[empty]
-    classifier = JavaClassImpl@8625['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8661['String'] {
-    arguments = ArrayList@8662[empty]
-    classifier = JavaClassImpl@8580['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8663['String'] {
-    arguments = ArrayList@8664[empty]
-    classifier = JavaClassImpl@8556['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8665['String'] {
-    arguments = ArrayList@8666[empty]
-    classifier = JavaClassImpl@8559['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8667['String'] {
-    arguments = ArrayList@8668[empty]
-    classifier = JavaClassImpl@8544['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8669['String'] {
-    arguments = ArrayList@8670[empty]
-    classifier = JavaClassImpl@8595['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8671['String'] {
-    arguments = ArrayList@8672[empty]
-    classifier = JavaClassImpl@8616['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8673['String'] {
-    arguments = ArrayList@8674[empty]
-    classifier = JavaClassImpl@8562['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8675['String'] {
-    arguments = ArrayList@8676[empty]
-    classifier = JavaClassImpl@8646['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8677['String'] {
-    arguments = ArrayList@8678[empty]
-    classifier = JavaClassImpl@8634['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8679['String'] {
-    arguments = ArrayList@8680[empty]
-    classifier = JavaClassImpl@8577['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8681['String'] {
-    arguments = ArrayList@8682[empty]
-    classifier = JavaClassImpl@8628['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8683['String'] {
-    arguments = ArrayList@8684[empty]
-    classifier = JavaClassImpl@8637['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8685['String'] {
-    arguments = ArrayList@8686[empty]
-    classifier = JavaClassImpl@8583['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8687['String'] {
-    arguments = ArrayList@8688[empty]
-    classifier = JavaClassImpl@8541['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8689['String'] {
-    arguments = ArrayList@8690[empty]
-    classifier = JavaClassImpl@8592['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8691['String'] {
-    arguments = ArrayList@8692[empty]
-    classifier = JavaClassImpl@8640['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8693['String'] {
-    arguments = ArrayList@8694[empty]
-    classifier = JavaClassImpl@8622['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8695['String'] {
-    arguments = ArrayList@8696[empty]
-    classifier = JavaClassImpl@8553['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8697['String'] {
-    arguments = ArrayList@8698[empty]
-    classifier = JavaClassImpl@8537['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8699['String'] {
-    arguments = ArrayList@8700[empty]
-    classifier = JavaClassImpl@8574['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8701['String'] {
-    arguments = ArrayList@8702[empty]
-    classifier = JavaClassImpl@8565['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8703['String'] {
-    arguments = ArrayList@8704[empty]
-    classifier = JavaClassImpl@8610['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8705['String'] {
-    arguments = ArrayList@8706[empty]
-    classifier = JavaClassImpl@8571['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8707['String'] {
-    arguments = ArrayList@8708[empty]
-    classifier = JavaClassImpl@8589['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8709['String'] {
-    arguments = ArrayList@8710[empty]
-    classifier = JavaClassImpl@8547['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8711['String'] {
-    arguments = ArrayList@8712[empty]
-    classifier = JavaClassImpl@8586['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8713['String'] {
-    arguments = ArrayList@8714[empty]
-    classifier = JavaClassImpl@8550['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8715['String'] {
-    arguments = ArrayList@8716[empty]
-    classifier = JavaClassImpl@8613['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8717['String'] {
-    arguments = ArrayList@8718[empty]
-    classifier = JavaClassImpl@8607['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8719['String'] {
-    arguments = ArrayList@8720[empty]
-    classifier = JavaClassImpl@8604['String']
-    nullable = 'true': Boolean@6596
-    typeConstructor = DeserializedClassTypeConstructor@8538
-}
-
-LazyJavaClassifierType@8721['T'] {
-    arguments = ArrayList@8722[empty]
-    classifier = JavaTypeParameterImpl@8723['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8725['T'] {
-    arguments = ArrayList@8726[empty]
-    classifier = JavaTypeParameterImpl@8727['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8728['T'] {
-    arguments = ArrayList@8729[empty]
-    classifier = JavaTypeParameterImpl@8730['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8732['T'] {
-    arguments = ArrayList@8733[empty]
-    classifier = JavaTypeParameterImpl@8734['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8736['T'] {
-    arguments = ArrayList@8737[empty]
-    classifier = JavaTypeParameterImpl@8738['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8739['T'] {
-    arguments = ArrayList@8740[empty]
-    classifier = JavaTypeParameterImpl@8741['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8742['T'] {
-    arguments = ArrayList@8743[empty]
-    classifier = JavaTypeParameterImpl@8744['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8745['T'] {
-    arguments = ArrayList@8746[empty]
-    classifier = JavaTypeParameterImpl@8747['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8748['T'] {
-    arguments = ArrayList@8749[empty]
-    classifier = JavaTypeParameterImpl@8750['T']
-    nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8751['T'] {
-    arguments = ArrayList@8752[empty]
-    classifier = JavaTypeParameterImpl@8727['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8753['T'] {
-    arguments = ArrayList@8754[empty]
-    classifier = JavaTypeParameterImpl@8734['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8755['T'] {
-    arguments = ArrayList@8756[empty]
-    classifier = JavaTypeParameterImpl@8741['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8757['T'] {
-    arguments = ArrayList@8758[empty]
-    classifier = JavaTypeParameterImpl@8738['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8759['T'] {
-    arguments = ArrayList@8760[empty]
-    classifier = JavaTypeParameterImpl@8730['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8761['T'] {
-    arguments = ArrayList@8762[empty]
-    classifier = JavaTypeParameterImpl@8723['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8763['T'] {
-    arguments = ArrayList@8764[empty]
-    classifier = JavaTypeParameterImpl@8747['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-}
-
-LazyJavaClassifierType@8765['T'] {
-    arguments = ArrayList@8766[empty]
-    classifier = JavaTypeParameterImpl@8744['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-}
-
-LazyJavaClassifierType@8767['T'] {
-    arguments = ArrayList@8768[empty]
-    classifier = JavaTypeParameterImpl@8750['T']
-    nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-}
-
-LazyJavaClassifierType@8769['Toolkit'] {
-    arguments = ArrayList@8770[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8771
-}
-
-LazyJavaClassifierType@8772['Toolkit'] {
-    arguments = ArrayList@8773[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8774
-}
-
-LazyJavaClassifierType@8775['Toolkit'] {
-    arguments = ArrayList@8776[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8777
-}
-
-LazyJavaClassifierType@8778['Toolkit'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8779['Toolkit'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8780['Toolkit'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8781['TransferHandler'] {
-    arguments = ArrayList@8782[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8783
-}
-
-LazyJavaClassifierType@8784['TransferHandler'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8785
-}
-
-LazyJavaClassifierType@8786['TransferHandler'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8787
-}
-
-LazyJavaClassifierType@8788['TransferHandler'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8789['TransferHandler'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8790['TransferHandler'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8791['Type'] {
-    arguments = ArrayList@8792[empty]
-    classifier = JavaClassImpl@8793['Type']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8794['Type'] {
-    arguments = ArrayList@8795[empty]
-    classifier = JavaClassImpl@8796['Type']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8797['Type'] {
-    arguments = ArrayList@8798[empty]
-    classifier = JavaClassImpl@8799['Type']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8800['Type'] {
-    arguments = ArrayList@8801[empty]
-    classifier = JavaClassImpl@8799['Type']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8802['Type'] {
-    arguments = ArrayList@8803[empty]
-    classifier = JavaClassImpl@8796['Type']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8804['Type'] {
-    arguments = ArrayList@8805[empty]
-    classifier = JavaClassImpl@8793['Type']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
-}
-
-LazyJavaClassifierType@8806['Vector'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8807
-}
-
-LazyJavaClassifierType@8808['Vector'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8809
-}
-
-LazyJavaClassifierType@8810['Vector'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8811['Vector'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8812['Vector<WeakReference<Window>>'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8813
-}
-
-LazyJavaClassifierType@8814['Vector<WeakReference<Window>>'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8815['VolatileImage'] {
-    arguments = ArrayList@8816[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8817
-}
-
-LazyJavaClassifierType@8818['VolatileImage'] {
-    arguments = ArrayList@8819[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8820
-}
-
-LazyJavaClassifierType@8821['VolatileImage'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8822['VolatileImage'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8823['WeakReference'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8824
-}
-
-LazyJavaClassifierType@8825['WeakReference'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8826
-}
-
-LazyJavaClassifierType@8827['WeakReference'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8828['WeakReference'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8829['WeakReference<Window>'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8830
-}
-
-LazyJavaClassifierType@8831['WeakReference<Window>'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@6550['Window'] {
-    arguments = ArrayList@8832[empty]
-    classifier = JavaClassImpl@8833['Window']
-    memberScope = LazyJavaClassMemberScope@5365
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8834['Window'] {
-    arguments = ArrayList@8835[empty]
-    classifier = JavaClassImpl@8836['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8837['Window'] {
-    arguments = ArrayList@8838[empty]
-    classifier = JavaClassImpl@8839['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8840['Window'] {
-    arguments = ArrayList@8841[empty]
-    classifier = JavaClassImpl@8842['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8843['Window'] {
-    arguments = ArrayList@8844[empty]
-    classifier = JavaClassImpl@8845['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8846['Window'] {
-    arguments = ArrayList@8847[empty]
-    classifier = JavaClassImpl@8848['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8849['Window'] {
-    arguments = ArrayList@8850[empty]
-    classifier = JavaClassImpl@8851['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8852['Window'] {
-    arguments = ArrayList@8853[empty]
-    classifier = JavaClassImpl@8854['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8855['Window'] {
-    arguments = ArrayList@8856[empty]
-    classifier = JavaClassImpl@8857['Window']
-    nullable = 'false': Boolean@6567
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8858['Window'] {
-    arguments = ArrayList@8859[empty]
-    classifier = JavaClassImpl@8845['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8860['Window'] {
-    arguments = ArrayList@8861[empty]
-    classifier = JavaClassImpl@8839['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8862['Window'] {
-    arguments = ArrayList@8863[empty]
-    classifier = JavaClassImpl@8836['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8864['Window'] {
-    arguments = ArrayList@8865[empty]
-    classifier = JavaClassImpl@8857['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8866['Window'] {
-    arguments = ArrayList@8867[empty]
-    classifier = JavaClassImpl@8854['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8868['Window'] {
-    arguments = ArrayList@8869[empty]
-    classifier = JavaClassImpl@8851['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8870['Window'] {
-    arguments = ArrayList@8871[empty]
-    classifier = JavaClassImpl@8842['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8872['Window'] {
-    arguments = ArrayList@8873[empty]
-    classifier = JavaClassImpl@8848['Window']
-    nullable = 'true': Boolean@6596
-    typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
-}
-
-LazyJavaClassifierType@8874['WindowConstants'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@8875
-}
-
-LazyJavaClassifierType@8876['WindowEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8877
-}
-
-LazyJavaClassifierType@8878['WindowEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8879
-}
-
-LazyJavaClassifierType@8880['WindowEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8881
-}
-
-LazyJavaClassifierType@8882['WindowEvent'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8883
-}
-
-LazyJavaClassifierType@8884['WindowEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8885['WindowEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8886['WindowEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8887['WindowEvent'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8888['WindowFocusListener'] {
-    arguments = ArrayList@8889[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8890
-}
-
-LazyJavaClassifierType@8891['WindowFocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8892
-}
-
-LazyJavaClassifierType@8893['WindowFocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8894
-}
-
-LazyJavaClassifierType@8895['WindowFocusListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8896
-}
-
-LazyJavaClassifierType@8897['WindowFocusListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8898
-}
-
-LazyJavaClassifierType@8899['WindowFocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8900['WindowFocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8901['WindowFocusListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8902['WindowListener'] {
-    arguments = ArrayList@8903[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8904
-}
-
-LazyJavaClassifierType@8905['WindowListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8906
-}
-
-LazyJavaClassifierType@8907['WindowListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8908
-}
-
-LazyJavaClassifierType@8909['WindowListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8910
-}
-
-LazyJavaClassifierType@8911['WindowListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8912
-}
-
-LazyJavaClassifierType@8913['WindowListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8914['WindowListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8915['WindowListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8916['WindowStateListener'] {
-    arguments = ArrayList@8917[empty]
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8918
-}
-
-LazyJavaClassifierType@8919['WindowStateListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8920
-}
-
-LazyJavaClassifierType@8921['WindowStateListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8922
-}
-
-LazyJavaClassifierType@8923['WindowStateListener'] {
-    classifier = null
-    nullable = 'false': Boolean@6567
-    typeConstructor = TypeConstructorImpl$1@8924
-}
-
-LazyJavaClassifierType@8925['WindowStateListener'] {
-    classifier = null
-    nullable = 'true': Boolean@6596
-    typeConstructor = TypeConstructorImpl$1@8926
-}
-
-LazyJavaClassifierType@8927['WindowStateListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8928['WindowStateListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaClassifierType@8929['WindowStateListener'] {
-    nullable = 'true': Boolean@6596
-}
-
-LazyJavaPackageFragmentProvider@8930 {
-    packageFragments('<root>': FqName@8931) = LazyJavaPackageFragment@8932['<root>']
-    packageFragments('JFrame': FqName@8933) = null
-    packageFragments('java': FqName@8934) = LazyJavaPackageFragment@8935['java']
-    packageFragments('java.awt': FqName@8936) = LazyJavaPackageFragment@8937['awt']
-    packageFragments('java.io': FqName@8938) = LazyJavaPackageFragment@8939['io']
-    packageFragments('java.lang': FqName@8940) = LazyJavaPackageFragment@8941['lang']
-    packageFragments('java.lang.JFrame': FqName@8942) = null
-    packageFragments('java.util': FqName@8943) = LazyJavaPackageFragment@8944['util']
-    packageFragments('javax': FqName@8945) = LazyJavaPackageFragment@8946['javax']
-    packageFragments('javax.swing': FqName@8947) = LazyJavaPackageFragment@8948['swing']
-    packageFragments('javax.swing.JFrame': FqName@8949) = null
-    packageFragments('kotlin': FqName@8950) = null
-    packageFragments('kotlin.JFrame': FqName@8951) = null
-    packageFragments('kotlin.io': FqName@8952) = null
-    packageFragments('kotlin.jvm': FqName@8953) = null
-    packageFragments('test': FqName@8954) = null
-    packageFragments('test.JFrame': FqName@8955) = null
-    packageFragments('test.KFrame': FqName@8956) = null
-    topLevelClasses(JavaClassImpl@6627['AWTKeyStroke']) = LazyJavaClassDescriptor@0['AWTKeyStroke']
-    topLevelClasses(JavaClassImpl@6766['Class']) = LazyJavaClassDescriptor@4['Class']
-    topLevelClasses(JavaClassImpl@6824['Component']) = LazyJavaClassDescriptor@6['Component']
-    topLevelClasses(JavaClassImpl@7185['Container']) = LazyJavaClassDescriptor@1344['Container']
-    topLevelClasses(JavaClassImpl@7377['Dimension']) = LazyJavaClassDescriptor@2409['Dimension']
-    topLevelClasses(JavaClassImpl@7519['EventListener']) = LazyJavaClassDescriptor@2411['EventListener']
-    topLevelClasses(JavaClassImpl@7605['Frame']) = LazyJavaClassDescriptor@2416['Frame']
-    topLevelClasses(JavaClassImpl@8957['JFrame']) = LazyJavaClassDescriptor@3770['JFrame']
-    topLevelClasses(JavaClassImpl@7996['Locale']) = LazyJavaClassDescriptor@5056['Locale']
-    topLevelClasses(JavaClassImpl@8188['ObjectInputStream']) = LazyJavaClassDescriptor@5058['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@8210['ObjectOutputStream']) = LazyJavaClassDescriptor@5060['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@8311['PrintStream']) = LazyJavaClassDescriptor@5062['PrintStream']
-    topLevelClasses(JavaClassImpl@8452['RuntimeException']) = LazyJavaClassDescriptor@5064['RuntimeException']
-    topLevelClasses(JavaClassImpl@8456['Serializable']) = LazyJavaClassDescriptor@5066['Serializable']
-    topLevelClasses(JavaClassImpl@8833['Window']) = LazyJavaClassDescriptor@5363['Window']
-}
-
-LazyJavaPackageFragment@8935['java'] {
-    classes('lang': Name@8958) = null // through LazyPackageFragmentScopeForJavaPackage@8959
-    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8959
-    functions('lang': Name@8961) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@8959
-    memberIndex = computeMemberIndex$1@8962 // through LazyPackageFragmentScopeForJavaPackage@8959
-}
-
-LazyJavaPackageFragment@8946['javax'] {
-    classes('swing': Name@8963) = null // through LazyPackageFragmentScopeForJavaPackage@8964
-    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8964
-    functions('swing': Name@8965) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@8964
-    memberIndex = computeMemberIndex$1@8966 // through LazyPackageFragmentScopeForJavaPackage@8964
-}
-
-LazyJavaPackageFragment@8948['swing'] {
-    classes('JFrame': Name@8967) = LazyJavaClassDescriptor@3770['JFrame'] // through LazyPackageFragmentScopeForJavaPackage@8968
-    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8968
-    functions('JFrame': Name@8969) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@8968
-    memberIndex = computeMemberIndex$1@8970 // through LazyPackageFragmentScopeForJavaPackage@8968
-}
-
-LazyJavaTypeParameterDescriptor@8971['T'] {
-    defaultType = JetTypeImpl@8972['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-    upperBounds = LinkedHashSet@8973[1] { DelegatingFlexibleType@8974 }
-    upperBoundsAsType = DelegatingFlexibleType@8974
-}
-
-LazyJavaTypeParameterDescriptor@8975['T'] {
-    defaultType = JetTypeImpl@8976['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
-    upperBounds = LinkedHashSet@8977[1] { DelegatingFlexibleType@8978 }
-    upperBoundsAsType = DelegatingFlexibleType@8978
-}
-
-LazyJavaTypeParameterDescriptor@8979['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-    upperBounds = LinkedHashSet@8980[1] { DelegatingFlexibleType@8981 }
-    upperBoundsAsType = DelegatingFlexibleType@8981
-}
-
-LazyJavaTypeParameterDescriptor@6536['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8982
-}
-
-LazyJavaTypeParameterResolver@8983 {
-    resolve(JavaTypeParameterImpl@8984['T']) = LazyJavaTypeParameterDescriptor@8971['T']
-}
-
-LazyJavaTypeParameterResolver@8985 {
-    resolve(JavaTypeParameterImpl@8986['T']) = LazyJavaTypeParameterDescriptor@8979['T']
-}
-
-LazyJavaTypeParameterResolver@8987 {
-    resolve(JavaTypeParameterImpl@8988['T']) = LazyJavaTypeParameterDescriptor@8975['T']
-}
-
-LazyJavaTypeParameterResolver@8989 {
-    resolve(JavaTypeParameterImpl@8990['T']) = LazyJavaTypeParameterDescriptor@6536['T']
-}
-
-ResolutionTaskHolder@8991 {
-    <name not found> = ArrayList@8992[1] { ResolutionCandidate@8993 }
-}
-
-ResolutionTaskHolder@8994 {
-    <name not found> = ArrayList@8995[4] { ResolutionCandidate@8996, ResolutionCandidate@8997, ResolutionCandidate@8998, ... }
-}
-
-null {
-    <name not found> = ArrayList@8999[1] { ResolutionCandidate@8993 }
-    <name not found> = ArrayList@9000[4] { ResolutionCandidate@8996, ResolutionCandidate@8997, ResolutionCandidate@8998, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
deleted file mode 100644
index 0cb43aab547..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Abs': FqName@3) = null
-    packageFragments('Bar': FqName@4) = null
-    packageFragments('F': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Abs': FqName@11) = null
-    packageFragments('java.lang.Bar': FqName@12) = null
-    packageFragments('java.lang.F': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Abs': FqName@16) = null
-    packageFragments('kotlin.Bar': FqName@17) = null
-    packageFragments('kotlin.F': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@35 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
deleted file mode 100644
index b0f235d59ba..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
+++ /dev/null
@@ -1,95 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Obj': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Obj': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Obj': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('kt1736': FqName@15) = null
-    packageFragments('kt1736.Obj': FqName@16) = null
-    packageFragments('kt1736.x': FqName@17) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('method': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('method': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
deleted file mode 100644
index 4a4250ead1f..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
+++ /dev/null
@@ -1,163 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('Tree': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.Any': FqName@56) = null
-    packageFragments('java.lang.Tree': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.Any': FqName@59) = null
-    packageFragments('kotlin.Tree': FqName@60) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    topLevelClasses(JavaClassImpl@63['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Exception': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Exception': Name@66) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@55['lang'] {
-    classes('Exception': Name@66) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Exception': Name@66) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[4] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-}
-
-null {
-    <name not found> = ArrayList@81[5] { ResolutionCandidate@78, ResolutionCandidate@79, ResolutionCandidate@80, ... }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
deleted file mode 100644
index 4a5b4deca7f..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
+++ /dev/null
@@ -1,171 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['NullPointerException'] {
-    constructors = ArrayList@5[2] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['NullPointerException']
-}
-
-LazyJavaClassDescriptor@11['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@12['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@10['NullPointerException'] {
-    parameters = ArrayList@16[empty]
-    supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@12['RuntimeException'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Exception'] }
-}
-
-LazyJavaClassifierType@21['Exception'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@18['RuntimeException'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@12['RuntimeException']
-}
-
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@15['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('Any': FqName@40) = null
-    packageFragments('Int': FqName@41) = null
-    packageFragments('T': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.Any': FqName@47) = null
-    packageFragments('java.lang.Int': FqName@48) = null
-    packageFragments('java.lang.T': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Any': FqName@51) = null
-    packageFragments('kotlin.Int': FqName@52) = null
-    packageFragments('kotlin.T': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    topLevelClasses(JavaClassImpl@23['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@56['NullPointerException']) = LazyJavaClassDescriptor@4['NullPointerException']
-    topLevelClasses(JavaClassImpl@25['RuntimeException']) = LazyJavaClassDescriptor@11['RuntimeException']
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('Any': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Int': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('NullPointerException': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('equals': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('npe': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('NullPointerException': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('equals': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('npe': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@46['lang'] {
-    classes('NullPointerException': Name@60) = LazyJavaClassDescriptor@4['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('equals': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('npe': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('NullPointerException': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('equals': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('npe': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-null {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
deleted file mode 100644
index 463d515f8c7..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
+++ /dev/null
@@ -1,229 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('MyNumber': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.MyNumber': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Array': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.MyNumber': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kt235': FqName@22) = null
-    packageFragments('kt235.Array': FqName@23) = null
-    packageFragments('kt235.Int': FqName@24) = null
-    packageFragments('kt235.MyArray': FqName@25) = null
-    packageFragments('kt235.MyArray1': FqName@26) = null
-    packageFragments('kt235.MyNumber': FqName@27) = null
-    packageFragments('kt235.String': FqName@28) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('MyArray': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('MyArray1': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('MyNumber': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plusAssign': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('MyArray': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('MyArray1': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('MyNumber': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plusAssign': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@113[8] { ResolutionCandidate@93, ResolutionCandidate@94, ResolutionCandidate@95, ... }
-    <name not found> = ArrayList@114[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
deleted file mode 100644
index c1a0086be5f..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
+++ /dev/null
@@ -1,97 +0,0 @@
-LazyJavaClassDescriptor@0['Test'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['Test']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('number': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['number'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('number': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['Test']
-}
-
-LazyJavaClassTypeConstructor@12['Test'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Number'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['Number']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@21['Number'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@18['Number']
-    nullable = 'true': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@20
-}
-
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
-}
-
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('Array': FqName@30) = null
-    packageFragments('String': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.Array': FqName@36) = null
-    packageFragments('java.lang.String': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.Array': FqName@39) = null
-    packageFragments('kotlin.String': FqName@40) = null
-    packageFragments('kotlin.io': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = null
-    topLevelClasses(JavaClassImpl@43['Test']) = LazyJavaClassDescriptor@0['Test']
-}
-
-LazyJavaPackageFragment@29['<root>'] {
-    classes('Array': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('String': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('Test': Name@47) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('Test': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('lang': Name@53) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@35['lang'] {
-    classes('Test': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('Test': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
deleted file mode 100644
index 0d41120ce3a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
+++ /dev/null
@@ -1,92 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('Any': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Any': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('d': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('e': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('x': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('d': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('e': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('x': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
deleted file mode 100644
index 337afb0fd8a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt258.lazy.log
+++ /dev/null
@@ -1,375 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
-}
-
-LazyJavaClassDescriptor@6['HashMap'] {
-    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@11
-    functionTypeForSamInterface = null
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@11
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@11
-    nestedClasses('set': Name@1) = null // through LazyJavaClassMemberScope@11
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@16['HashMap']
-}
-
-LazyJavaClassDescriptor@17['Serializable'] {
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
-}
-
-LazyJavaClassTypeConstructor@5['AbstractMap'] {
-    parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@16['HashMap'] {
-    parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
-    supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@20['Serializable'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassifierType@30['AbstractMap<K, V>'] {
-    arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@39['AbstractMap']
-    memberScope = SubstitutingScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
-}
-
-LazyJavaClassifierType@32['Cloneable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Cloneable']
-    memberScope = DeserializedClassMemberScope@43
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['K'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@47['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@52['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@63['K'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@52['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@66['K'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@68['K'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@72['K'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@47['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@74['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
-    classifier = JavaClassImpl@78['Map']
-    memberScope = SubstitutingScope@79
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@81['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@78['Map']
-    memberScope = SubstitutingScope@85
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@25['Map<K, V>'] {
-    arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@90['Map']
-    memberScope = SubstitutingScope@91
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@31['Map<K, V>'] {
-    arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@95['Map']
-    memberScope = SubstitutingScope@96
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@97['Object'] {
-    classifier = JavaClassImpl@98['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@100['Object'] {
-    classifier = JavaClassImpl@101['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@102['Serializable'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['Serializable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
-}
-
-LazyJavaClassifierType@105['V'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@109['V'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@112['V'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@115['V'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@118['V'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
-}
-
-LazyJavaClassifierType@122['V'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@117['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@124['V'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@114['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@126['V'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@128['V'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@107['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@130['V'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@120['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
-}
-
-LazyJavaPackageFragmentProvider@132 {
-    packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
-    packageFragments('HashMap': FqName@135) = null
-    packageFragments('K': FqName@136) = null
-    packageFragments('MutableMap': FqName@137) = null
-    packageFragments('String': FqName@138) = null
-    packageFragments('V': FqName@139) = null
-    packageFragments('java': FqName@140) = LazyJavaPackageFragment@141['java']
-    packageFragments('java.io': FqName@142) = LazyJavaPackageFragment@143['io']
-    packageFragments('java.lang': FqName@144) = LazyJavaPackageFragment@145['lang']
-    packageFragments('java.lang.HashMap': FqName@146) = null
-    packageFragments('java.lang.K': FqName@147) = null
-    packageFragments('java.lang.MutableMap': FqName@148) = null
-    packageFragments('java.lang.String': FqName@149) = null
-    packageFragments('java.lang.V': FqName@150) = null
-    packageFragments('java.util': FqName@151) = LazyJavaPackageFragment@152['util']
-    packageFragments('java.util.HashMap': FqName@153) = null
-    packageFragments('java.util.K': FqName@154) = null
-    packageFragments('java.util.MutableMap': FqName@155) = null
-    packageFragments('java.util.String': FqName@156) = null
-    packageFragments('java.util.V': FqName@157) = null
-    packageFragments('kotlin': FqName@158) = null
-    packageFragments('kotlin.HashMap': FqName@159) = null
-    packageFragments('kotlin.K': FqName@160) = null
-    packageFragments('kotlin.MutableMap': FqName@161) = null
-    packageFragments('kotlin.String': FqName@162) = null
-    packageFragments('kotlin.V': FqName@163) = null
-    packageFragments('kotlin.io': FqName@164) = null
-    packageFragments('kotlin.jvm': FqName@165) = null
-    topLevelClasses(JavaClassImpl@39['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@166['HashMap']) = LazyJavaClassDescriptor@6['HashMap']
-    topLevelClasses(JavaClassImpl@104['Serializable']) = LazyJavaClassDescriptor@17['Serializable']
-}
-
-LazyJavaPackageFragment@134['<root>'] {
-    classes('HashMap': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('MutableMap': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('String': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('java': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('java': Name@174) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@168
-}
-
-LazyJavaPackageFragment@141['java'] {
-    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('util': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('lang': Name@179) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('util': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@177
-}
-
-LazyJavaPackageFragment@145['lang'] {
-    classes('HashMap': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@182
-}
-
-LazyJavaPackageFragment@152['util'] {
-    classes('HashMap': Name@167) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('MutableMap': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('String': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    deserializedPackageScope = Empty@172 // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('HashMap': Name@173) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    memberIndex = computeMemberIndex$1@185 // through LazyPackageFragmentScopeForJavaPackage@184
-}
-
-LazyJavaTypeParameterDescriptor@27['K'] {
-    defaultType = JetTypeImpl@186['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-    upperBounds = LinkedHashSet@187[1] { NullableType@188 }
-}
-
-LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaTypeParameterDescriptor@28['V'] {
-    defaultType = JetTypeImpl@189['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@190[1] { NullableType@191 }
-}
-
-LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
-}
-
-LazyJavaTypeParameterResolver@192 {
-    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@23['V']
-}
-
-LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@28['V']
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@211[4] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt26-1.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt26-1.lazy.log
deleted file mode 100644
index bd347c5f64d..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt26-1.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('bar': FqName@3) = null
-    packageFragments('foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt26.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt26.lazy.log
deleted file mode 100644
index efc2ba8e9e9..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt26.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('html': FqName@5) = null
-    packageFragments('html.Any': FqName@6) = null
-    packageFragments('html.Factory': FqName@7) = null
-    packageFragments('html.T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('html': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('html': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
deleted file mode 100644
index ce47a0911c9..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
+++ /dev/null
@@ -1,323 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ByteValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = ShortValue@4
-}
-
-LazyJavaClassDescriptor@5['AssertionError'] {
-    constructors = ArrayList@6[10] { JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@11['AssertionError']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@12['AssertionError']
-}
-
-LazyJavaClassDescriptor@13['Error'] {
-    typeConstructor = LazyJavaClassTypeConstructor@14['Error']
-}
-
-LazyJavaClassTypeConstructor@12['AssertionError'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { LazyJavaClassifierType@17['Error'] }
-}
-
-LazyJavaClassTypeConstructor@14['Error'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { LazyJavaClassifierType@20['Throwable'] }
-}
-
-LazyJavaClassifierType@17['Error'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['Error']
-    typeConstructor = LazyJavaClassTypeConstructor@14['Error']
-}
-
-LazyJavaClassifierType@23['Object'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['Object']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@28['Object'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@25['Object']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@27
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'false': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@44['Throwable']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@20['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Array': FqName@53) = null
-    packageFragments('Byte': FqName@54) = null
-    packageFragments('Short': FqName@55) = null
-    packageFragments('String': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.Array': FqName@62) = null
-    packageFragments('java.lang.Byte': FqName@63) = null
-    packageFragments('java.lang.Short': FqName@64) = null
-    packageFragments('java.lang.String': FqName@65) = null
-    packageFragments('java.lang.T': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Array': FqName@68) = null
-    packageFragments('kotlin.Byte': FqName@69) = null
-    packageFragments('kotlin.Short': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    topLevelClasses(JavaClassImpl@75['AssertionError']) = LazyJavaClassDescriptor@5['AssertionError']
-    topLevelClasses(JavaClassImpl@22['Error']) = LazyJavaClassDescriptor@13['Error']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('Array': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('AssertionError': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Byte': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Short': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('AssertionError': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('assertEquals': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@61['lang'] {
-    classes('AssertionError': Name@78) = LazyJavaClassDescriptor@5['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('AssertionError': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('assertEquals': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[8] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[9] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
-
-null {
-    <name not found> = ArrayList@196[10] { ResolutionCandidate@193, ResolutionCandidate@197, ResolutionCandidate@194, ... }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@221[8] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
-    <name not found> = ArrayList@222[8] { ResolutionCandidate@173, ResolutionCandidate@174, ResolutionCandidate@175, ... }
-    <name not found> = ArrayList@223[8] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165, ... }
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@178, ResolutionCandidate@179, ResolutionCandidate@180, ... }
-    <name not found> = ArrayList@225[8] { ResolutionCandidate@183, ResolutionCandidate@184, ResolutionCandidate@185, ... }
-    <name not found> = ArrayList@226[8] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-    <name not found> = EmptyList@84[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
deleted file mode 100644
index b42165174f2..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
+++ /dev/null
@@ -1,154 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('Set': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.Set': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Boolean': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.Set': FqName@20) = null
-    packageFragments('kotlin.Unit': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Unit': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('contains': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('contains': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('plus': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('contains': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('contains': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-    <name not found> = ArrayList@60[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@74[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-    <name not found> = ArrayList@75[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
deleted file mode 100644
index d52fc65b87d..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
+++ /dev/null
@@ -1,328 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassDescriptor@2['HashMap'] {
-    constructors = ArrayList@3[4] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['HashMap']
-}
-
-LazyJavaClassDescriptor@10['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractMap'] {
-    parameters = ArrayList@12[2] { LazyJavaTypeParameterDescriptor@13['K'], LazyJavaTypeParameterDescriptor@14['V'] }
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@9['HashMap'] {
-    parameters = ArrayList@17[2] { LazyJavaTypeParameterDescriptor@18['K'], LazyJavaTypeParameterDescriptor@19['V'] }
-    supertypes = ArrayList@20[4] { LazyJavaClassifierType@21['AbstractMap<K, V>'], LazyJavaClassifierType@22['Map<K, V>'], LazyJavaClassifierType@23['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['Serializable'] {
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassifierType@21['AbstractMap<K, V>'] {
-    arguments = ArrayList@26[2] { TypeProjectionImpl@27, TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractMap']
-}
-
-LazyJavaClassifierType@23['Cloneable'] {
-    classifier = JavaClassImpl@30['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@31
-}
-
-LazyJavaClassifierType@32['K'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@37['K'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@40['K'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@42['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@43['K'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaTypeParameterImpl@45['K']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@47['K'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@39['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@34['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@52['K'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@45['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@42['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@57[2] { TypeProjectionImpl@58, TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@63['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@64[2] { TypeProjectionImpl@65, TypeProjectionImpl@66 }
-    classifier = JavaClassImpl@60['Map']
-    memberScope = SubstitutingScope@67
-    nullable = 'true': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@16['Map<K, V>'] {
-    arguments = ArrayList@69[2] { TypeProjectionImpl@70, TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@22['Map<K, V>'] {
-    classifier = JavaClassImpl@73['Map']
-    typeConstructor = DeserializedClassTypeConstructor@62
-}
-
-LazyJavaClassifierType@74['Object'] {
-    classifier = JavaClassImpl@75['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Object'] {
-    classifier = JavaClassImpl@78['Object']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    classifier = JavaClassImpl@80['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Serializable']
-}
-
-LazyJavaClassifierType@81['V'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@85['V'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaClassifierType@89['V'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@92['V'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['V']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@95['V'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@83['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@97['V'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@87['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaClassifierType@99['V'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@94['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaClassifierType@101['V'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@91['V']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('Map': FqName@106) = null
-    packageFragments('String': FqName@107) = null
-    packageFragments('attributes': FqName@108) = null
-    packageFragments('java': FqName@109) = LazyJavaPackageFragment@110['java']
-    packageFragments('java.io': FqName@111) = LazyJavaPackageFragment@112['io']
-    packageFragments('java.lang': FqName@113) = LazyJavaPackageFragment@114['lang']
-    packageFragments('java.lang.Map': FqName@115) = null
-    packageFragments('java.lang.String': FqName@116) = null
-    packageFragments('java.util': FqName@117) = LazyJavaPackageFragment@118['util']
-    packageFragments('java.util.Map': FqName@119) = null
-    packageFragments('java.util.String': FqName@120) = null
-    packageFragments('kotlin': FqName@121) = null
-    packageFragments('kotlin.Map': FqName@122) = null
-    packageFragments('kotlin.String': FqName@123) = null
-    packageFragments('kotlin.io': FqName@124) = null
-    packageFragments('kotlin.jvm': FqName@125) = null
-    topLevelClasses(JavaClassImpl@29['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@126['HashMap']) = LazyJavaClassDescriptor@2['HashMap']
-    topLevelClasses(JavaClassImpl@127['Map']) = LazyJavaClassDescriptor@128['Map']
-    topLevelClasses(JavaClassImpl@80['Serializable']) = LazyJavaClassDescriptor@10['Serializable']
-}
-
-LazyJavaPackageFragment@105['<root>'] {
-    classes('HashMap': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('Map': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('String': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('java': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('java': Name@137) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@110['java'] {
-    classes('lang': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('util': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('lang': Name@142) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('util': Name@143) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@140
-}
-
-LazyJavaPackageFragment@114['lang'] {
-    classes('HashMap': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    memberIndex = computeMemberIndex$1@146 // through LazyPackageFragmentScopeForJavaPackage@145
-}
-
-LazyJavaPackageFragment@118['util'] {
-    classes('HashMap': Name@129) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Map': Name@131) = LazyJavaClassDescriptor@128['Map'] // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('String': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foo': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('HashMap': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('foo': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@147
-}
-
-LazyJavaTypeParameterDescriptor@18['K'] {
-    defaultType = JetTypeImpl@149['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@150[1] { NullableType@151 }
-}
-
-LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-LazyJavaTypeParameterDescriptor@19['V'] {
-    defaultType = JetTypeImpl@152['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@153[1] { NullableType@154 }
-}
-
-LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-}
-
-LazyJavaTypeParameterResolver@155 {
-    resolve(JavaTypeParameterImpl@156['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@157['V']) = LazyJavaTypeParameterDescriptor@19['V']
-}
-
-LazyJavaTypeParameterResolver@158 {
-    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-}
-
-null {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@178[4] { ResolutionCandidate@169, ResolutionCandidate@170, ResolutionCandidate@171, ... }
-    <name not found> = ArrayList@179[4] { ResolutionCandidate@164, ResolutionCandidate@165, ResolutionCandidate@166, ... }
-    <name not found> = ArrayList@180[4] { ResolutionCandidate@174, ResolutionCandidate@175, ResolutionCandidate@176, ... }
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-    <name not found> = EmptyList@136[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
deleted file mode 100644
index e7bb98f2831..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Nothing': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Nothing': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Nothing': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Nothing': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt302.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt302.lazy.log
deleted file mode 100644
index f79854c5b72..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt302.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt302': FqName@16) = null
-    packageFragments('kt302.A': FqName@17) = null
-    packageFragments('kt302.B': FqName@18) = null
-    packageFragments('kt302.C': FqName@19) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
deleted file mode 100644
index b40b9050b3a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
+++ /dev/null
@@ -1,70 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Barr': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Barr': FqName@9) = null
-    packageFragments('java.lang.Foo': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Barr': FqName@12) = null
-    packageFragments('kotlin.Foo': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('bar': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('bar': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
deleted file mode 100644
index 22f68f72385..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('AL': FqName@3) = null
-    packageFragments('ALE': FqName@4) = null
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.AL': FqName@12) = null
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.AL': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.T': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('get': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
deleted file mode 100644
index 9fb161957c0..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
+++ /dev/null
@@ -1,139 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('args': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('name': FqName@24) = null
-    packageFragments('name1': FqName@25) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('size': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Array': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('safeGet': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('size': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Array': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('size': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Array': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('safeGet': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('size': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
deleted file mode 100644
index d5b57c009a7..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['NullPointerException'] {
-    constructors = ArrayList@3[2] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'] } // through LazyJavaClassMemberScope@6
-    defaultType = JetTypeImpl@7['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@8['NullPointerException']
-}
-
-LazyJavaClassDescriptor@9['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@10['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@8['NullPointerException'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@10['RuntimeException'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Exception'] }
-}
-
-LazyJavaClassifierType@19['Exception'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@16['RuntimeException'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@10['RuntimeException']
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@35 {
-    packageFragments('<root>': FqName@36) = LazyJavaPackageFragment@37['<root>']
-    packageFragments('Any': FqName@38) = null
-    packageFragments('Iterable': FqName@39) = null
-    packageFragments('String': FqName@40) = null
-    packageFragments('T': FqName@41) = null
-    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
-    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
-    packageFragments('java.lang.Any': FqName@46) = null
-    packageFragments('java.lang.Iterable': FqName@47) = null
-    packageFragments('java.lang.String': FqName@48) = null
-    packageFragments('java.lang.T': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Any': FqName@51) = null
-    packageFragments('kotlin.Iterable': FqName@52) = null
-    packageFragments('kotlin.String': FqName@53) = null
-    packageFragments('kotlin.T': FqName@54) = null
-    packageFragments('kotlin.io': FqName@55) = null
-    packageFragments('kotlin.jvm': FqName@56) = null
-    topLevelClasses(JavaClassImpl@21['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@57['NullPointerException']) = LazyJavaClassDescriptor@2['NullPointerException']
-    topLevelClasses(JavaClassImpl@23['RuntimeException']) = LazyJavaClassDescriptor@9['RuntimeException']
-}
-
-LazyJavaPackageFragment@37['<root>'] {
-    classes('Any': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('Iterable': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('NullPointerException': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('String': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('equals': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('npe': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('NullPointerException': Name@61) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('equals': Name@63) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('npe': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@45['lang'] {
-    classes('NullPointerException': Name@61) = LazyJavaClassDescriptor@2['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('equals': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('npe': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('NullPointerException': Name@61) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('equals': Name@63) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('npe': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@93[2] { ResolutionCandidate@87, ResolutionCandidate@88 }
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-    <name not found> = EmptyList@66[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt316.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt316.lazy.log
deleted file mode 100644
index 8d42421ec25..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt316.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.B': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.B': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
deleted file mode 100644
index 4dbcce0bea6..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
+++ /dev/null
@@ -1,192 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = JetTypeImpl@3['Function0<1>']
-    <name not found> = JetTypeImpl@4['Function0<1>']
-    <name not found> = JetTypeImpl@5['Function0<1>']
-    <name not found> = JetTypeImpl@6['Function0<1>']
-    <name not found> = JetTypeImpl@7['Unit']
-    <name not found> = JetTypeImpl@7['Unit']
-    <name not found> = JetTypeImpl@7['Unit']
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('A': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('foo3': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Unit': FqName@18) = null
-    packageFragments('java.lang.foo3': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Unit': FqName@21) = null
-    packageFragments('kotlin.foo3': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('x': FqName@25) = null
-    packageFragments('z': FqName@26) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Unit': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('z': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar1': Name@29) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar2': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar3': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('block': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo3': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('z': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar1': Name@29) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar2': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar3': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('block': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('f': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('foo3': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
deleted file mode 100644
index 76bc50e4dcd..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
+++ /dev/null
@@ -1,129 +0,0 @@
-LazyJavaClassDescriptor@0['Comparable'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'], ... } // through LazyJavaClassMemberScope@5
-    annotations = LazyJavaAnnotations@6
-    defaultType = JetTypeImpl@7['Comparable<1>']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = JetTypeImpl@9['Function1<2>']
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('compareTo': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['compareTo'] } // through LazyJavaClassMemberScope@5
-    functions('equals': Name@15) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@4['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@19) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@21) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@23) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@25) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparable']
-}
-
-LazyJavaClassTypeConstructor@29['Comparable'] {
-    parameters = ArrayList@30[1] { LazyJavaTypeParameterDescriptor@31['T'] }
-    supertypes = ArrayList@32[1] { JetTypeImpl@33['Any'] }
-}
-
-LazyJavaClassifierType@34['Object'] {
-    classifier = JavaClassImpl@35['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@37['T'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-LazyJavaClassifierType@42['T'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@44['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-LazyJavaClassifierType@45['T'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@44['T']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-LazyJavaClassifierType@48['T'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@39['T']
-    nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Comparable': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Comparable': FqName@58) = null
-    packageFragments('kotlin': FqName@59) = null
-    packageFragments('kotlin.Comparable': FqName@60) = null
-    packageFragments('kotlin.io': FqName@61) = null
-    packageFragments('kotlin.jvm': FqName@62) = null
-    topLevelClasses(JavaClassImpl@63['Comparable']) = LazyJavaClassDescriptor@0['Comparable']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('Comparable': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('java': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('kotlin': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('java': Name@69) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('Comparable': Name@75) = LazyJavaClassDescriptor@0['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('java': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('kotlin': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Comparable': Name@78) = ArrayList@79[1] { SamConstructorDescriptor@80['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaTypeParameterDescriptor@31['T'] {
-    defaultType = JetTypeImpl@82['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-    upperBounds = LinkedHashSet@83[1] { NullableType@84 }
-    upperBoundsAsType = NullableType@84
-}
-
-LazyJavaTypeParameterResolver@85 {
-    resolve(JavaTypeParameterImpl@86['T']) = LazyJavaTypeParameterDescriptor@31['T']
-}
-
-LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@39['T']) = null
-}
-
-LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@44['T']) = null
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-null {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@94 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
deleted file mode 100644
index 134be148559..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
+++ /dev/null
@@ -1,599 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@2['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassDescriptor@4['ArrayList'] {
-    constructors = ArrayList@5[3] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'] } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['ArrayList']
-}
-
-LazyJavaClassDescriptor@12['Collections'] {
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@14
-    functions('sort': Name@15) = ArrayList@16[3] { JavaMethodDescriptor@17['sort'], JavaMethodDescriptor@18['sort'], SamAdapterFunctionDescriptor@19['sort'] } // through LazyJavaStaticClassScope@20
-    functions('sort': Name@15) = EmptyList@21[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaStaticClassScope@20
-    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@14
-    nestedClasses('sort': Name@15) = null // through LazyJavaClassMemberScope@14
-    properties('sort': Name@15) = EmptyList@21[empty] // through LazyJavaClassMemberScope@14
-    properties('sort': Name@15) = EmptyList@21[empty] // through LazyJavaStaticClassScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@25['Collections']
-}
-
-LazyJavaClassDescriptor@26['Comparator'] {
-    functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassDescriptor@30['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
-}
-
-LazyJavaClassDescriptor@32['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
-}
-
-LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@36[1] { LazyJavaTypeParameterDescriptor@37['E'] }
-    supertypes = ArrayList@38[2] { LazyJavaClassifierType@39['AbstractCollection<E>'], LazyJavaClassifierType@40['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@11['ArrayList'] {
-    parameters = ArrayList@41[1] { LazyJavaTypeParameterDescriptor@42['E'] }
-    supertypes = ArrayList@43[5] { LazyJavaClassifierType@44['AbstractList<E>'], LazyJavaClassifierType@45['List<E>'], LazyJavaClassifierType@46['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@25['Collections'] {
-    supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassTypeConstructor@29['Comparator'] {
-    parameters = ArrayList@49[1] { LazyJavaTypeParameterDescriptor@50['T'] }
-    supertypes = ArrayList@51[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassifierType@39['AbstractCollection<E>'] {
-    classifier = JavaClassImpl@52['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
-}
-
-LazyJavaClassifierType@44['AbstractList<E>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@55['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
-}
-
-LazyJavaClassifierType@56['Cloneable'] {
-    classifier = JavaClassImpl@57['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@58
-}
-
-LazyJavaClassifierType@59['Collection<? extends E>'] {
-    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@62['Collection']
-    memberScope = SubstitutingScope@63
-    nullable = 'false': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaClassifierType@66['Collection<? extends E>'] {
-    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    classifier = JavaClassImpl@62['Collection']
-    memberScope = SubstitutingScope@69
-    nullable = 'true': Boolean@70
-    typeConstructor = DeserializedClassTypeConstructor@71
-}
-
-LazyJavaClassifierType@35['Collection<E>'] {
-    classifier = JavaClassImpl@72['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaClassifierType@73['Comparable<? super T>'] {
-    arguments = ArrayList@74[1] { TypeProjectionImpl@75 }
-    classifier = JavaClassImpl@76['Comparable']
-    memberScope = SubstitutingScope@77
-    nullable = 'false': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@79['Comparable<? super T>'] {
-    arguments = ArrayList@80[1] { TypeProjectionImpl@81 }
-    classifier = JavaClassImpl@76['Comparable']
-    memberScope = SubstitutingScope@82
-    nullable = 'true': Boolean@70
-    typeConstructor = DeserializedClassTypeConstructor@78
-}
-
-LazyJavaClassifierType@83['Comparator<? super T>'] {
-    arguments = ArrayList@84[1] { TypeProjectionImpl@85 }
-    classifier = JavaClassImpl@86['Comparator']
-    memberScope = SubstitutingScope@87
-    nullable = 'false': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassifierType@88['Comparator<? super T>'] {
-    arguments = ArrayList@89[1] { TypeProjectionImpl@90 }
-    classifier = JavaClassImpl@86['Comparator']
-    memberScope = SubstitutingScope@91
-    nullable = 'true': Boolean@70
-    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
-}
-
-LazyJavaClassifierType@92['E'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@99['E'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@101['E']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
-}
-
-LazyJavaClassifierType@106['E'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@94['E']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@108['E'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@104['E']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
-}
-
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@98['E']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@101['E']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@40['List<E>'] {
-    arguments = ArrayList@114[1] { TypeProjectionImpl@115 }
-    classifier = JavaClassImpl@116['List']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@45['List<E>'] {
-    classifier = JavaClassImpl@118['List']
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@119['List<T>'] {
-    arguments = ArrayList@120[1] { TypeProjectionImpl@121 }
-    classifier = JavaClassImpl@122['List']
-    memberScope = SubstitutingScope@123
-    nullable = 'false': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@124['List<T>'] {
-    arguments = ArrayList@125[1] { TypeProjectionImpl@126 }
-    classifier = JavaClassImpl@127['List']
-    memberScope = SubstitutingScope@128
-    nullable = 'false': Boolean@64
-    typeConstructor = DeserializedClassTypeConstructor@117
-}
-
-LazyJavaClassifierType@129['List<T>'] {
-    arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
-    classifier = JavaClassImpl@122['List']
-    memberScope = SubstitutingScope@132
-    nullable = 'true': Boolean@70
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@134['List<T>'] {
-    arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
-    classifier = JavaClassImpl@127['List']
-    memberScope = SubstitutingScope@137
-    nullable = 'true': Boolean@70
-    typeConstructor = DeserializedClassTypeConstructor@133
-}
-
-LazyJavaClassifierType@138['Object'] {
-    classifier = JavaClassImpl@139['Object']
-    typeConstructor = DeserializedClassTypeConstructor@140
-}
-
-LazyJavaClassifierType@141['Object'] {
-    classifier = JavaClassImpl@142['Object']
-    typeConstructor = DeserializedClassTypeConstructor@140
-}
-
-LazyJavaClassifierType@143['Object'] {
-    classifier = JavaClassImpl@144['Object']
-    typeConstructor = DeserializedClassTypeConstructor@140
-}
-
-LazyJavaClassifierType@46['RandomAccess'] {
-    classifier = JavaClassImpl@145['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@31['RandomAccess']
-}
-
-LazyJavaClassifierType@146['Serializable'] {
-    classifier = JavaClassImpl@147['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@33['Serializable']
-}
-
-LazyJavaClassifierType@148['T'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@150['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@152['T'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@154['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@155['T'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@157['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-}
-
-LazyJavaClassifierType@159['T'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@161['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@162['T'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@164['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-}
-
-LazyJavaClassifierType@165['T'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaTypeParameterImpl@167['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@169['T'] {
-    arguments = ArrayList@170[empty]
-    classifier = JavaTypeParameterImpl@171['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@172['T'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@174['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@175['T'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaTypeParameterImpl@177['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@178['T'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@180['T']
-    nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@181['T'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@157['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-}
-
-LazyJavaClassifierType@183['T'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@150['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@185['T'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@164['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-}
-
-LazyJavaClassifierType@187['T'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@161['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@189['T'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@177['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@191['T'] {
-    arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@180['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@193['T'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@171['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaClassifierType@195['T'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@174['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@197['T'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@167['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-}
-
-LazyJavaClassifierType@199['T'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@154['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-}
-
-LazyJavaPackageFragmentProvider@201 {
-    packageFragments('<root>': FqName@202) = LazyJavaPackageFragment@203['<root>']
-    packageFragments('Collections': FqName@204) = null
-    packageFragments('Comparable': FqName@205) = null
-    packageFragments('List': FqName@206) = null
-    packageFragments('MutableList': FqName@207) = null
-    packageFragments('T': FqName@208) = null
-    packageFragments('java': FqName@209) = LazyJavaPackageFragment@210['java']
-    packageFragments('java.io': FqName@211) = LazyJavaPackageFragment@212['io']
-    packageFragments('java.lang': FqName@213) = LazyJavaPackageFragment@214['lang']
-    packageFragments('java.lang.Collections': FqName@215) = null
-    packageFragments('java.lang.Comparable': FqName@216) = null
-    packageFragments('java.lang.List': FqName@217) = null
-    packageFragments('java.lang.MutableList': FqName@218) = null
-    packageFragments('java.lang.T': FqName@219) = null
-    packageFragments('java.util': FqName@220) = LazyJavaPackageFragment@221['util']
-    packageFragments('java.util.Collections': FqName@222) = null
-    packageFragments('java.util.Comparable': FqName@223) = null
-    packageFragments('java.util.List': FqName@224) = null
-    packageFragments('java.util.MutableList': FqName@225) = null
-    packageFragments('java.util.T': FqName@226) = null
-    packageFragments('kotlin': FqName@227) = null
-    packageFragments('kotlin.Collections': FqName@228) = null
-    packageFragments('kotlin.Comparable': FqName@229) = null
-    packageFragments('kotlin.List': FqName@230) = null
-    packageFragments('kotlin.MutableList': FqName@231) = null
-    packageFragments('kotlin.T': FqName@232) = null
-    packageFragments('kotlin.io': FqName@233) = null
-    packageFragments('kotlin.jvm': FqName@234) = null
-    topLevelClasses(JavaClassImpl@52['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@55['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@235['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@236['Collections']) = LazyJavaClassDescriptor@12['Collections']
-    topLevelClasses(JavaClassImpl@86['Comparator']) = LazyJavaClassDescriptor@26['Comparator']
-    topLevelClasses(JavaClassImpl@237['List']) = LazyJavaClassDescriptor@238['List']
-    topLevelClasses(JavaClassImpl@145['RandomAccess']) = LazyJavaClassDescriptor@30['RandomAccess']
-    topLevelClasses(JavaClassImpl@147['Serializable']) = LazyJavaClassDescriptor@32['Serializable']
-}
-
-LazyJavaPackageFragment@203['<root>'] {
-    classes('ArrayList': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('Collections': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('Comparable': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('List': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('MutableList': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('java': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@240
-    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    functions('java': Name@247) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@240
-}
-
-LazyJavaPackageFragment@210['java'] {
-    classes('lang': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@250
-    classes('util': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@250
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@250
-    functions('lang': Name@252) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@250
-    functions('util': Name@253) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@250
-    memberIndex = computeMemberIndex$1@254 // through LazyPackageFragmentScopeForJavaPackage@250
-}
-
-LazyJavaPackageFragment@214['lang'] {
-    classes('ArrayList': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@255
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@255
-    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@255
-    memberIndex = computeMemberIndex$1@256 // through LazyPackageFragmentScopeForJavaPackage@255
-}
-
-LazyJavaPackageFragment@221['util'] {
-    classes('ArrayList': Name@239) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('Collections': Name@241) = LazyJavaClassDescriptor@12['Collections'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('Comparable': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('List': Name@243) = LazyJavaClassDescriptor@238['List'] // through LazyPackageFragmentScopeForJavaPackage@257
-    classes('MutableList': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@257
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@257
-    functions('ArrayList': Name@239) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@257
-    memberIndex = computeMemberIndex$1@258 // through LazyPackageFragmentScopeForJavaPackage@257
-}
-
-LazyJavaTypeParameterDescriptor@42['E'] {
-    defaultType = JetTypeImpl@259['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-    upperBounds = LinkedHashSet@260[1] { NullableType@261 }
-}
-
-LazyJavaTypeParameterDescriptor@37['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
-}
-
-LazyJavaTypeParameterDescriptor@262['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
-    upperBounds = LinkedHashSet@263[1] { DelegatingFlexibleType@264 }
-    upperBoundsAsType = DelegatingFlexibleType@264
-}
-
-LazyJavaTypeParameterDescriptor@265['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@168
-    upperBounds = LinkedHashSet@266[1] { NullableType@267 }
-    upperBoundsAsType = NullableType@267
-}
-
-LazyJavaTypeParameterDescriptor@50['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@158
-    upperBounds = LinkedHashSet@268[1] { NullableType@269 }
-    upperBoundsAsType = NullableType@269
-}
-
-LazyJavaTypeParameterResolver@270 {
-    resolve(JavaTypeParameterImpl@104['E']) = LazyJavaTypeParameterDescriptor@37['E']
-}
-
-LazyJavaTypeParameterResolver@271 {
-    resolve(JavaTypeParameterImpl@272['E']) = LazyJavaTypeParameterDescriptor@42['E']
-}
-
-LazyJavaTypeParameterResolver@273 {
-    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@50['T']
-}
-
-LazyJavaTypeParameterResolver@275 {
-    resolve(JavaTypeParameterImpl@276['T']) = LazyJavaTypeParameterDescriptor@265['T']
-}
-
-LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@278['T']) = LazyJavaTypeParameterDescriptor@262['T']
-}
-
-LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@157['T']) = null
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@282 }
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = ArrayList@284[2] { ResolutionCandidate@285, ResolutionCandidate@286 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[3] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@282 }
-    <name not found> = ArrayList@294[3] { ResolutionCandidate@285, ResolutionCandidate@286, ResolutionCandidate@295 }
-    <name not found> = ArrayList@296[3] { ResolutionCandidate@289, ResolutionCandidate@290, ResolutionCandidate@291 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
deleted file mode 100644
index 4d811a4d253..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
deleted file mode 100644
index 55f3e47ee47..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kt352': FqName@22) = null
-    packageFragments('kt352.A': FqName@23) = null
-    packageFragments('kt352.Any': FqName@24) = null
-    packageFragments('kt352.Int': FqName@25) = null
-    packageFragments('kt352.String': FqName@26) = null
-    packageFragments('kt352.Unit': FqName@27) = null
-    packageFragments('kt352.f': FqName@28) = null
-    packageFragments('kt352.g': FqName@29) = null
-    packageFragments('kt352.h': FqName@30) = null
-    packageFragments('kt352.testIt': FqName@31) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('doSmth': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('doSmth': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@57[2] { ResolutionCandidate@49, ResolutionCandidate@50 }
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
deleted file mode 100644
index b1866fac31e..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
+++ /dev/null
@@ -1,112 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-null {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
deleted file mode 100644
index 5698c968a46..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
+++ /dev/null
@@ -1,53 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Any': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('p': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('p': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('p': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('p': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
deleted file mode 100644
index 0dc021ee345..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
+++ /dev/null
@@ -1,96 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Test': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Test': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Test': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Test': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('init': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('Test': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('init': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('Test': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('init': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Test': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('init': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
deleted file mode 100644
index 713f036db88..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Unit': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
deleted file mode 100644
index 83493452d50..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
+++ /dev/null
@@ -1,604 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaClassDescriptor@4['Appendable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassDescriptor@10['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@14['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassDescriptor@18['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@22['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
-}
-
-LazyJavaClassDescriptor@26['PrintStream'] {
-    defaultType = JetTypeImpl@27['PrintStream']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
-    functions('println': Name@30) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
-    nestedClasses('println': Name@30) = null // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassDescriptor@39['System'] {
-    enumEntryIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaStaticClassScope@44
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@41
-    nestedClasses('out': Name@46) = null // through LazyJavaClassMemberScope@41
-    properties('out': Name@46) = ArrayList@47[1] { JavaPropertyDescriptor@48['out'] } // through LazyJavaStaticClassScope@44
-    properties('out': Name@46) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@49['System']
-}
-
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    parameters = ArrayList@50[empty]
-    supertypes = ArrayList@51[1] { JetTypeImpl@52['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    parameters = ArrayList@53[empty]
-    supertypes = ArrayList@54[1] { JetTypeImpl@52['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Closeable'] {
-    parameters = ArrayList@55[empty]
-    supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
-    parameters = ArrayList@58[empty]
-    supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@25['OutputStream'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@38['PrintStream'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[3] { LazyJavaClassifierType@66['FilterOutputStream'], LazyJavaClassifierType@67['Appendable'], LazyJavaClassifierType@68['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@49['System'] {
-    supertypes = ArrayList@69[1] { JetTypeImpl@52['Any'] }
-}
-
-LazyJavaClassifierType@67['Appendable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Appendable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassifierType@57['AutoCloseable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassifierType@68['Closeable'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassifierType@63['Closeable'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
-}
-
-LazyJavaClassifierType@66['FilterOutputStream'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@79['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
-}
-
-LazyJavaClassifierType@80['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@81
-}
-
-LazyJavaClassifierType@82['Object'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@84['Object']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@87['Object'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@84['Object']
-    nullable = 'true': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@94['Object'] {
-    classifier = JavaClassImpl@95['Object']
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@96['Object'] {
-    classifier = JavaClassImpl@97['Object']
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@60['OutputStream'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['OutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
-}
-
-LazyJavaClassifierType@100['PrintStream'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['PrintStream']
-    memberScope = LazyJavaClassMemberScope@29
-    nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassifierType@103['PrintStream'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@102['PrintStream']
-    nullable = 'true': Boolean@89
-    typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
-}
-
-LazyJavaClassifierType@105['String'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['String']
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@109['String'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@107['String']
-    nullable = 'true': Boolean@89
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaPackageFragmentProvider@111 {
-    packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
-    packageFragments('Array': FqName@114) = null
-    packageFragments('Int': FqName@115) = null
-    packageFragments('Iterable': FqName@116) = null
-    packageFragments('Iterator': FqName@117) = null
-    packageFragments('Long': FqName@118) = null
-    packageFragments('String': FqName@119) = null
-    packageFragments('System': FqName@120) = null
-    packageFragments('T': FqName@121) = null
-    packageFragments('Unit': FqName@122) = null
-    packageFragments('inline': FqName@123) = null
-    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
-    packageFragments('java.io': FqName@126) = LazyJavaPackageFragment@127['io']
-    packageFragments('java.lang': FqName@128) = LazyJavaPackageFragment@129['lang']
-    packageFragments('java.lang.Array': FqName@130) = null
-    packageFragments('java.lang.Int': FqName@131) = null
-    packageFragments('java.lang.Iterable': FqName@132) = null
-    packageFragments('java.lang.Iterator': FqName@133) = null
-    packageFragments('java.lang.Long': FqName@134) = null
-    packageFragments('java.lang.String': FqName@135) = null
-    packageFragments('java.lang.System': FqName@136) = null
-    packageFragments('java.lang.T': FqName@137) = null
-    packageFragments('java.lang.Unit': FqName@138) = null
-    packageFragments('java.lang.inline': FqName@139) = null
-    packageFragments('java.util': FqName@140) = LazyJavaPackageFragment@141['util']
-    packageFragments('java.util.Array': FqName@142) = null
-    packageFragments('java.util.Int': FqName@143) = null
-    packageFragments('java.util.Iterable': FqName@144) = null
-    packageFragments('java.util.Iterator': FqName@145) = null
-    packageFragments('java.util.Long': FqName@146) = null
-    packageFragments('java.util.String': FqName@147) = null
-    packageFragments('java.util.System': FqName@148) = null
-    packageFragments('java.util.T': FqName@149) = null
-    packageFragments('java.util.Unit': FqName@150) = null
-    packageFragments('java.util.inline': FqName@151) = null
-    packageFragments('kotlin': FqName@152) = null
-    packageFragments('kotlin.Array': FqName@153) = null
-    packageFragments('kotlin.Int': FqName@154) = null
-    packageFragments('kotlin.Iterable': FqName@155) = null
-    packageFragments('kotlin.Iterator': FqName@156) = null
-    packageFragments('kotlin.Long': FqName@157) = null
-    packageFragments('kotlin.String': FqName@158) = null
-    packageFragments('kotlin.System': FqName@159) = null
-    packageFragments('kotlin.T': FqName@160) = null
-    packageFragments('kotlin.Unit': FqName@161) = null
-    packageFragments('kotlin.inline': FqName@162) = null
-    packageFragments('kotlin.io': FqName@163) = null
-    packageFragments('kotlin.jvm': FqName@164) = null
-    topLevelClasses(JavaClassImpl@71['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@73['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
-    topLevelClasses(JavaClassImpl@79['FilterOutputStream']) = LazyJavaClassDescriptor@18['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@165['Iterator']) = LazyJavaClassDescriptor@166['Iterator']
-    topLevelClasses(JavaClassImpl@99['OutputStream']) = LazyJavaClassDescriptor@22['OutputStream']
-    topLevelClasses(JavaClassImpl@102['PrintStream']) = LazyJavaClassDescriptor@26['PrintStream']
-    topLevelClasses(JavaClassImpl@167['System']) = LazyJavaClassDescriptor@39['System']
-}
-
-LazyJavaPackageFragment@113['<root>'] {
-    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Iterator': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('inline': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('java': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('java': Name@190) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@169
-}
-
-LazyJavaPackageFragment@125['java'] {
-    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('util': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('lang': Name@195) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('util': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@129['lang'] {
-    classes('System': Name@175) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@198
-}
-
-LazyJavaPackageFragment@141['util'] {
-    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Iterator': Name@172) = LazyJavaClassDescriptor@166['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('inline': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@201 // through LazyPackageFragmentScopeForJavaPackage@200
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[4] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@303[10] { ResolutionCandidate@204, ResolutionCandidate@205, ResolutionCandidate@206, ... }
-    <name not found> = ArrayList@304[10] { ResolutionCandidate@209, ResolutionCandidate@210, ResolutionCandidate@211, ... }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@330[2] { ResolutionCandidate@289, ResolutionCandidate@290 }
-    <name not found> = ArrayList@331[4] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295, ... }
-    <name not found> = ArrayList@332[4] { ResolutionCandidate@298, ResolutionCandidate@299, ResolutionCandidate@300, ... }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
deleted file mode 100644
index 3cbec9e210b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
+++ /dev/null
@@ -1,77 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('X': FqName@3) = null
-    packageFragments('Y': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Y': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Y': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Y': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('Y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('Y': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
deleted file mode 100644
index e304b489fb6..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
+++ /dev/null
@@ -1,100 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Function1<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('X': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('X': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('X': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('X': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('X': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
deleted file mode 100644
index ce4263eb948..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
+++ /dev/null
@@ -1,89 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('Function1': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Boolean': FqName@13) = null
-    packageFragments('java.lang.Function1': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Boolean': FqName@19) = null
-    packageFragments('kotlin.Function1': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Boolean': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Function1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('getSameTypeChecker': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('getSameTypeChecker': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('getSameTypeChecker': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('getSameTypeChecker': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
deleted file mode 100644
index 5625e6bad2b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Boolean': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.Boolean': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kt402': FqName@22) = null
-    packageFragments('kt402.Any': FqName@23) = null
-    packageFragments('kt402.Boolean': FqName@24) = null
-    packageFragments('kt402.String': FqName@25) = null
-    packageFragments('kt402.T': FqName@26) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('T': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
deleted file mode 100644
index aa657d5241d..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('kt41': FqName@12) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('aaa': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('aaa': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
deleted file mode 100644
index b1aba235f7a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt411': FqName@16) = null
-    packageFragments('kt411.Int': FqName@17) = null
-    packageFragments('kt411.String': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('invoker': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoker': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
deleted file mode 100644
index bbaadc5ba8b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['inline']
-    valueArguments(ValueParameterDescriptorImpl@3['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Array': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('inline': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Array': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.inline': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Array': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.inline': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('inline': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('body': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run1': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('run1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('body': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('run1': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
deleted file mode 100644
index 65b66c08dcb..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
+++ /dev/null
@@ -1,176 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.T': FqName@15) = null
-    packageFragments('java.lang.Unit': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.Unit': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Unit': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('funny': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('funny2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('gen': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('generic_invoker': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('f': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('funny': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('funny2': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('gen': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('generic_invoker': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('funny': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('funny2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('gen': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('generic_invoker': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('f': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('funny': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('funny2': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('gen': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('generic_invoker': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('plus': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[8] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-null {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@103[8] { ResolutionCandidate@87, ResolutionCandidate@88, ResolutionCandidate@89, ... }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
deleted file mode 100644
index dcf36c9765a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('M': FqName@6) = null
-    packageFragments('N': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.M': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.M': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@64[8] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = ArrayList@65[8] { ResolutionCandidate@46, ResolutionCandidate@47, ResolutionCandidate@48, ... }
-    <name not found> = ArrayList@66[8] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
deleted file mode 100644
index 39e1c2438ca..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt455': FqName@13) = null
-    packageFragments('kt455.Int': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('doSmth': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('doSmth': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
deleted file mode 100644
index 00a4c884a64..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt456': FqName@13) = null
-    packageFragments('kt456.A': FqName@14) = null
-    packageFragments('kt456.B': FqName@15) = null
-    packageFragments('kt456.C': FqName@16) = null
-    packageFragments('kt456.Int': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('doSmth': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('doSmth': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
deleted file mode 100644
index 053872f4daf..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
+++ /dev/null
@@ -1,384 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractMap'] {
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
-}
-
-LazyJavaClassDescriptor@6['HashMap'] {
-    constructors = ArrayList@7[4] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], ... } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@11
-    functionTypeForSamInterface = null
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@11
-    nestedClassIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@11
-    nestedClasses('set': Name@1) = null // through LazyJavaClassMemberScope@11
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@16['HashMap']
-}
-
-LazyJavaClassDescriptor@17['Serializable'] {
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('set': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
-}
-
-LazyJavaClassTypeConstructor@5['AbstractMap'] {
-    parameters = ArrayList@21[2] { LazyJavaTypeParameterDescriptor@22['K'], LazyJavaTypeParameterDescriptor@23['V'] }
-    supertypes = ArrayList@24[1] { LazyJavaClassifierType@25['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@16['HashMap'] {
-    parameters = ArrayList@26[2] { LazyJavaTypeParameterDescriptor@27['K'], LazyJavaTypeParameterDescriptor@28['V'] }
-    supertypes = ArrayList@29[4] { LazyJavaClassifierType@30['AbstractMap<K, V>'], LazyJavaClassifierType@31['Map<K, V>'], LazyJavaClassifierType@32['Cloneable'], ... }
-}
-
-LazyJavaClassTypeConstructor@20['Serializable'] {
-    parameters = ArrayList@33[empty]
-    supertypes = ArrayList@34[1] { JetTypeImpl@35['Any'] }
-}
-
-LazyJavaClassifierType@30['AbstractMap<K, V>'] {
-    arguments = ArrayList@36[2] { TypeProjectionImpl@37, TypeProjectionImpl@38 }
-    classifier = JavaClassImpl@39['AbstractMap']
-    memberScope = SubstitutingScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractMap']
-}
-
-LazyJavaClassifierType@32['Cloneable'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@42['Cloneable']
-    memberScope = DeserializedClassMemberScope@43
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['K'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@47['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@52['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@63['K'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@59['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@66['K'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@52['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@68['K'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@47['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@72['K'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-}
-
-LazyJavaClassifierType@74['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@75[2] { TypeProjectionImpl@76, TypeProjectionImpl@77 }
-    classifier = JavaClassImpl@78['Map']
-    memberScope = SubstitutingScope@79
-    nullable = 'false': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@81['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@82[2] { TypeProjectionImpl@83, TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@78['Map']
-    memberScope = SubstitutingScope@85
-    nullable = 'true': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@25['Map<K, V>'] {
-    arguments = ArrayList@87[2] { TypeProjectionImpl@88, TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@90['Map']
-    memberScope = SubstitutingScope@91
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@31['Map<K, V>'] {
-    arguments = ArrayList@92[2] { TypeProjectionImpl@93, TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@95['Map']
-    memberScope = SubstitutingScope@96
-    typeConstructor = DeserializedClassTypeConstructor@80
-}
-
-LazyJavaClassifierType@97['Object'] {
-    classifier = JavaClassImpl@98['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@100['Object'] {
-    classifier = JavaClassImpl@101['Object']
-    typeConstructor = DeserializedClassTypeConstructor@99
-}
-
-LazyJavaClassifierType@102['Serializable'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['Serializable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Serializable']
-}
-
-LazyJavaClassifierType@105['V'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@109['V'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@112['V'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@115['V'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@119['V'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@121['V']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@122['V'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@111['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@124['V'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@107['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@126['V'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@117['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@128['V'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@114['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@130['V'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@121['V']
-    nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaPackageFragmentProvider@132 {
-    packageFragments('<root>': FqName@133) = LazyJavaPackageFragment@134['<root>']
-    packageFragments('K': FqName@135) = null
-    packageFragments('Map': FqName@136) = null
-    packageFragments('String': FqName@137) = null
-    packageFragments('V': FqName@138) = null
-    packageFragments('java': FqName@139) = LazyJavaPackageFragment@140['java']
-    packageFragments('java.io': FqName@141) = LazyJavaPackageFragment@142['io']
-    packageFragments('java.lang': FqName@143) = LazyJavaPackageFragment@144['lang']
-    packageFragments('java.lang.K': FqName@145) = null
-    packageFragments('java.lang.Map': FqName@146) = null
-    packageFragments('java.lang.String': FqName@147) = null
-    packageFragments('java.lang.V': FqName@148) = null
-    packageFragments('java.util': FqName@149) = LazyJavaPackageFragment@150['util']
-    packageFragments('java.util.HashMap': FqName@151) = null
-    packageFragments('kotlin': FqName@152) = null
-    packageFragments('kotlin.K': FqName@153) = null
-    packageFragments('kotlin.Map': FqName@154) = null
-    packageFragments('kotlin.String': FqName@155) = null
-    packageFragments('kotlin.V': FqName@156) = null
-    packageFragments('kotlin.io': FqName@157) = null
-    packageFragments('kotlin.jvm': FqName@158) = null
-    topLevelClasses(JavaClassImpl@39['AbstractMap']) = LazyJavaClassDescriptor@0['AbstractMap']
-    topLevelClasses(JavaClassImpl@159['HashMap']) = LazyJavaClassDescriptor@6['HashMap']
-    topLevelClasses(JavaClassImpl@104['Serializable']) = LazyJavaClassDescriptor@17['Serializable']
-}
-
-LazyJavaPackageFragment@134['<root>'] {
-    classes('Map': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('String': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('java': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@161
-}
-
-LazyJavaPackageFragment@140['java'] {
-    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('util': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('lang': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@167
-}
-
-LazyJavaPackageFragment@144['lang'] {
-    classes('java': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('set': Name@1) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('set': Name@1) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@171
-}
-
-LazyJavaPackageFragment@150['util'] {
-    classes('HashMap': Name@173) = LazyJavaClassDescriptor@6['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@174
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('HashMap': Name@175) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@174
-}
-
-LazyJavaTypeParameterDescriptor@27['K'] {
-    defaultType = JetTypeImpl@177['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@178[1] { NullableType@179 }
-}
-
-LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-LazyJavaTypeParameterDescriptor@28['V'] {
-    defaultType = JetTypeImpl@180['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@181[1] { NullableType@182 }
-}
-
-LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaTypeParameterResolver@183 {
-    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@23['V']
-}
-
-LazyJavaTypeParameterResolver@186 {
-    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@28['V']
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@204[4] { ResolutionCandidate@197, ResolutionCandidate@198, ResolutionCandidate@199, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
deleted file mode 100644
index aaa4fd27c59..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
+++ /dev/null
@@ -1,557 +0,0 @@
-LazyJavaClassDescriptor@0['Appendable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassDescriptor@6['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@10['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassDescriptor@14['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@18['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
-}
-
-LazyJavaClassDescriptor@22['PrintStream'] {
-    defaultType = JetTypeImpl@23['PrintStream']
-    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@25
-    functions('println': Name@26) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
-    nestedClasses('println': Name@26) = null // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassDescriptor@35['System'] {
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaStaticClassScope@40
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@37
-    nestedClasses('out': Name@42) = null // through LazyJavaClassMemberScope@37
-    properties('out': Name@42) = ArrayList@43[1] { JavaPropertyDescriptor@44['out'] } // through LazyJavaStaticClassScope@40
-    properties('out': Name@42) = EmptyList@2[empty] // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@45['System']
-}
-
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    parameters = ArrayList@46[empty]
-    supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    parameters = ArrayList@49[empty]
-    supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@21['OutputStream'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@34['PrintStream'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[3] { LazyJavaClassifierType@62['FilterOutputStream'], LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@45['System'] {
-    supertypes = ArrayList@65[1] { JetTypeImpl@48['Any'] }
-}
-
-LazyJavaClassifierType@63['Appendable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Appendable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassifierType@53['AutoCloseable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassifierType@64['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@59['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@62['FilterOutputStream'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@75['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassifierType@76['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@77
-}
-
-LazyJavaClassifierType@78['Object'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['Object']
-    nullable = 'false': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@83['Object'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@80['Object']
-    nullable = 'true': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@56['OutputStream'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['OutputStream']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
-}
-
-LazyJavaClassifierType@96['PrintStream'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['PrintStream']
-    memberScope = LazyJavaClassMemberScope@25
-    nullable = 'false': Boolean@81
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassifierType@99['PrintStream'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@98['PrintStream']
-    nullable = 'true': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
-}
-
-LazyJavaClassifierType@101['String'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'false': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@105['String'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'true': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaPackageFragmentProvider@107 {
-    packageFragments('<root>': FqName@108) = LazyJavaPackageFragment@109['<root>']
-    packageFragments('Int': FqName@110) = null
-    packageFragments('MutableList': FqName@111) = null
-    packageFragments('MyNumber': FqName@112) = null
-    packageFragments('System': FqName@113) = null
-    packageFragments('T': FqName@114) = null
-    packageFragments('java': FqName@115) = LazyJavaPackageFragment@116['java']
-    packageFragments('java.io': FqName@117) = LazyJavaPackageFragment@118['io']
-    packageFragments('java.lang': FqName@119) = LazyJavaPackageFragment@120['lang']
-    packageFragments('java.lang.Int': FqName@121) = null
-    packageFragments('java.lang.MutableList': FqName@122) = null
-    packageFragments('java.lang.MyNumber': FqName@123) = null
-    packageFragments('java.lang.System': FqName@124) = null
-    packageFragments('java.lang.T': FqName@125) = null
-    packageFragments('java.util': FqName@126) = LazyJavaPackageFragment@127['util']
-    packageFragments('java.util.Int': FqName@128) = null
-    packageFragments('java.util.MutableList': FqName@129) = null
-    packageFragments('java.util.MyNumber': FqName@130) = null
-    packageFragments('java.util.System': FqName@131) = null
-    packageFragments('java.util.T': FqName@132) = null
-    packageFragments('kotlin': FqName@133) = null
-    packageFragments('kotlin.Int': FqName@134) = null
-    packageFragments('kotlin.MutableList': FqName@135) = null
-    packageFragments('kotlin.MyNumber': FqName@136) = null
-    packageFragments('kotlin.System': FqName@137) = null
-    packageFragments('kotlin.T': FqName@138) = null
-    packageFragments('kotlin.io': FqName@139) = null
-    packageFragments('kotlin.jvm': FqName@140) = null
-    packageFragments('kt469': FqName@141) = null
-    packageFragments('kt469.Int': FqName@142) = null
-    packageFragments('kt469.MutableList': FqName@143) = null
-    packageFragments('kt469.MyNumber': FqName@144) = null
-    packageFragments('kt469.System': FqName@145) = null
-    packageFragments('kt469.T': FqName@146) = null
-    topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
-    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@18['OutputStream']
-    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@22['PrintStream']
-    topLevelClasses(JavaClassImpl@147['System']) = LazyJavaClassDescriptor@35['System']
-}
-
-LazyJavaPackageFragment@116['java'] {
-    classes('lang': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('util': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('lang': Name@152) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('util': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@149
-}
-
-LazyJavaPackageFragment@120['lang'] {
-    classes('MyNumber': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('System': Name@157) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('add': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('i': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('minus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('minusAssign': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('plus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('plusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('MyNumber': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('add': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('minus': Name@160) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('minusAssign': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('plus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('plusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@156
-}
-
-LazyJavaPackageFragment@127['util'] {
-    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('MutableList': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('MyNumber': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('System': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('add': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('i': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('minus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('minusAssign': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('plus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('plusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('MyNumber': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('add': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('minus': Name@160) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('minusAssign': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('plus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('plusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[10] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[2] { ResolutionCandidate@239, ResolutionCandidate@240 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[7] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@254[10] { ResolutionCandidate@171, ResolutionCandidate@172, ResolutionCandidate@173, ... }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@276[2] { ResolutionCandidate@239, ResolutionCandidate@240 }
-    <name not found> = ArrayList@277[7] { ResolutionCandidate@243, ResolutionCandidate@244, ResolutionCandidate@245, ... }
-    <name not found> = ArrayList@278[8] { ResolutionCandidate@248, ResolutionCandidate@249, ResolutionCandidate@250, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
deleted file mode 100644
index 803d9d105a8..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
+++ /dev/null
@@ -1,123 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('TestInterface': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.TestInterface': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.TestInterface': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('TestInterface': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('TestInterface': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('TestInterface': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('TestInterface': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
deleted file mode 100644
index 0c152da9497..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
+++ /dev/null
@@ -1,331 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    defaultType = JetTypeImpl@3['Class<1>']
-    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
-}
-
-LazyJavaClassDescriptor@5['Exception'] {
-    allDescriptors = ArrayList@6[6] { DeserializedSimpleFunctionDescriptor@7['hashCode'], DeserializedSimpleFunctionDescriptor@8['getMessage'], DeserializedSimpleFunctionDescriptor@9['printStackTrace'], ... } // through LazyJavaClassMemberScope@10
-    constructors = ArrayList@11[5] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], ... } // through LazyJavaClassMemberScope@10
-    defaultType = JetTypeImpl@15['Exception']
-    enumEntryIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@10
-    functions('addSuppressed': Name@17) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('clone': Name@19) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('equals': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['equals'] } // through LazyJavaClassMemberScope@10
-    functions('fillInStackTrace': Name@23) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('finalize': Name@24) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getCause': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['getCause'] } // through LazyJavaClassMemberScope@10
-    functions('getClass': Name@28) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getLocalizedMessage': Name@29) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getMessage': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@8['getMessage'] } // through LazyJavaClassMemberScope@10
-    functions('getOurStackTrace': Name@32) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getStackTrace': Name@33) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getStackTraceDepth': Name@34) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getStackTraceElement': Name@35) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('getSuppressed': Name@36) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('hashCode': Name@37) = ArrayList@38[1] { DeserializedSimpleFunctionDescriptor@7['hashCode'] } // through LazyJavaClassMemberScope@10
-    functions('initCause': Name@39) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('notify': Name@40) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('notifyAll': Name@41) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('printEnclosedStackTrace': Name@42) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('printStackTrace': Name@43) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@9['printStackTrace'] } // through LazyJavaClassMemberScope@10
-    functions('readObject': Name@45) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('setStackTrace': Name@46) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('toString': Name@47) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['toString'] } // through LazyJavaClassMemberScope@10
-    functions('wait': Name@50) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    functions('writeObject': Name@51) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@10
-    properties('backtrace': Name@54) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    properties('cause': Name@55) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    properties('detailMessage': Name@56) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    properties('stackTrace': Name@57) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    properties('suppressedExceptions': Name@58) = EmptyList@18[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@59['Exception']
-}
-
-LazyJavaClassDescriptor@60['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@62['Object'] {
-    defaultType = JetTypeImpl@63['Object']
-    enumEntryIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@65
-    functions('getClass': Name@66) = ArrayList@67[1] { JavaMethodDescriptor@68['getClass'] } // through LazyJavaClassMemberScope@65
-    memberIndex = computeMemberIndex$1@69 // through LazyJavaClassMemberScope@65
-    nestedClassIndex = LinkedHashMap@70 // through LazyJavaClassMemberScope@65
-    nestedClasses('getClass': Name@66) = null // through LazyJavaClassMemberScope@65
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@71['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@72['Object']
-}
-
-LazyJavaClassDescriptor@73['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
-}
-
-LazyJavaClassDescriptor@75['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@76['Type']
-}
-
-LazyJavaClassTypeConstructor@1['AnnotatedElement'] {
-    supertypes = ArrayList@77[1] { JetTypeImpl@78['Any'] }
-}
-
-LazyJavaClassTypeConstructor@4['Class'] {
-    parameters = ArrayList@79[1] { LazyJavaTypeParameterDescriptor@80['T'] }
-    supertypes = ArrayList@81[4] { LazyJavaClassifierType@82['Serializable'], LazyJavaClassifierType@83['GenericDeclaration'], LazyJavaClassifierType@84['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@59['Exception'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@61['GenericDeclaration'] {
-    supertypes = ArrayList@88[1] { JetTypeImpl@78['Any'] }
-}
-
-LazyJavaClassTypeConstructor@72['Object'] {
-    parameters = ArrayList@89[empty]
-    supertypes = ArrayList@90[1] { JetTypeImpl@78['Any'] }
-}
-
-LazyJavaClassTypeConstructor@74['Serializable'] {
-    supertypes = ArrayList@91[1] { JetTypeImpl@78['Any'] }
-}
-
-LazyJavaClassTypeConstructor@76['Type'] {
-    supertypes = ArrayList@92[1] { JetTypeImpl@78['Any'] }
-}
-
-LazyJavaClassifierType@93['AnnotatedElement'] {
-    classifier = JavaClassImpl@94['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassifierType@95['Class<?>'] {
-    arguments = ArrayList@96[1] { LazyStarProjection@97 }
-    classifier = JavaClassImpl@98['Class']
-    nullable = 'false': Boolean@99
-    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
-}
-
-LazyJavaClassifierType@100['Class<?>'] {
-    arguments = ArrayList@101[1] { LazyStarProjection@102 }
-    classifier = JavaClassImpl@98['Class']
-    nullable = 'true': Boolean@103
-    typeConstructor = LazyJavaClassTypeConstructor@4['Class']
-}
-
-LazyJavaClassifierType@83['GenericDeclaration'] {
-    classifier = JavaClassImpl@104['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@61['GenericDeclaration']
-}
-
-LazyJavaClassifierType@105['Object'] {
-    classifier = JavaClassImpl@106['Object']
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@108['Object'] {
-    classifier = JavaClassImpl@109['Object']
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@110['Object'] {
-    classifier = JavaClassImpl@111['Object']
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@112['Object'] {
-    classifier = JavaClassImpl@113['Object']
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@114['Object'] {
-    classifier = JavaClassImpl@115['Object']
-    typeConstructor = DeserializedClassTypeConstructor@107
-}
-
-LazyJavaClassifierType@82['Serializable'] {
-    classifier = JavaClassImpl@116['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@74['Serializable']
-}
-
-LazyJavaClassifierType@117['String'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@121['String'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@127['String'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@129['String'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@131['String'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@120
-}
-
-LazyJavaClassifierType@87['Throwable'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@134['Throwable']
-    memberScope = DeserializedClassMemberScope@135
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@137['Throwable'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@139['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@140['Throwable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@142['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@143['Throwable'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@145['Throwable']
-    nullable = 'false': Boolean@99
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@146['Throwable'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@145['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@148['Throwable'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@142['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@150['Throwable'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@139['Throwable']
-    nullable = 'true': Boolean@103
-    typeConstructor = DeserializedClassTypeConstructor@136
-}
-
-LazyJavaClassifierType@84['Type'] {
-    classifier = JavaClassImpl@152['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@76['Type']
-}
-
-LazyJavaPackageFragmentProvider@153 {
-    packageFragments('<root>': FqName@154) = LazyJavaPackageFragment@155['<root>']
-    packageFragments('Any': FqName@156) = null
-    packageFragments('Class': FqName@157) = null
-    packageFragments('Exception': FqName@158) = null
-    packageFragments('IdUnavailableException': FqName@159) = null
-    packageFragments('Object': FqName@160) = null
-    packageFragments('T': FqName@161) = null
-    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
-    packageFragments('java.io': FqName@164) = LazyJavaPackageFragment@165['io']
-    packageFragments('java.lang': FqName@166) = LazyJavaPackageFragment@167['lang']
-    packageFragments('java.lang.Any': FqName@168) = null
-    packageFragments('java.lang.Class': FqName@169) = null
-    packageFragments('java.lang.Exception': FqName@170) = null
-    packageFragments('java.lang.Object': FqName@171) = null
-    packageFragments('java.lang.T': FqName@172) = null
-    packageFragments('java.lang.reflect': FqName@173) = LazyJavaPackageFragment@174['reflect']
-    packageFragments('kotlin': FqName@175) = null
-    packageFragments('kotlin.Any': FqName@176) = null
-    packageFragments('kotlin.Class': FqName@177) = null
-    packageFragments('kotlin.Exception': FqName@178) = null
-    packageFragments('kotlin.Object': FqName@179) = null
-    packageFragments('kotlin.T': FqName@180) = null
-    packageFragments('kotlin.io': FqName@181) = null
-    packageFragments('kotlin.jvm': FqName@182) = null
-    topLevelClasses(JavaClassImpl@94['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@183['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@184['Exception']) = LazyJavaClassDescriptor@5['Exception']
-    topLevelClasses(JavaClassImpl@104['GenericDeclaration']) = LazyJavaClassDescriptor@60['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@185['Object']) = LazyJavaClassDescriptor@62['Object']
-    topLevelClasses(JavaClassImpl@116['Serializable']) = LazyJavaClassDescriptor@73['Serializable']
-    topLevelClasses(JavaClassImpl@152['Type']) = LazyJavaClassDescriptor@75['Type']
-}
-
-LazyJavaPackageFragment@155['<root>'] {
-    classes('Any': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('Class': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('Exception': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('Object': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@187
-}
-
-LazyJavaPackageFragment@163['java'] {
-    classes('lang': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    deserializedPackageScope = Empty@193 // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('lang': Name@194) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@192
-}
-
-LazyJavaPackageFragment@167['lang'] {
-    classes('Class': Name@188) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Exception': Name@189) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('Object': Name@190) = LazyJavaClassDescriptor@62['Object'] // through LazyPackageFragmentScopeForJavaPackage@196
-}
-
-LazyJavaTypeParameterDescriptor@80['T'] {
-    defaultType = JetTypeImpl@197['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@198
-    upperBounds = LinkedHashSet@199[1] { NullableType@200 }
-    upperBoundsAsType = NullableType@200
-}
-
-LazyJavaTypeParameterResolver@201 {
-    resolve(JavaTypeParameterImpl@202['T']) = LazyJavaTypeParameterDescriptor@80['T']
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[5] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-}
-
-null {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@212[5] { ResolutionCandidate@208, ResolutionCandidate@209, ResolutionCandidate@210, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
deleted file mode 100644
index 85d4936a3b0..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
+++ /dev/null
@@ -1,980 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@1['AbstractStringBuilder']
-    functions('append': Name@2) = ArrayList@3[13] { JavaMethodDescriptor@4['append'], JavaMethodDescriptor@5['append'], JavaMethodDescriptor@6['append'], ... } // through LazyJavaClassMemberScope@7
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@7
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassDescriptor@13['Appendable'] {
-    defaultType = JetTypeImpl@14['Appendable']
-    functions('append': Name@15) = ArrayList@16[3] { JavaMethodDescriptor@17['append'], JavaMethodDescriptor@18['append'], JavaMethodDescriptor@19['append'] } // through LazyJavaClassMemberScope@20
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@20
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassDescriptor@24['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@25['Exception']
-}
-
-LazyJavaClassDescriptor@26['NullPointerException'] {
-    constructors = ArrayList@27[2] { JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'] } // through LazyJavaClassMemberScope@30
-    defaultType = JetTypeImpl@31['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@32['NullPointerException']
-}
-
-LazyJavaClassDescriptor@33['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
-}
-
-LazyJavaClassDescriptor@35['Serializable'] {
-    functions('append': Name@2) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassDescriptor@39['StringBuffer'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassDescriptor@41['StringBuilder'] {
-    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
-    defaultType = JetTypeImpl@47['StringBuilder']
-    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
-    functionTypeForSamInterface = null
-    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@46
-    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@46
-    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
-    nestedClasses('sure1': Name@8) = null // through LazyJavaClassMemberScope@46
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@46
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@56['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassTypeConstructor@12['AbstractStringBuilder'] {
-    parameters = ArrayList@58[empty]
-    supertypes = ArrayList@59[2] { LazyJavaClassifierType@60['Appendable'], LazyJavaClassifierType@61['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@23['Appendable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@25['Exception'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { LazyJavaClassifierType@67['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@32['NullPointerException'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { LazyJavaClassifierType@70['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@34['RuntimeException'] {
-    parameters = ArrayList@71[empty]
-    supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@38['Serializable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@40['StringBuffer'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['AbstractStringBuilder'], LazyJavaClassifierType@79['Serializable'], LazyJavaClassifierType@80['CharSequence'] }
-}
-
-LazyJavaClassTypeConstructor@57['StringBuilder'] {
-    parameters = ArrayList@81[empty]
-    supertypes = ArrayList@82[3] { LazyJavaClassifierType@83['AbstractStringBuilder'], LazyJavaClassifierType@84['Serializable'], LazyJavaClassifierType@85['CharSequence'] }
-}
-
-LazyJavaClassifierType@83['AbstractStringBuilder'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@88['AbstractStringBuilder'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@92['AbstractStringBuilder'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@95['AbstractStringBuilder'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@98['AbstractStringBuilder'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@101['AbstractStringBuilder'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@104['AbstractStringBuilder'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@107['AbstractStringBuilder'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@110['AbstractStringBuilder'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@113['AbstractStringBuilder'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@116['AbstractStringBuilder'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@119['AbstractStringBuilder'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@122['AbstractStringBuilder'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@124['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@125['AbstractStringBuilder'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['AbstractStringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@128['AbstractStringBuilder'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@131['AbstractStringBuilder'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@127['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@133['AbstractStringBuilder'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@135['AbstractStringBuilder'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@137['AbstractStringBuilder'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@139['AbstractStringBuilder'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@141['AbstractStringBuilder'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@143['AbstractStringBuilder'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@145['AbstractStringBuilder'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@147['AbstractStringBuilder'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@149['AbstractStringBuilder'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@124['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@151['AbstractStringBuilder'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@153['AbstractStringBuilder'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@78['AbstractStringBuilder'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@156['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
-}
-
-LazyJavaClassifierType@60['Appendable'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@158['Appendable']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@159['Appendable'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@162['Appendable'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@164['Appendable']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@165['Appendable'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@167['Appendable']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@168['Appendable'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaClassImpl@164['Appendable']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@170['Appendable'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaClassImpl@161['Appendable']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@172['Appendable'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaClassImpl@167['Appendable']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
-}
-
-LazyJavaClassifierType@85['CharSequence'] {
-    arguments = ArrayList@174[empty]
-    classifier = JavaClassImpl@175['CharSequence']
-    memberScope = DeserializedClassMemberScope@176
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@61['CharSequence'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaClassImpl@179['CharSequence']
-    memberScope = DeserializedClassMemberScope@176
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@180['CharSequence'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@183['CharSequence'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@186['CharSequence'] {
-    arguments = ArrayList@187[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@189['CharSequence'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@192['CharSequence'] {
-    arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@195['CharSequence'] {
-    arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@197['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@198['CharSequence'] {
-    arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@200['CharSequence']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@201['CharSequence'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@182['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@203['CharSequence'] {
-    arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@191['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@205['CharSequence'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@194['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@207['CharSequence'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@197['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@209['CharSequence'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaClassImpl@188['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@211['CharSequence'] {
-    arguments = ArrayList@212[empty]
-    classifier = JavaClassImpl@200['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@213['CharSequence'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaClassImpl@185['CharSequence']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@80['CharSequence'] {
-    classifier = JavaClassImpl@215['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@177
-}
-
-LazyJavaClassifierType@73['Exception'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaClassImpl@217['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@25['Exception']
-}
-
-LazyJavaClassifierType@218['Object'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@220['Object']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@222['Object'] {
-    arguments = ArrayList@223[empty]
-    classifier = JavaClassImpl@224['Object']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@225['Object'] {
-    arguments = ArrayList@226[empty]
-    classifier = JavaClassImpl@224['Object']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@227['Object'] {
-    arguments = ArrayList@228[empty]
-    classifier = JavaClassImpl@220['Object']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@229['Object'] {
-    classifier = JavaClassImpl@230['Object']
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@231['Object'] {
-    classifier = JavaClassImpl@232['Object']
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@233['Object'] {
-    classifier = JavaClassImpl@234['Object']
-    typeConstructor = DeserializedClassTypeConstructor@221
-}
-
-LazyJavaClassifierType@70['RuntimeException'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaClassImpl@236['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
-}
-
-LazyJavaClassifierType@84['Serializable'] {
-    arguments = ArrayList@237[empty]
-    classifier = JavaClassImpl@238['Serializable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    classifier = JavaClassImpl@239['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
-}
-
-LazyJavaClassifierType@240['String'] {
-    arguments = ArrayList@241[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@244['String'] {
-    arguments = ArrayList@245[empty]
-    classifier = JavaClassImpl@246['String']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@247['String'] {
-    arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@249['String']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@250['String'] {
-    arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@252['String']
-    nullable = 'false': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@253['String'] {
-    arguments = ArrayList@254[empty]
-    classifier = JavaClassImpl@252['String']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@255['String'] {
-    arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@246['String']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@257['String'] {
-    arguments = ArrayList@258[empty]
-    classifier = JavaClassImpl@249['String']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@259['String'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaClassImpl@242['String']
-    nullable = 'true': Boolean@130
-    typeConstructor = DeserializedClassTypeConstructor@243
-}
-
-LazyJavaClassifierType@261['StringBuffer'] {
-    arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@263['StringBuffer']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@264['StringBuffer'] {
-    arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@266['StringBuffer']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@267['StringBuffer'] {
-    arguments = ArrayList@268[empty]
-    classifier = JavaClassImpl@266['StringBuffer']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@269['StringBuffer'] {
-    arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@263['StringBuffer']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
-}
-
-LazyJavaClassifierType@271['StringBuilder'] {
-    arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
-    memberScope = LazyJavaClassMemberScope@46
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@274['StringBuilder'] {
-    arguments = ArrayList@275[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@277['StringBuilder'] {
-    arguments = ArrayList@278[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@280['StringBuilder'] {
-    arguments = ArrayList@281[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@283['StringBuilder'] {
-    arguments = ArrayList@284[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@286['StringBuilder'] {
-    arguments = ArrayList@287[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@289['StringBuilder'] {
-    arguments = ArrayList@290[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@292['StringBuilder'] {
-    arguments = ArrayList@293[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@295['StringBuilder'] {
-    arguments = ArrayList@296[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@298['StringBuilder'] {
-    arguments = ArrayList@299[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@301['StringBuilder'] {
-    arguments = ArrayList@302[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@304['StringBuilder'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@307['StringBuilder'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@310['StringBuilder'] {
-    arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@312['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@313['StringBuilder'] {
-    arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@315['StringBuilder']
-    nullable = 'false': Boolean@91
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@316['StringBuilder'] {
-    arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@312['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@318['StringBuilder'] {
-    arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@320['StringBuilder'] {
-    arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@322['StringBuilder'] {
-    arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@324['StringBuilder'] {
-    arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@326['StringBuilder'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@328['StringBuilder'] {
-    arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@330['StringBuilder'] {
-    arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@332['StringBuilder'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@334['StringBuilder'] {
-    arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@336['StringBuilder'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@338['StringBuilder'] {
-    arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@340['StringBuilder'] {
-    arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@342['StringBuilder'] {
-    arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@315['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@344['StringBuilder'] {
-    arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
-    nullable = 'true': Boolean@130
-    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
-}
-
-LazyJavaClassifierType@67['Throwable'] {
-    arguments = ArrayList@346[empty]
-    classifier = JavaClassImpl@347['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@348
-}
-
-LazyJavaPackageFragmentProvider@349 {
-    packageFragments('<root>': FqName@350) = LazyJavaPackageFragment@351['<root>']
-    packageFragments('Any': FqName@352) = null
-    packageFragments('Array': FqName@353) = null
-    packageFragments('Int': FqName@354) = null
-    packageFragments('String': FqName@355) = null
-    packageFragments('StringBuilder': FqName@356) = null
-    packageFragments('StringBuilder.Any': FqName@357) = null
-    packageFragments('StringBuilder.Array': FqName@358) = null
-    packageFragments('StringBuilder.Int': FqName@359) = null
-    packageFragments('StringBuilder.String': FqName@360) = null
-    packageFragments('StringBuilder.StringBuilder': FqName@361) = null
-    packageFragments('StringBuilder.T': FqName@362) = null
-    packageFragments('StringBuilder.bd': FqName@363) = null
-    packageFragments('T': FqName@364) = null
-    packageFragments('java': FqName@365) = LazyJavaPackageFragment@366['java']
-    packageFragments('java.io': FqName@367) = LazyJavaPackageFragment@368['io']
-    packageFragments('java.lang': FqName@369) = LazyJavaPackageFragment@370['lang']
-    packageFragments('java.lang.Any': FqName@371) = null
-    packageFragments('java.lang.Array': FqName@372) = null
-    packageFragments('java.lang.Int': FqName@373) = null
-    packageFragments('java.lang.String': FqName@374) = null
-    packageFragments('java.lang.T': FqName@375) = null
-    packageFragments('kotlin': FqName@376) = null
-    packageFragments('kotlin.Any': FqName@377) = null
-    packageFragments('kotlin.Array': FqName@378) = null
-    packageFragments('kotlin.Int': FqName@379) = null
-    packageFragments('kotlin.String': FqName@380) = null
-    packageFragments('kotlin.T': FqName@381) = null
-    packageFragments('kotlin.io': FqName@382) = null
-    packageFragments('kotlin.jvm': FqName@383) = null
-    topLevelClasses(JavaClassImpl@87['AbstractStringBuilder']) = LazyJavaClassDescriptor@0['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@158['Appendable']) = LazyJavaClassDescriptor@13['Appendable']
-    topLevelClasses(JavaClassImpl@217['Exception']) = LazyJavaClassDescriptor@24['Exception']
-    topLevelClasses(JavaClassImpl@384['NullPointerException']) = LazyJavaClassDescriptor@26['NullPointerException']
-    topLevelClasses(JavaClassImpl@236['RuntimeException']) = LazyJavaClassDescriptor@33['RuntimeException']
-    topLevelClasses(JavaClassImpl@238['Serializable']) = LazyJavaClassDescriptor@35['Serializable']
-    topLevelClasses(JavaClassImpl@263['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
-    topLevelClasses(JavaClassImpl@385['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
-}
-
-LazyJavaPackageFragment@366['java'] {
-    classes('lang': Name@386) = null // through LazyPackageFragmentScopeForJavaPackage@387
-    deserializedPackageScope = Empty@388 // through LazyPackageFragmentScopeForJavaPackage@387
-    functions('lang': Name@389) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@387
-    memberIndex = computeMemberIndex$1@390 // through LazyPackageFragmentScopeForJavaPackage@387
-}
-
-LazyJavaPackageFragment@370['lang'] {
-    classes('NullPointerException': Name@391) = LazyJavaClassDescriptor@26['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@392
-    classes('StringBuilder': Name@393) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@392
-    classes('equals': Name@394) = null // through LazyPackageFragmentScopeForJavaPackage@392
-    classes('sure1': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@392
-    deserializedPackageScope = Empty@388 // through LazyPackageFragmentScopeForJavaPackage@392
-    functions('NullPointerException': Name@391) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
-    functions('StringBuilder': Name@395) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
-    functions('equals': Name@394) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
-    memberIndex = computeMemberIndex$1@396 // through LazyPackageFragmentScopeForJavaPackage@392
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[13] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@401, ... }
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@407 {
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@409 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@412 }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[1] { ResolutionCandidate@415 }
-}
-
-ResolutionTaskHolder@416 {
-    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = ArrayList@420[2] { ResolutionCandidate@421, ResolutionCandidate@422 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[4] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@428[14] { ResolutionCandidate@399, ResolutionCandidate@400, ResolutionCandidate@429, ... }
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@418 }
-    <name not found> = ArrayList@431[1] { ResolutionCandidate@412 }
-    <name not found> = ArrayList@432[1] { ResolutionCandidate@409 }
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@406 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@415 }
-    <name not found> = ArrayList@436[2] { ResolutionCandidate@421, ResolutionCandidate@422 }
-    <name not found> = ArrayList@437[4] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
deleted file mode 100644
index e55f63d9f4f..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('demo': FqName@5) = null
-    packageFragments('demo.Foo': FqName@6) = null
-    packageFragments('demo.Unit': FqName@7) = null
-    packageFragments('demo.User': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Foo': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Foo': FqName@16) = null
-    packageFragments('kotlin.Unit': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
deleted file mode 100644
index 6634ffda3fd..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
+++ /dev/null
@@ -1,811 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassDescriptor@19['Appendable'] {
-    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Appendable']
-}
-
-LazyJavaClassDescriptor@25['ArrayList'] {
-    constructors = ArrayList@26[3] { JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'] } // through LazyJavaClassMemberScope@30
-    defaultType = JetTypeImpl@31['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@30
-    functionTypeForSamInterface = null
-    functions('add': Name@33) = ArrayList@34[2] { JavaMethodDescriptor@35['add'], JavaMethodDescriptor@36['add'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@30
-    nestedClasses('add': Name@33) = null // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@39['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@40['ArrayList']
-}
-
-LazyJavaClassDescriptor@41['AutoCloseable'] {
-    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@42
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@42
-    typeConstructor = LazyJavaClassTypeConstructor@44['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@45['Closeable'] {
-    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
-}
-
-LazyJavaClassDescriptor@49['FilterOutputStream'] {
-    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@53['OutputStream'] {
-    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
-}
-
-LazyJavaClassDescriptor@57['PrintStream'] {
-    defaultType = JetTypeImpl@58['PrintStream']
-    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
-    functions('println': Name@61) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@60
-    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@60
-    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@60
-    nestedClasses('println': Name@61) = null // through LazyJavaClassMemberScope@60
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@68['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassDescriptor@70['RandomAccess'] {
-    functions('add': Name@11) = EmptyList@21[empty] // through LazyJavaClassMemberScope@71
-    memberIndex = computeMemberIndex$1@72 // through LazyJavaClassMemberScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
-}
-
-LazyJavaClassDescriptor@74['Serializable'] {
-    functions('add': Name@11) = EmptyList@21[empty] // through LazyJavaClassMemberScope@75
-    memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@75
-    typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
-}
-
-LazyJavaClassDescriptor@78['System'] {
-    enumEntryIndex = LinkedHashMap@79 // through LazyJavaClassMemberScope@80
-    memberIndex = computeMemberIndex$1@81 // through LazyJavaClassMemberScope@80
-    memberIndex = computeMemberIndex$1@82 // through LazyJavaStaticClassScope@83
-    nestedClassIndex = LinkedHashMap@84 // through LazyJavaClassMemberScope@80
-    nestedClasses('out': Name@85) = null // through LazyJavaClassMemberScope@80
-    properties('out': Name@85) = ArrayList@86[1] { JavaPropertyDescriptor@87['out'] } // through LazyJavaStaticClassScope@83
-    properties('out': Name@85) = EmptyList@21[empty] // through LazyJavaClassMemberScope@80
-    typeConstructor = LazyJavaClassTypeConstructor@88['System']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@89[1] { LazyJavaTypeParameterDescriptor@90['E'] }
-    supertypes = ArrayList@91[1] { LazyJavaClassifierType@92['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@18['AbstractList'] {
-    parameters = ArrayList@93[1] { LazyJavaTypeParameterDescriptor@94['E'] }
-    supertypes = ArrayList@95[2] { LazyJavaClassifierType@96['AbstractCollection<E>'], LazyJavaClassifierType@97['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@24['Appendable'] {
-    parameters = ArrayList@98[empty]
-    supertypes = ArrayList@99[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@40['ArrayList'] {
-    parameters = ArrayList@101[1] { LazyJavaTypeParameterDescriptor@102['E'] }
-    supertypes = ArrayList@103[5] { LazyJavaClassifierType@104['AbstractList<E>'], LazyJavaClassifierType@105['List<E>'], LazyJavaClassifierType@106['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@44['AutoCloseable'] {
-    parameters = ArrayList@107[empty]
-    supertypes = ArrayList@108[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@48['Closeable'] {
-    parameters = ArrayList@109[empty]
-    supertypes = ArrayList@110[1] { LazyJavaClassifierType@111['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@52['FilterOutputStream'] {
-    parameters = ArrayList@112[empty]
-    supertypes = ArrayList@113[1] { LazyJavaClassifierType@114['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@56['OutputStream'] {
-    parameters = ArrayList@115[empty]
-    supertypes = ArrayList@116[1] { LazyJavaClassifierType@117['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@69['PrintStream'] {
-    parameters = ArrayList@118[empty]
-    supertypes = ArrayList@119[3] { LazyJavaClassifierType@120['FilterOutputStream'], LazyJavaClassifierType@121['Appendable'], LazyJavaClassifierType@122['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@73['RandomAccess'] {
-    parameters = ArrayList@123[empty]
-    supertypes = ArrayList@124[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@77['Serializable'] {
-    parameters = ArrayList@125[empty]
-    supertypes = ArrayList@126[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassTypeConstructor@88['System'] {
-    supertypes = ArrayList@127[1] { JetTypeImpl@100['Any'] }
-}
-
-LazyJavaClassifierType@96['AbstractCollection<E>'] {
-    arguments = ArrayList@128[1] { TypeProjectionImpl@129 }
-    classifier = JavaClassImpl@130['AbstractCollection']
-    memberScope = SubstitutingScope@131
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@104['AbstractList<E>'] {
-    arguments = ArrayList@132[1] { TypeProjectionImpl@133 }
-    classifier = JavaClassImpl@134['AbstractList']
-    memberScope = SubstitutingScope@135
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
-}
-
-LazyJavaClassifierType@121['Appendable'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@137['Appendable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Appendable']
-}
-
-LazyJavaClassifierType@111['AutoCloseable'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@139['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@42
-    typeConstructor = LazyJavaClassTypeConstructor@44['AutoCloseable']
-}
-
-LazyJavaClassifierType@140['Cloneable'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@142['Cloneable']
-    memberScope = DeserializedClassMemberScope@143
-    typeConstructor = DeserializedClassTypeConstructor@144
-}
-
-LazyJavaClassifierType@117['Closeable'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@146['Closeable']
-    memberScope = LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
-}
-
-LazyJavaClassifierType@122['Closeable'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@148['Closeable']
-    memberScope = LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
-}
-
-LazyJavaClassifierType@149['Collection<? extends E>'] {
-    arguments = ArrayList@150[1] { TypeProjectionImpl@151 }
-    classifier = JavaClassImpl@152['Collection']
-    memberScope = SubstitutingScope@153
-    nullable = 'false': Boolean@154
-    typeConstructor = DeserializedClassTypeConstructor@155
-}
-
-LazyJavaClassifierType@156['Collection<? extends E>'] {
-    arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
-    classifier = JavaClassImpl@152['Collection']
-    memberScope = SubstitutingScope@159
-    nullable = 'true': Boolean@160
-    typeConstructor = DeserializedClassTypeConstructor@161
-}
-
-LazyJavaClassifierType@92['Collection<E>'] {
-    arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
-    classifier = JavaClassImpl@164['Collection']
-    memberScope = SubstitutingScope@165
-    typeConstructor = DeserializedClassTypeConstructor@155
-}
-
-LazyJavaClassifierType@166['E'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@168['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@170['E'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@172['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@176['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-}
-
-LazyJavaClassifierType@178['E'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@180['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@181['E'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@183['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@184['E'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@186['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@187['E'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@189['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@190['E'] {
-    arguments = ArrayList@191[empty]
-    classifier = JavaTypeParameterImpl@192['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@193['E'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@195['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@196['E'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaTypeParameterImpl@198['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-}
-
-LazyJavaClassifierType@199['E'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@201['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@202['E'] {
-    arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@204['E']
-    nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@205['E'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@176['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-}
-
-LazyJavaClassifierType@207['E'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@204['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@209['E'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@180['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@211['E'] {
-    arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@192['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@213['E'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@189['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@215['E'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@201['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@217['E'] {
-    arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@186['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@219['E'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@198['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-}
-
-LazyJavaClassifierType@221['E'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@172['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@223['E'] {
-    arguments = ArrayList@224[empty]
-    classifier = JavaTypeParameterImpl@183['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-}
-
-LazyJavaClassifierType@225['E'] {
-    arguments = ArrayList@226[empty]
-    classifier = JavaTypeParameterImpl@168['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@227['E'] {
-    arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@195['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-}
-
-LazyJavaClassifierType@120['FilterOutputStream'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaClassImpl@230['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['FilterOutputStream']
-}
-
-LazyJavaClassifierType@231['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@232
-}
-
-LazyJavaClassifierType@105['List<E>'] {
-    arguments = ArrayList@233[1] { TypeProjectionImpl@234 }
-    classifier = JavaClassImpl@235['List']
-    memberScope = SubstitutingScope@236
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@97['List<E>'] {
-    arguments = ArrayList@238[1] { TypeProjectionImpl@239 }
-    classifier = JavaClassImpl@240['List']
-    memberScope = SubstitutingScope@241
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@242['Object'] {
-    arguments = ArrayList@243[empty]
-    classifier = JavaClassImpl@244['Object']
-    nullable = 'false': Boolean@154
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@246['Object'] {
-    arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@244['Object']
-    nullable = 'true': Boolean@160
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@248['Object'] {
-    classifier = JavaClassImpl@249['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@250['Object'] {
-    classifier = JavaClassImpl@251['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@252['Object'] {
-    classifier = JavaClassImpl@253['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@254['Object'] {
-    classifier = JavaClassImpl@255['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@256['Object'] {
-    classifier = JavaClassImpl@257['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@258['Object'] {
-    classifier = JavaClassImpl@259['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@260['Object'] {
-    classifier = JavaClassImpl@261['Object']
-    typeConstructor = DeserializedClassTypeConstructor@245
-}
-
-LazyJavaClassifierType@114['OutputStream'] {
-    arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@263['OutputStream']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
-}
-
-LazyJavaClassifierType@264['PrintStream'] {
-    arguments = ArrayList@265[empty]
-    classifier = JavaClassImpl@266['PrintStream']
-    memberScope = LazyJavaClassMemberScope@60
-    nullable = 'false': Boolean@154
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassifierType@267['PrintStream'] {
-    arguments = ArrayList@268[empty]
-    classifier = JavaClassImpl@266['PrintStream']
-    nullable = 'true': Boolean@160
-    typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
-}
-
-LazyJavaClassifierType@106['RandomAccess'] {
-    arguments = ArrayList@269[empty]
-    classifier = JavaClassImpl@270['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
-}
-
-LazyJavaClassifierType@271['Serializable'] {
-    arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@273['Serializable']
-    memberScope = LazyJavaClassMemberScope@75
-    typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
-}
-
-LazyJavaClassifierType@274['String'] {
-    arguments = ArrayList@275[empty]
-    classifier = JavaClassImpl@276['String']
-    nullable = 'false': Boolean@154
-    typeConstructor = DeserializedClassTypeConstructor@277
-}
-
-LazyJavaClassifierType@278['String'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@276['String']
-    nullable = 'true': Boolean@160
-    typeConstructor = DeserializedClassTypeConstructor@277
-}
-
-LazyJavaPackageFragmentProvider@280 {
-    packageFragments('<root>': FqName@281) = LazyJavaPackageFragment@282['<root>']
-    packageFragments('Array': FqName@283) = null
-    packageFragments('Boolean': FqName@284) = null
-    packageFragments('List': FqName@285) = null
-    packageFragments('String': FqName@286) = null
-    packageFragments('System': FqName@287) = null
-    packageFragments('T': FqName@288) = null
-    packageFragments('demo': FqName@289) = null
-    packageFragments('demo.Array': FqName@290) = null
-    packageFragments('demo.Boolean': FqName@291) = null
-    packageFragments('demo.List': FqName@292) = null
-    packageFragments('demo.String': FqName@293) = null
-    packageFragments('demo.System': FqName@294) = null
-    packageFragments('demo.T': FqName@295) = null
-    packageFragments('demo.java': FqName@296) = null
-    packageFragments('java': FqName@297) = LazyJavaPackageFragment@298['java']
-    packageFragments('java.io': FqName@299) = LazyJavaPackageFragment@300['io']
-    packageFragments('java.lang': FqName@301) = LazyJavaPackageFragment@302['lang']
-    packageFragments('java.lang.Array': FqName@303) = null
-    packageFragments('java.lang.Boolean': FqName@304) = null
-    packageFragments('java.lang.List': FqName@305) = null
-    packageFragments('java.lang.String': FqName@306) = null
-    packageFragments('java.lang.System': FqName@307) = null
-    packageFragments('java.lang.T': FqName@308) = null
-    packageFragments('java.util': FqName@309) = LazyJavaPackageFragment@310['util']
-    packageFragments('kotlin': FqName@311) = null
-    packageFragments('kotlin.Array': FqName@312) = null
-    packageFragments('kotlin.Boolean': FqName@313) = null
-    packageFragments('kotlin.List': FqName@314) = null
-    packageFragments('kotlin.String': FqName@315) = null
-    packageFragments('kotlin.System': FqName@316) = null
-    packageFragments('kotlin.T': FqName@317) = null
-    packageFragments('kotlin.io': FqName@318) = null
-    packageFragments('kotlin.jvm': FqName@319) = null
-    topLevelClasses(JavaClassImpl@130['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@134['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@137['Appendable']) = LazyJavaClassDescriptor@19['Appendable']
-    topLevelClasses(JavaClassImpl@320['ArrayList']) = LazyJavaClassDescriptor@25['ArrayList']
-    topLevelClasses(JavaClassImpl@139['AutoCloseable']) = LazyJavaClassDescriptor@41['AutoCloseable']
-    topLevelClasses(JavaClassImpl@148['Closeable']) = LazyJavaClassDescriptor@45['Closeable']
-    topLevelClasses(JavaClassImpl@230['FilterOutputStream']) = LazyJavaClassDescriptor@49['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@263['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
-    topLevelClasses(JavaClassImpl@266['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
-    topLevelClasses(JavaClassImpl@270['RandomAccess']) = LazyJavaClassDescriptor@70['RandomAccess']
-    topLevelClasses(JavaClassImpl@273['Serializable']) = LazyJavaClassDescriptor@74['Serializable']
-    topLevelClasses(JavaClassImpl@321['System']) = LazyJavaClassDescriptor@78['System']
-}
-
-LazyJavaPackageFragment@298['java'] {
-    classes('lang': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@323
-    classes('util': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@323
-    deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@323
-    functions('lang': Name@326) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@323
-    memberIndex = computeMemberIndex$1@327 // through LazyPackageFragmentScopeForJavaPackage@323
-}
-
-LazyJavaPackageFragment@302['lang'] {
-    classes('System': Name@328) = LazyJavaClassDescriptor@78['System'] // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('filter': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('java': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('filter': Name@330) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    memberIndex = computeMemberIndex$1@332 // through LazyPackageFragmentScopeForJavaPackage@329
-}
-
-LazyJavaPackageFragment@310['util'] {
-    classes('ArrayList': Name@333) = LazyJavaClassDescriptor@25['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@334
-    deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@334
-    functions('ArrayList': Name@333) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@334
-    memberIndex = computeMemberIndex$1@335 // through LazyPackageFragmentScopeForJavaPackage@334
-}
-
-LazyJavaTypeParameterDescriptor@90['E'] {
-    defaultType = JetTypeImpl@336['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@177
-    upperBounds = LinkedHashSet@337[1] { NullableType@338 }
-    upperBoundsAsType = NullableType@338
-}
-
-LazyJavaTypeParameterDescriptor@94['E'] {
-    defaultType = JetTypeImpl@339['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@173
-    upperBounds = LinkedHashSet@340[1] { NullableType@341 }
-    upperBoundsAsType = NullableType@341
-}
-
-LazyJavaTypeParameterDescriptor@102['E'] {
-    defaultType = JetTypeImpl@342['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-    upperBounds = LinkedHashSet@343[1] { NullableType@344 }
-    upperBoundsAsType = NullableType@344
-}
-
-LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@346['E']) = LazyJavaTypeParameterDescriptor@94['E']
-}
-
-LazyJavaTypeParameterResolver@347 {
-    resolve(JavaTypeParameterImpl@348['E']) = LazyJavaTypeParameterDescriptor@102['E']
-}
-
-LazyJavaTypeParameterResolver@349 {
-    resolve(JavaTypeParameterImpl@350['E']) = LazyJavaTypeParameterDescriptor@90['E']
-}
-
-LazyJavaTypeParameterResolver@351 {
-    resolve(JavaTypeParameterImpl@192['E']) = null
-}
-
-LazyJavaTypeParameterResolver@352 {
-    resolve(JavaTypeParameterImpl@183['E']) = null
-}
-
-LazyJavaTypeParameterResolver@353 {
-    resolve(JavaTypeParameterImpl@180['E']) = null
-}
-
-LazyJavaTypeParameterResolver@354 {
-    resolve(JavaTypeParameterImpl@176['E']) = null
-}
-
-LazyJavaTypeParameterResolver@355 {
-    resolve(JavaTypeParameterImpl@168['E']) = null
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[10] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@435[10] { ResolutionCandidate@358, ResolutionCandidate@359, ResolutionCandidate@360, ... }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@455[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
-    <name not found> = ArrayList@456[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
-    <name not found> = ArrayList@457[7] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
deleted file mode 100644
index fbdf8b79608..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.Array': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Array': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('length': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('sure': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('length': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('sure': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('length': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('sure': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('length': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('sure': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-null {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-    <name not found> = EmptyList@33[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
deleted file mode 100644
index 807f0cf319b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
+++ /dev/null
@@ -1,116 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['R']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.R': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.R': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('let': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('body': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('let': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('let': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('body': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('let': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-}
-
-null {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@87[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@88[7] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@89[7] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@90[7] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@91[8] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
deleted file mode 100644
index b9f50fa991c..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
+++ /dev/null
@@ -1,179 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Creature': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Creature': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Creature': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt575': FqName@19) = null
-    packageFragments('kt575.A': FqName@20) = null
-    packageFragments('kt575.Creature': FqName@21) = null
-    packageFragments('kt575.Int': FqName@22) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('C': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('bbb': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('ccc': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('C': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
deleted file mode 100644
index 4d1541c8ad5..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
+++ /dev/null
@@ -1,240 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['Lock'] {
-    defaultType = JetTypeImpl@3['Lock']
-    enumEntryIndex = LinkedHashMap@4 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = null
-    functions('lock': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['lock'] } // through LazyJavaClassMemberScope@5
-    functions('unlock': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['unlock'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@5
-    nestedClasses('lock': Name@6) = null // through LazyJavaClassMemberScope@5
-    nestedClasses('unlock': Name@9) = null // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Lock']
-}
-
-LazyJavaClassDescriptor@16['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['RuntimeException']
-}
-
-LazyJavaClassDescriptor@18['UnsupportedOperationException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@19['UnsupportedOperationException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@20[empty]
-    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@15['Lock'] {
-    parameters = ArrayList@23[empty]
-    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['RuntimeException'] {
-    parameters = ArrayList@26[empty]
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@19['UnsupportedOperationException'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['RuntimeException'] }
-}
-
-LazyJavaClassifierType@28['Exception'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@34['Object'] {
-    classifier = JavaClassImpl@35['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@31['RuntimeException'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@17['RuntimeException']
-}
-
-LazyJavaClassifierType@22['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@41
-}
-
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
-    packageFragments('Int': FqName@45) = null
-    packageFragments('Lock': FqName@46) = null
-    packageFragments('T': FqName@47) = null
-    packageFragments('UnsupportedOperationException': FqName@48) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.Int': FqName@53) = null
-    packageFragments('java.lang.Lock': FqName@54) = null
-    packageFragments('java.lang.T': FqName@55) = null
-    packageFragments('java.lang.UnsupportedOperationException': FqName@56) = null
-    packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
-    packageFragments('java.util.concurrent': FqName@59) = LazyJavaPackageFragment@60['concurrent']
-    packageFragments('java.util.concurrent.locks': FqName@61) = LazyJavaPackageFragment@62['locks']
-    packageFragments('java.util.concurrent.locks.Lock': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.Lock': FqName@66) = null
-    packageFragments('kotlin.T': FqName@67) = null
-    packageFragments('kotlin.UnsupportedOperationException': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    packageFragments('kt58': FqName@71) = null
-    packageFragments('kt58.Int': FqName@72) = null
-    packageFragments('kt58.Lock': FqName@73) = null
-    packageFragments('kt58.T': FqName@74) = null
-    packageFragments('kt58.UnsupportedOperationException': FqName@75) = null
-    topLevelClasses(JavaClassImpl@33['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@76['Lock']) = LazyJavaClassDescriptor@2['Lock']
-    topLevelClasses(JavaClassImpl@38['RuntimeException']) = LazyJavaClassDescriptor@16['RuntimeException']
-    topLevelClasses(JavaClassImpl@77['UnsupportedOperationException']) = LazyJavaClassDescriptor@18['UnsupportedOperationException']
-}
-
-LazyJavaPackageFragment@60['concurrent'] {
-    classes('locks': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('locks': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('util': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('util': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    classes('UnsupportedOperationException': Name@90) = LazyJavaClassDescriptor@18['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('body': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('doSmth': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('body': Name@92) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('doSmth': Name@93) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@62['locks'] {
-    classes('Lock': Name@95) = LazyJavaClassDescriptor@2['Lock'] // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('Lock': Name@97) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@58['util'] {
-    classes('concurrent': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('concurrent': Name@101) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-null {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
deleted file mode 100644
index 23d8d6615a0..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
+++ /dev/null
@@ -1,765 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaClassDescriptor@3['AbstractCollection'] {
-    defaultType = JetTypeImpl@4['AbstractCollection<1>']
-    functions('add': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['add'] } // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@12['AbstractList'] {
-    defaultType = JetTypeImpl@13['AbstractList<1>']
-    functions('add': Name@14) = ArrayList@15[2] { JavaMethodDescriptor@16['add'], JavaMethodDescriptor@17['add'] } // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@20['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@21['AbstractList']
-}
-
-LazyJavaClassDescriptor@22['ArrayList'] {
-    constructors = ArrayList@23[3] { JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'], JavaConstructorDescriptor@26['<init>'] } // through LazyJavaClassMemberScope@27
-    defaultType = JetTypeImpl@28['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@27
-    functionTypeForSamInterface = null
-    functions('add': Name@30) = ArrayList@31[2] { JavaMethodDescriptor@32['add'], JavaMethodDescriptor@33['add'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@27
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@27
-    nestedClasses('add': Name@30) = null // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['ArrayList']
-}
-
-LazyJavaClassDescriptor@38['RandomAccess'] {
-    functions('add': Name@14) = EmptyList@39[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['RandomAccess']
-}
-
-LazyJavaClassDescriptor@43['Serializable'] {
-    functions('add': Name@14) = EmptyList@39[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
-}
-
-LazyJavaClassTypeConstructor@11['AbstractCollection'] {
-    parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
-    supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@21['AbstractList'] {
-    parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
-    supertypes = ArrayList@53[2] { LazyJavaClassifierType@54['AbstractCollection<E>'], LazyJavaClassifierType@55['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@37['ArrayList'] {
-    parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
-    supertypes = ArrayList@58[5] { LazyJavaClassifierType@59['AbstractList<E>'], LazyJavaClassifierType@60['List<E>'], LazyJavaClassifierType@61['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@42['RandomAccess'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassTypeConstructor@46['Serializable'] {
-    parameters = ArrayList@65[empty]
-    supertypes = ArrayList@66[1] { JetTypeImpl@64['Any'] }
-}
-
-LazyJavaClassifierType@54['AbstractCollection<E>'] {
-    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    classifier = JavaClassImpl@69['AbstractCollection']
-    memberScope = SubstitutingScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
-}
-
-LazyJavaClassifierType@59['AbstractList<E>'] {
-    arguments = ArrayList@71[1] { TypeProjectionImpl@72 }
-    classifier = JavaClassImpl@73['AbstractList']
-    memberScope = SubstitutingScope@74
-    typeConstructor = LazyJavaClassTypeConstructor@21['AbstractList']
-}
-
-LazyJavaClassifierType@75['Cloneable'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['Cloneable']
-    memberScope = DeserializedClassMemberScope@78
-    typeConstructor = DeserializedClassTypeConstructor@79
-}
-
-LazyJavaClassifierType@80['Collection<? extends E>'] {
-    arguments = ArrayList@81[1] { TypeProjectionImpl@82 }
-    classifier = JavaClassImpl@83['Collection']
-    memberScope = SubstitutingScope@84
-    nullable = 'false': Boolean@85
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@87['Collection<? extends E>'] {
-    arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
-    classifier = JavaClassImpl@83['Collection']
-    memberScope = SubstitutingScope@90
-    nullable = 'true': Boolean@91
-    typeConstructor = DeserializedClassTypeConstructor@92
-}
-
-LazyJavaClassifierType@50['Collection<E>'] {
-    arguments = ArrayList@93[1] { TypeProjectionImpl@94 }
-    classifier = JavaClassImpl@95['Collection']
-    memberScope = SubstitutingScope@96
-    typeConstructor = DeserializedClassTypeConstructor@86
-}
-
-LazyJavaClassifierType@97['E'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@101['E'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@103['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@104['E'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@108['E'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@120['E'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@123['E'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@127['E'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@130['E'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@133['E'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@135['E']
-    nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@136['E'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@135['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@138['E'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@142['E'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@122['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@110['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@146['E'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@148['E'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@125['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-LazyJavaClassifierType@152['E'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@106['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@103['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@99['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-}
-
-LazyJavaClassifierType@158['E'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-}
-
-LazyJavaClassifierType@60['List<E>'] {
-    arguments = ArrayList@160[1] { TypeProjectionImpl@161 }
-    classifier = JavaClassImpl@162['List']
-    memberScope = SubstitutingScope@163
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@55['List<E>'] {
-    arguments = ArrayList@165[1] { TypeProjectionImpl@166 }
-    classifier = JavaClassImpl@167['List']
-    memberScope = SubstitutingScope@168
-    typeConstructor = DeserializedClassTypeConstructor@164
-}
-
-LazyJavaClassifierType@169['Object'] {
-    classifier = JavaClassImpl@170['Object']
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@172['Object'] {
-    classifier = JavaClassImpl@173['Object']
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@174['Object'] {
-    classifier = JavaClassImpl@175['Object']
-    typeConstructor = DeserializedClassTypeConstructor@171
-}
-
-LazyJavaClassifierType@61['RandomAccess'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaClassImpl@177['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@40
-    typeConstructor = LazyJavaClassTypeConstructor@42['RandomAccess']
-}
-
-LazyJavaClassifierType@178['Serializable'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaClassImpl@180['Serializable']
-    memberScope = LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@181 {
-    packageFragments('<root>': FqName@182) = LazyJavaPackageFragment@183['<root>']
-    packageFragments('Array': FqName@184) = null
-    packageFragments('Int': FqName@185) = null
-    packageFragments('IntRange': FqName@186) = null
-    packageFragments('String': FqName@187) = null
-    packageFragments('T': FqName@188) = null
-    packageFragments('java': FqName@189) = LazyJavaPackageFragment@190['java']
-    packageFragments('java.io': FqName@191) = LazyJavaPackageFragment@192['io']
-    packageFragments('java.lang': FqName@193) = LazyJavaPackageFragment@194['lang']
-    packageFragments('java.lang.Array': FqName@195) = null
-    packageFragments('java.lang.Int': FqName@196) = null
-    packageFragments('java.lang.IntRange': FqName@197) = null
-    packageFragments('java.lang.String': FqName@198) = null
-    packageFragments('java.lang.T': FqName@199) = null
-    packageFragments('java.util': FqName@200) = LazyJavaPackageFragment@201['util']
-    packageFragments('java.util.Array': FqName@202) = null
-    packageFragments('java.util.Int': FqName@203) = null
-    packageFragments('java.util.IntRange': FqName@204) = null
-    packageFragments('java.util.String': FqName@205) = null
-    packageFragments('java.util.T': FqName@206) = null
-    packageFragments('kotlin': FqName@207) = null
-    packageFragments('kotlin.Array': FqName@208) = null
-    packageFragments('kotlin.Int': FqName@209) = null
-    packageFragments('kotlin.IntRange': FqName@210) = null
-    packageFragments('kotlin.String': FqName@211) = null
-    packageFragments('kotlin.T': FqName@212) = null
-    packageFragments('kotlin.io': FqName@213) = null
-    packageFragments('kotlin.jvm': FqName@214) = null
-    packageFragments('whats': FqName@215) = null
-    packageFragments('whats.the': FqName@216) = null
-    packageFragments('whats.the.difference': FqName@217) = null
-    packageFragments('whats.the.difference.Array': FqName@218) = null
-    packageFragments('whats.the.difference.Int': FqName@219) = null
-    packageFragments('whats.the.difference.IntRange': FqName@220) = null
-    packageFragments('whats.the.difference.String': FqName@221) = null
-    packageFragments('whats.the.difference.T': FqName@222) = null
-    packageFragments('whats.the.difference.indices': FqName@223) = null
-    packageFragments('whats.the.difference.lastIndex': FqName@224) = null
-    topLevelClasses(JavaClassImpl@69['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@73['AbstractList']) = LazyJavaClassDescriptor@12['AbstractList']
-    topLevelClasses(JavaClassImpl@225['ArrayList']) = LazyJavaClassDescriptor@22['ArrayList']
-    topLevelClasses(JavaClassImpl@177['RandomAccess']) = LazyJavaClassDescriptor@38['RandomAccess']
-    topLevelClasses(JavaClassImpl@180['Serializable']) = LazyJavaClassDescriptor@43['Serializable']
-}
-
-LazyJavaPackageFragment@190['java'] {
-    classes('lang': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@227
-    classes('util': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@227
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@227
-    functions('lang': Name@230) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@227
-    functions('util': Name@231) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@227
-    memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@227
-}
-
-LazyJavaPackageFragment@194['lang'] {
-    classes('ArrayList': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('IntRange': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('iarray': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('lastIndex': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('size': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('ArrayList': Name@233) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('IntRange': Name@235) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('iarray': Name@236) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('lastIndex': Name@239) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('size': Name@238) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    memberIndex = computeMemberIndex$1@240 // through LazyPackageFragmentScopeForJavaPackage@234
-}
-
-LazyJavaPackageFragment@201['util'] {
-    classes('Array': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('ArrayList': Name@233) = LazyJavaClassDescriptor@22['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('IntRange': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('iarray': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('lastIndex': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    classes('size': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@242
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('ArrayList': Name@233) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('IntRange': Name@235) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('iarray': Name@236) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('lastIndex': Name@239) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    functions('size': Name@238) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
-    memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@242
-}
-
-LazyJavaTypeParameterDescriptor@48['E'] {
-    defaultType = JetTypeImpl@247['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@248[1] { NullableType@249 }
-    upperBoundsAsType = NullableType@249
-}
-
-LazyJavaTypeParameterDescriptor@57['E'] {
-    defaultType = JetTypeImpl@250['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
-    upperBounds = LinkedHashSet@251[1] { NullableType@252 }
-    upperBoundsAsType = NullableType@252
-}
-
-LazyJavaTypeParameterDescriptor@52['E'] {
-    defaultType = JetTypeImpl@253['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
-    upperBounds = LinkedHashSet@254[1] { NullableType@255 }
-    upperBoundsAsType = NullableType@255
-}
-
-LazyJavaTypeParameterResolver@256 {
-    resolve(JavaTypeParameterImpl@257['E']) = LazyJavaTypeParameterDescriptor@48['E']
-}
-
-LazyJavaTypeParameterResolver@258 {
-    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@52['E']
-}
-
-LazyJavaTypeParameterResolver@260 {
-    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@57['E']
-}
-
-LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@125['E']) = null
-}
-
-LazyJavaTypeParameterResolver@263 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
-}
-
-LazyJavaTypeParameterResolver@264 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
-}
-
-LazyJavaTypeParameterResolver@265 {
-    resolve(JavaTypeParameterImpl@99['E']) = null
-}
-
-LazyJavaTypeParameterResolver@266 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[2] { ResolutionCandidate@392, ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[2] { ResolutionCandidate@396, ResolutionCandidate@397 }
-}
-
-ResolutionTaskHolder@398 {
-    <name not found> = ArrayList@399[3] { ResolutionCandidate@400, ResolutionCandidate@401, ResolutionCandidate@402 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[7] { ResolutionCandidate@405, ResolutionCandidate@406, ResolutionCandidate@407, ... }
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[7] { ResolutionCandidate@410, ResolutionCandidate@411, ResolutionCandidate@412, ... }
-}
-
-ResolutionTaskHolder@413 {
-    <name not found> = ArrayList@414[8] { ResolutionCandidate@415, ResolutionCandidate@416, ResolutionCandidate@417, ... }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[8] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422, ... }
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[8] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
-}
-
-ResolutionTaskHolder@428 {
-    <name not found> = ArrayList@429[8] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432, ... }
-}
-
-null {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@434[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@435[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@437[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@438[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@440[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@470[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@471[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@473[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@474[2] { ResolutionCandidate@392, ResolutionCandidate@393 }
-    <name not found> = ArrayList@475[2] { ResolutionCandidate@396, ResolutionCandidate@397 }
-    <name not found> = ArrayList@476[3] { ResolutionCandidate@400, ResolutionCandidate@401, ResolutionCandidate@402 }
-    <name not found> = ArrayList@477[7] { ResolutionCandidate@405, ResolutionCandidate@406, ResolutionCandidate@407, ... }
-    <name not found> = ArrayList@478[7] { ResolutionCandidate@410, ResolutionCandidate@411, ResolutionCandidate@412, ... }
-    <name not found> = ArrayList@479[8] { ResolutionCandidate@430, ResolutionCandidate@431, ResolutionCandidate@432, ... }
-    <name not found> = ArrayList@480[8] { ResolutionCandidate@420, ResolutionCandidate@421, ResolutionCandidate@422, ... }
-    <name not found> = ArrayList@481[8] { ResolutionCandidate@425, ResolutionCandidate@426, ResolutionCandidate@427, ... }
-    <name not found> = ArrayList@482[8] { ResolutionCandidate@415, ResolutionCandidate@416, ResolutionCandidate@417, ... }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
deleted file mode 100644
index 707a49074a2..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt588.lazy.log
+++ /dev/null
@@ -1,969 +0,0 @@
-LazyJavaClassDescriptor@0['ClassLoader'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassDescriptor@2['Runnable'] {
-    defaultType = JetTypeImpl@3['Runnable']
-    functionTypeForSamInterface = JetTypeImpl@4['Function0<1>']
-    functions('Caches': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('State': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('UncaughtExceptionHandler': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('WeakClassKey': Name@10) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('blockedOn': Name@11) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('checkAccess': Name@12) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('clone': Name@13) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('countStackFrames': Name@14) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('destroy': Name@15) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('dispatchUncaughtException': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('equals': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['equals'] } // through LazyJavaClassMemberScope@7
-    functions('exit': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@22) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getContextClassLoader': Name@23) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getId': Name@24) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getName': Name@25) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getPriority': Name@26) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getStackTrace': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getState': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getThreadGroup': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getUncaughtExceptionHandler': Name@30) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@31) = ArrayList@32[1] { DeserializedSimpleFunctionDescriptor@33['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('init': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('interrupt': Name@35) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('interrupt0': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('isAlive': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('isDaemon': Name@38) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('isInterrupted': Name@39) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('join': Name@40) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('notify': Name@41) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('resume': Name@43) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('resume0': Name@44) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('run': Name@45) = ArrayList@46[1] { JavaMethodDescriptor@47['run'] } // through LazyJavaClassMemberScope@7
-    functions('setContextClassLoader': Name@48) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setDaemon': Name@49) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setName': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setNativeName': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setPriority': Name@52) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setPriority0': Name@53) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('setUncaughtExceptionHandler': Name@54) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('start': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('start0': Name@56) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('stop': Name@57) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('stop0': Name@58) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('suspend': Name@59) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('suspend0': Name@60) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('toString': Name@61) = ArrayList@62[1] { DeserializedSimpleFunctionDescriptor@63['toString'] } // through LazyJavaClassMemberScope@7
-    functions('wait': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@7
-    properties('blocker': Name@66) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('blockerLock': Name@67) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('contextClassLoader': Name@68) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('daemon': Name@69) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('eetop': Name@70) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('group': Name@71) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('inheritableThreadLocals': Name@72) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('inheritedAccessControlContext': Name@73) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('name': Name@74) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('nativeParkEventPointer': Name@75) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('parkBlocker': Name@76) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('priority': Name@77) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('single_step': Name@78) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('stackSize': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('stillborn': Name@80) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('target': Name@81) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('threadLocals': Name@82) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('threadQ': Name@83) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('threadStatus': Name@84) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('tid': Name@85) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('uncaughtExceptionHandler': Name@86) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@87['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassDescriptor@89['State'] {
-    typeConstructor = LazyJavaClassTypeConstructor@90['State']
-}
-
-LazyJavaClassDescriptor@91['Thread'] {
-    allDescriptors = ArrayList@92[72] { LazyJavaClassDescriptor@93['WeakClassKey'], LazyJavaClassDescriptor@94['UncaughtExceptionHandler'], LazyJavaClassDescriptor@89['State'], ... } // through LazyJavaClassMemberScope@95
-    constructors = ArrayList@96[13] { JavaConstructorDescriptor@97['<init>'], JavaConstructorDescriptor@98['<init>'], SamAdapterConstructorDescriptor@99['<init>'], ... } // through LazyJavaClassMemberScope@95
-    defaultType = JetTypeImpl@100['Thread']
-    enumEntryIndex = LinkedHashMap@101 // through LazyJavaClassMemberScope@95
-    functions('Caches': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('State': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('UncaughtExceptionHandler': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('WeakClassKey': Name@10) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('blockedOn': Name@102) = ArrayList@103[1] { JavaMethodDescriptor@104['blockedOn'] } // through LazyJavaClassMemberScope@95
-    functions('checkAccess': Name@105) = ArrayList@106[1] { JavaMethodDescriptor@107['checkAccess'] } // through LazyJavaClassMemberScope@95
-    functions('clone': Name@108) = ArrayList@109[1] { JavaMethodDescriptor@110['clone'] } // through LazyJavaClassMemberScope@95
-    functions('countStackFrames': Name@111) = ArrayList@112[1] { JavaMethodDescriptor@113['countStackFrames'] } // through LazyJavaClassMemberScope@95
-    functions('destroy': Name@114) = ArrayList@115[1] { JavaMethodDescriptor@116['destroy'] } // through LazyJavaClassMemberScope@95
-    functions('dispatchUncaughtException': Name@117) = ArrayList@118[1] { JavaMethodDescriptor@119['dispatchUncaughtException'] } // through LazyJavaClassMemberScope@95
-    functions('equals': Name@17) = ArrayList@120[1] { DeserializedSimpleFunctionDescriptor@121['equals'] } // through LazyJavaClassMemberScope@95
-    functions('exit': Name@122) = ArrayList@123[1] { JavaMethodDescriptor@124['exit'] } // through LazyJavaClassMemberScope@95
-    functions('finalize': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('getClass': Name@22) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('getContextClassLoader': Name@125) = ArrayList@126[1] { JavaMethodDescriptor@127['getContextClassLoader'] } // through LazyJavaClassMemberScope@95
-    functions('getId': Name@128) = ArrayList@129[1] { JavaMethodDescriptor@130['getId'] } // through LazyJavaClassMemberScope@95
-    functions('getName': Name@131) = ArrayList@132[1] { JavaMethodDescriptor@133['getName'] } // through LazyJavaClassMemberScope@95
-    functions('getPriority': Name@134) = ArrayList@135[1] { JavaMethodDescriptor@136['getPriority'] } // through LazyJavaClassMemberScope@95
-    functions('getStackTrace': Name@137) = ArrayList@138[1] { JavaMethodDescriptor@139['getStackTrace'] } // through LazyJavaClassMemberScope@95
-    functions('getState': Name@140) = ArrayList@141[1] { JavaMethodDescriptor@142['getState'] } // through LazyJavaClassMemberScope@95
-    functions('getThreadGroup': Name@143) = ArrayList@144[1] { JavaMethodDescriptor@145['getThreadGroup'] } // through LazyJavaClassMemberScope@95
-    functions('getUncaughtExceptionHandler': Name@146) = ArrayList@147[1] { JavaMethodDescriptor@148['getUncaughtExceptionHandler'] } // through LazyJavaClassMemberScope@95
-    functions('hashCode': Name@31) = ArrayList@149[1] { DeserializedSimpleFunctionDescriptor@150['hashCode'] } // through LazyJavaClassMemberScope@95
-    functions('init': Name@151) = ArrayList@152[2] { JavaMethodDescriptor@153['init'], SamAdapterFunctionDescriptor@154['init'] } // through LazyJavaClassMemberScope@95
-    functions('interrupt': Name@155) = ArrayList@156[1] { JavaMethodDescriptor@157['interrupt'] } // through LazyJavaClassMemberScope@95
-    functions('interrupt0': Name@158) = ArrayList@159[1] { JavaMethodDescriptor@160['interrupt0'] } // through LazyJavaClassMemberScope@95
-    functions('isAlive': Name@161) = ArrayList@162[1] { JavaMethodDescriptor@163['isAlive'] } // through LazyJavaClassMemberScope@95
-    functions('isDaemon': Name@164) = ArrayList@165[1] { JavaMethodDescriptor@166['isDaemon'] } // through LazyJavaClassMemberScope@95
-    functions('isInterrupted': Name@167) = ArrayList@168[2] { JavaMethodDescriptor@169['isInterrupted'], JavaMethodDescriptor@170['isInterrupted'] } // through LazyJavaClassMemberScope@95
-    functions('join': Name@171) = ArrayList@172[3] { JavaMethodDescriptor@173['join'], JavaMethodDescriptor@174['join'], JavaMethodDescriptor@175['join'] } // through LazyJavaClassMemberScope@95
-    functions('notify': Name@41) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('notifyAll': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    functions('resume': Name@176) = ArrayList@177[1] { JavaMethodDescriptor@178['resume'] } // through LazyJavaClassMemberScope@95
-    functions('resume0': Name@179) = ArrayList@180[1] { JavaMethodDescriptor@181['resume0'] } // through LazyJavaClassMemberScope@95
-    functions('run': Name@182) = ArrayList@183[1] { JavaMethodDescriptor@184['run'] } // through LazyJavaClassMemberScope@95
-    functions('setContextClassLoader': Name@185) = ArrayList@186[1] { JavaMethodDescriptor@187['setContextClassLoader'] } // through LazyJavaClassMemberScope@95
-    functions('setDaemon': Name@188) = ArrayList@189[1] { JavaMethodDescriptor@190['setDaemon'] } // through LazyJavaClassMemberScope@95
-    functions('setName': Name@191) = ArrayList@192[1] { JavaMethodDescriptor@193['setName'] } // through LazyJavaClassMemberScope@95
-    functions('setNativeName': Name@194) = ArrayList@195[1] { JavaMethodDescriptor@196['setNativeName'] } // through LazyJavaClassMemberScope@95
-    functions('setPriority': Name@197) = ArrayList@198[1] { JavaMethodDescriptor@199['setPriority'] } // through LazyJavaClassMemberScope@95
-    functions('setPriority0': Name@200) = ArrayList@201[1] { JavaMethodDescriptor@202['setPriority0'] } // through LazyJavaClassMemberScope@95
-    functions('setUncaughtExceptionHandler': Name@203) = ArrayList@204[2] { JavaMethodDescriptor@205['setUncaughtExceptionHandler'], SamAdapterFunctionDescriptor@206['setUncaughtExceptionHandler'] } // through LazyJavaClassMemberScope@95
-    functions('start': Name@207) = ArrayList@208[1] { JavaMethodDescriptor@209['start'] } // through LazyJavaClassMemberScope@95
-    functions('start0': Name@210) = ArrayList@211[1] { JavaMethodDescriptor@212['start0'] } // through LazyJavaClassMemberScope@95
-    functions('stop': Name@213) = ArrayList@214[2] { JavaMethodDescriptor@215['stop'], JavaMethodDescriptor@216['stop'] } // through LazyJavaClassMemberScope@95
-    functions('stop0': Name@217) = ArrayList@218[1] { JavaMethodDescriptor@219['stop0'] } // through LazyJavaClassMemberScope@95
-    functions('suspend': Name@220) = ArrayList@221[1] { JavaMethodDescriptor@222['suspend'] } // through LazyJavaClassMemberScope@95
-    functions('suspend0': Name@223) = ArrayList@224[1] { JavaMethodDescriptor@225['suspend0'] } // through LazyJavaClassMemberScope@95
-    functions('toString': Name@226) = ArrayList@227[1] { JavaMethodDescriptor@228['toString'] } // through LazyJavaClassMemberScope@95
-    functions('wait': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@95
-    memberIndex = computeMemberIndex$1@229 // through LazyJavaClassMemberScope@95
-    nestedClassIndex = LinkedHashMap@230 // through LazyJavaClassMemberScope@95
-    nestedClasses('Caches': Name@5) = LazyJavaClassDescriptor@231['Caches'] // through LazyJavaClassMemberScope@95
-    nestedClasses('State': Name@8) = LazyJavaClassDescriptor@89['State'] // through LazyJavaClassMemberScope@95
-    nestedClasses('UncaughtExceptionHandler': Name@9) = LazyJavaClassDescriptor@94['UncaughtExceptionHandler'] // through LazyJavaClassMemberScope@95
-    nestedClasses('WeakClassKey': Name@10) = LazyJavaClassDescriptor@93['WeakClassKey'] // through LazyJavaClassMemberScope@95
-    properties('blocker': Name@66) = ArrayList@232[1] { JavaPropertyDescriptor@233['blocker'] } // through LazyJavaClassMemberScope@95
-    properties('blockerLock': Name@67) = ArrayList@234[1] { JavaPropertyDescriptor@235['blockerLock'] } // through LazyJavaClassMemberScope@95
-    properties('contextClassLoader': Name@68) = ArrayList@236[1] { JavaPropertyDescriptor@237['contextClassLoader'] } // through LazyJavaClassMemberScope@95
-    properties('daemon': Name@69) = ArrayList@238[1] { JavaPropertyDescriptor@239['daemon'] } // through LazyJavaClassMemberScope@95
-    properties('eetop': Name@70) = ArrayList@240[1] { JavaPropertyDescriptor@241['eetop'] } // through LazyJavaClassMemberScope@95
-    properties('group': Name@71) = ArrayList@242[1] { JavaPropertyDescriptor@243['group'] } // through LazyJavaClassMemberScope@95
-    properties('inheritableThreadLocals': Name@72) = ArrayList@244[1] { JavaPropertyDescriptor@245['inheritableThreadLocals'] } // through LazyJavaClassMemberScope@95
-    properties('inheritedAccessControlContext': Name@73) = ArrayList@246[1] { JavaPropertyDescriptor@247['inheritedAccessControlContext'] } // through LazyJavaClassMemberScope@95
-    properties('name': Name@74) = ArrayList@248[1] { JavaPropertyDescriptor@249['name'] } // through LazyJavaClassMemberScope@95
-    properties('nativeParkEventPointer': Name@75) = ArrayList@250[1] { JavaPropertyDescriptor@251['nativeParkEventPointer'] } // through LazyJavaClassMemberScope@95
-    properties('parkBlocker': Name@76) = ArrayList@252[1] { JavaPropertyDescriptor@253['parkBlocker'] } // through LazyJavaClassMemberScope@95
-    properties('priority': Name@77) = ArrayList@254[1] { JavaPropertyDescriptor@255['priority'] } // through LazyJavaClassMemberScope@95
-    properties('single_step': Name@78) = ArrayList@256[1] { JavaPropertyDescriptor@257['single_step'] } // through LazyJavaClassMemberScope@95
-    properties('stackSize': Name@79) = ArrayList@258[1] { JavaPropertyDescriptor@259['stackSize'] } // through LazyJavaClassMemberScope@95
-    properties('stillborn': Name@80) = ArrayList@260[1] { JavaPropertyDescriptor@261['stillborn'] } // through LazyJavaClassMemberScope@95
-    properties('target': Name@81) = ArrayList@262[1] { JavaPropertyDescriptor@263['target'] } // through LazyJavaClassMemberScope@95
-    properties('threadLocals': Name@82) = ArrayList@264[1] { JavaPropertyDescriptor@265['threadLocals'] } // through LazyJavaClassMemberScope@95
-    properties('threadQ': Name@83) = ArrayList@266[1] { JavaPropertyDescriptor@267['threadQ'] } // through LazyJavaClassMemberScope@95
-    properties('threadStatus': Name@84) = ArrayList@268[1] { JavaPropertyDescriptor@269['threadStatus'] } // through LazyJavaClassMemberScope@95
-    properties('tid': Name@85) = ArrayList@270[1] { JavaPropertyDescriptor@271['tid'] } // through LazyJavaClassMemberScope@95
-    properties('uncaughtExceptionHandler': Name@86) = ArrayList@272[1] { JavaPropertyDescriptor@273['uncaughtExceptionHandler'] } // through LazyJavaClassMemberScope@95
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@274['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@275['Thread']
-}
-
-LazyJavaClassDescriptor@276['ThreadLocal'] {
-    nestedClassIndex = LinkedHashMap@277 // through LazyJavaClassMemberScope@278
-    nestedClasses('ThreadLocalMap': Name@279) = LazyJavaClassDescriptor@280['ThreadLocalMap'] // through LazyJavaClassMemberScope@278
-}
-
-LazyJavaClassDescriptor@280['ThreadLocalMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
-}
-
-LazyJavaClassDescriptor@94['UncaughtExceptionHandler'] {
-    functionTypeForSamInterface = JetTypeImpl@282['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@283['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassTypeConstructor@1['ClassLoader'] {
-    parameters = ArrayList@285[empty]
-}
-
-LazyJavaClassTypeConstructor@88['Runnable'] {
-    parameters = ArrayList@286[empty]
-    supertypes = ArrayList@287[1] { JetTypeImpl@288['Any'] }
-}
-
-LazyJavaClassTypeConstructor@90['State'] {
-    parameters = ArrayList@289[empty]
-}
-
-LazyJavaClassTypeConstructor@275['Thread'] {
-    parameters = ArrayList@290[empty]
-    supertypes = ArrayList@291[1] { LazyJavaClassifierType@292['Runnable'] }
-}
-
-LazyJavaClassTypeConstructor@281['ThreadLocalMap'] {
-    parameters = ArrayList@293[empty]
-}
-
-LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler'] {
-    parameters = ArrayList@294[empty]
-    supertypes = ArrayList@295[1] { JetTypeImpl@288['Any'] }
-}
-
-LazyJavaClassifierType@296['AccessControlContext'] {
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@298
-}
-
-LazyJavaClassifierType@299['AccessControlContext'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@301['ClassLoader'] {
-    arguments = ArrayList@302[empty]
-    classifier = JavaClassImpl@303['ClassLoader']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@304['ClassLoader'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaClassImpl@306['ClassLoader']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@307['ClassLoader'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@309['ClassLoader']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@310['ClassLoader'] {
-    arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@303['ClassLoader']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@312['ClassLoader'] {
-    arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@306['ClassLoader']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@314['ClassLoader'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@309['ClassLoader']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
-}
-
-LazyJavaClassifierType@316['Interruptible'] {
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@317
-}
-
-LazyJavaClassifierType@318['Interruptible'] {
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@319
-}
-
-LazyJavaClassifierType@320['Interruptible'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@321['Interruptible'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@322['Object'] {
-    arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@324['Object']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@326['Object'] {
-    arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@328['Object']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@329['Object'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@331['Object']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@332['Object'] {
-    arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@334['Object']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@335['Object'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@334['Object']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@337['Object'] {
-    arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@328['Object']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@339['Object'] {
-    arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@331['Object']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@341['Object'] {
-    arguments = ArrayList@342[empty]
-    classifier = JavaClassImpl@324['Object']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@343['Object'] {
-    classifier = JavaClassImpl@344['Object']
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@345['Object'] {
-    classifier = JavaClassImpl@346['Object']
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@347['Object'] {
-    classifier = JavaClassImpl@348['Object']
-    typeConstructor = DeserializedClassTypeConstructor@325
-}
-
-LazyJavaClassifierType@292['Runnable'] {
-    arguments = ArrayList@349[empty]
-    classifier = JavaClassImpl@350['Runnable']
-    memberScope = LazyJavaClassMemberScope@7
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@351['Runnable'] {
-    arguments = ArrayList@352[empty]
-    classifier = JavaClassImpl@353['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@354['Runnable'] {
-    arguments = ArrayList@355[empty]
-    classifier = JavaClassImpl@356['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@357['Runnable'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@359['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@360['Runnable'] {
-    arguments = ArrayList@361[empty]
-    classifier = JavaClassImpl@362['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@363['Runnable'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@365['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@366['Runnable'] {
-    arguments = ArrayList@367[empty]
-    classifier = JavaClassImpl@368['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@369['Runnable'] {
-    arguments = ArrayList@370[empty]
-    classifier = JavaClassImpl@371['Runnable']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@372['Runnable'] {
-    arguments = ArrayList@373[empty]
-    classifier = JavaClassImpl@356['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@374['Runnable'] {
-    arguments = ArrayList@375[empty]
-    classifier = JavaClassImpl@353['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@376['Runnable'] {
-    arguments = ArrayList@377[empty]
-    classifier = JavaClassImpl@359['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@378['Runnable'] {
-    arguments = ArrayList@379[empty]
-    classifier = JavaClassImpl@362['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@380['Runnable'] {
-    arguments = ArrayList@381[empty]
-    classifier = JavaClassImpl@365['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@382['Runnable'] {
-    arguments = ArrayList@383[empty]
-    classifier = JavaClassImpl@371['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@384['Runnable'] {
-    arguments = ArrayList@385[empty]
-    classifier = JavaClassImpl@368['Runnable']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
-}
-
-LazyJavaClassifierType@386['StackTraceElement'] {
-    arguments = ArrayList@387[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@388
-}
-
-LazyJavaClassifierType@389['StackTraceElement'] {
-    classifier = null
-    nullable = 'true': Boolean@300
-    typeConstructor = TypeConstructorImpl$1@390
-}
-
-LazyJavaClassifierType@391['State'] {
-    arguments = ArrayList@392[empty]
-    classifier = JavaClassImpl@393['State']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@90['State']
-}
-
-LazyJavaClassifierType@394['State'] {
-    arguments = ArrayList@395[empty]
-    classifier = JavaClassImpl@393['State']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@90['State']
-}
-
-LazyJavaClassifierType@396['String'] {
-    arguments = ArrayList@397[empty]
-    classifier = JavaClassImpl@398['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@400['String'] {
-    arguments = ArrayList@401[empty]
-    classifier = JavaClassImpl@402['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@403['String'] {
-    arguments = ArrayList@404[empty]
-    classifier = JavaClassImpl@405['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@406['String'] {
-    arguments = ArrayList@407[empty]
-    classifier = JavaClassImpl@408['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@409['String'] {
-    arguments = ArrayList@410[empty]
-    classifier = JavaClassImpl@411['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@412['String'] {
-    arguments = ArrayList@413[empty]
-    classifier = JavaClassImpl@414['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@415['String'] {
-    arguments = ArrayList@416[empty]
-    classifier = JavaClassImpl@417['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@418['String'] {
-    arguments = ArrayList@419[empty]
-    classifier = JavaClassImpl@420['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@421['String'] {
-    arguments = ArrayList@422[empty]
-    classifier = JavaClassImpl@423['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@424['String'] {
-    arguments = ArrayList@425[empty]
-    classifier = JavaClassImpl@426['String']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@427['String'] {
-    arguments = ArrayList@428[empty]
-    classifier = JavaClassImpl@408['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@429['String'] {
-    arguments = ArrayList@430[empty]
-    classifier = JavaClassImpl@414['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@431['String'] {
-    arguments = ArrayList@432[empty]
-    classifier = JavaClassImpl@411['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@433['String'] {
-    arguments = ArrayList@434[empty]
-    classifier = JavaClassImpl@420['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@435['String'] {
-    arguments = ArrayList@436[empty]
-    classifier = JavaClassImpl@398['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@437['String'] {
-    arguments = ArrayList@438[empty]
-    classifier = JavaClassImpl@402['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@439['String'] {
-    arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@426['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@441['String'] {
-    arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@417['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@443['String'] {
-    arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@405['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@445['String'] {
-    arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@423['String']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@447['Thread'] {
-    arguments = ArrayList@448[empty]
-    classifier = JavaClassImpl@449['Thread']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@275['Thread']
-}
-
-LazyJavaClassifierType@450['Thread'] {
-    arguments = ArrayList@451[empty]
-    classifier = JavaClassImpl@452['Thread']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@275['Thread']
-}
-
-LazyJavaClassifierType@453['Thread'] {
-    arguments = ArrayList@454[empty]
-    classifier = JavaClassImpl@452['Thread']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@275['Thread']
-}
-
-LazyJavaClassifierType@455['Thread'] {
-    arguments = ArrayList@456[empty]
-    classifier = JavaClassImpl@449['Thread']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@275['Thread']
-}
-
-LazyJavaClassifierType@457['ThreadGroup'] {
-    arguments = ArrayList@458[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@459
-}
-
-LazyJavaClassifierType@460['ThreadGroup'] {
-    arguments = ArrayList@461[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@462
-}
-
-LazyJavaClassifierType@463['ThreadGroup'] {
-    arguments = ArrayList@464[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@465
-}
-
-LazyJavaClassifierType@466['ThreadGroup'] {
-    arguments = ArrayList@467[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@468
-}
-
-LazyJavaClassifierType@469['ThreadGroup'] {
-    arguments = ArrayList@470[empty]
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@471
-}
-
-LazyJavaClassifierType@472['ThreadGroup'] {
-    arguments = ArrayList@473[empty]
-    classifier = null
-    nullable = 'true': Boolean@300
-    typeConstructor = TypeConstructorImpl$1@474
-}
-
-LazyJavaClassifierType@475['ThreadGroup'] {
-    arguments = ArrayList@476[empty]
-    classifier = null
-    nullable = 'true': Boolean@300
-    typeConstructor = TypeConstructorImpl$1@477
-}
-
-LazyJavaClassifierType@478['ThreadGroup'] {
-    arguments = ArrayList@479[empty]
-    classifier = null
-    nullable = 'true': Boolean@300
-    typeConstructor = TypeConstructorImpl$1@480
-}
-
-LazyJavaClassifierType@481['ThreadGroup'] {
-    arguments = ArrayList@482[empty]
-    classifier = null
-    nullable = 'true': Boolean@300
-    typeConstructor = TypeConstructorImpl$1@483
-}
-
-LazyJavaClassifierType@484['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@485
-}
-
-LazyJavaClassifierType@486['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@297
-    typeConstructor = TypeConstructorImpl$1@487
-}
-
-LazyJavaClassifierType@488['ThreadGroup'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@489['ThreadGroup'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@490['ThreadGroup'] {
-    nullable = 'true': Boolean@300
-}
-
-LazyJavaClassifierType@491['ThreadLocalMap'] {
-    arguments = ArrayList@492[empty]
-    classifier = JavaClassImpl@493['ThreadLocalMap']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
-}
-
-LazyJavaClassifierType@494['ThreadLocalMap'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaClassImpl@496['ThreadLocalMap']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
-}
-
-LazyJavaClassifierType@497['ThreadLocalMap'] {
-    arguments = ArrayList@498[empty]
-    classifier = JavaClassImpl@493['ThreadLocalMap']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
-}
-
-LazyJavaClassifierType@499['ThreadLocalMap'] {
-    arguments = ArrayList@500[empty]
-    classifier = JavaClassImpl@496['ThreadLocalMap']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
-}
-
-LazyJavaClassifierType@501['Throwable'] {
-    arguments = ArrayList@502[empty]
-    classifier = JavaClassImpl@503['Throwable']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@505['Throwable'] {
-    arguments = ArrayList@506[empty]
-    classifier = JavaClassImpl@507['Throwable']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@508['Throwable'] {
-    arguments = ArrayList@509[empty]
-    classifier = JavaClassImpl@510['Throwable']
-    nullable = 'false': Boolean@297
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@511['Throwable'] {
-    arguments = ArrayList@512[empty]
-    classifier = JavaClassImpl@507['Throwable']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@513['Throwable'] {
-    arguments = ArrayList@514[empty]
-    classifier = JavaClassImpl@510['Throwable']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@515['Throwable'] {
-    arguments = ArrayList@516[empty]
-    classifier = JavaClassImpl@503['Throwable']
-    nullable = 'true': Boolean@300
-    typeConstructor = DeserializedClassTypeConstructor@504
-}
-
-LazyJavaClassifierType@517['UncaughtExceptionHandler'] {
-    arguments = ArrayList@518[empty]
-    classifier = JavaClassImpl@519['UncaughtExceptionHandler']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassifierType@520['UncaughtExceptionHandler'] {
-    arguments = ArrayList@521[empty]
-    classifier = JavaClassImpl@522['UncaughtExceptionHandler']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassifierType@523['UncaughtExceptionHandler'] {
-    arguments = ArrayList@524[empty]
-    classifier = JavaClassImpl@525['UncaughtExceptionHandler']
-    nullable = 'false': Boolean@297
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassifierType@526['UncaughtExceptionHandler'] {
-    arguments = ArrayList@527[empty]
-    classifier = JavaClassImpl@525['UncaughtExceptionHandler']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassifierType@528['UncaughtExceptionHandler'] {
-    arguments = ArrayList@529[empty]
-    classifier = JavaClassImpl@519['UncaughtExceptionHandler']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaClassifierType@530['UncaughtExceptionHandler'] {
-    arguments = ArrayList@531[empty]
-    classifier = JavaClassImpl@522['UncaughtExceptionHandler']
-    nullable = 'true': Boolean@300
-    typeConstructor = LazyJavaClassTypeConstructor@284['UncaughtExceptionHandler']
-}
-
-LazyJavaPackageFragmentProvider@532 {
-    packageFragments('<root>': FqName@533) = LazyJavaPackageFragment@534['<root>']
-    packageFragments('Test': FqName@535) = null
-    packageFragments('Thread': FqName@536) = null
-    packageFragments('java': FqName@537) = LazyJavaPackageFragment@538['java']
-    packageFragments('java.lang': FqName@539) = LazyJavaPackageFragment@540['lang']
-    packageFragments('java.lang.Test': FqName@541) = null
-    packageFragments('java.lang.Thread': FqName@542) = null
-    packageFragments('kotlin': FqName@543) = null
-    packageFragments('kotlin.Test': FqName@544) = null
-    packageFragments('kotlin.Thread': FqName@545) = null
-    packageFragments('kotlin.io': FqName@546) = null
-    packageFragments('kotlin.jvm': FqName@547) = null
-    topLevelClasses(JavaClassImpl@306['ClassLoader']) = LazyJavaClassDescriptor@0['ClassLoader']
-    topLevelClasses(JavaClassImpl@350['Runnable']) = LazyJavaClassDescriptor@2['Runnable']
-    topLevelClasses(JavaClassImpl@548['Thread']) = LazyJavaClassDescriptor@91['Thread']
-    topLevelClasses(JavaClassImpl@549['ThreadLocal']) = LazyJavaClassDescriptor@276['ThreadLocal']
-}
-
-LazyJavaPackageFragment@534['<root>'] {
-    classes('Thread': Name@550) = null // through LazyPackageFragmentScopeForJavaPackage@551
-    classes('init2': Name@552) = null // through LazyPackageFragmentScopeForJavaPackage@551
-    deserializedPackageScope = Empty@553 // through LazyPackageFragmentScopeForJavaPackage@551
-    functions('init2': Name@552) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@551
-    memberIndex = computeMemberIndex$1@554 // through LazyPackageFragmentScopeForJavaPackage@551
-}
-
-LazyJavaPackageFragment@538['java'] {
-    classes('lang': Name@555) = null // through LazyPackageFragmentScopeForJavaPackage@556
-    deserializedPackageScope = Empty@553 // through LazyPackageFragmentScopeForJavaPackage@556
-    functions('lang': Name@557) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@556
-    memberIndex = computeMemberIndex$1@558 // through LazyPackageFragmentScopeForJavaPackage@556
-}
-
-LazyJavaPackageFragment@540['lang'] {
-    classes('Thread': Name@550) = LazyJavaClassDescriptor@91['Thread'] // through LazyPackageFragmentScopeForJavaPackage@559
-    classes('init2': Name@552) = null // through LazyPackageFragmentScopeForJavaPackage@559
-    deserializedPackageScope = Empty@553 // through LazyPackageFragmentScopeForJavaPackage@559
-    functions('init2': Name@552) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@559
-    memberIndex = computeMemberIndex$1@560 // through LazyPackageFragmentScopeForJavaPackage@559
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[8] { ResolutionCandidate@572, ResolutionCandidate@573, ResolutionCandidate@574, ... }
-}
-
-null {
-    <name not found> = ArrayList@575[13] { ResolutionCandidate@572, ResolutionCandidate@573, ResolutionCandidate@576, ... }
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@578[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@579[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
deleted file mode 100644
index ff597472d45..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
+++ /dev/null
@@ -1,219 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassDescriptor@2['NullPointerException'] {
-    constructors = ArrayList@3[2] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'] } // through LazyJavaClassMemberScope@6
-    defaultType = JetTypeImpl@7['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@8['NullPointerException']
-}
-
-LazyJavaClassDescriptor@9['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@10['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@8['NullPointerException'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { LazyJavaClassifierType@16['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@10['RuntimeException'] {
-    parameters = ArrayList@17[empty]
-    supertypes = ArrayList@18[1] { LazyJavaClassifierType@19['Exception'] }
-}
-
-LazyJavaClassifierType@19['Exception'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
-}
-
-LazyJavaClassifierType@16['RuntimeException'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@10['RuntimeException']
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@35 {
-    packageFragments('<root>': FqName@36) = LazyJavaPackageFragment@37['<root>']
-    packageFragments('Array': FqName@38) = null
-    packageFragments('Int': FqName@39) = null
-    packageFragments('T': FqName@40) = null
-    packageFragments('java': FqName@41) = LazyJavaPackageFragment@42['java']
-    packageFragments('java.lang': FqName@43) = LazyJavaPackageFragment@44['lang']
-    packageFragments('java.lang.Array': FqName@45) = null
-    packageFragments('java.lang.Int': FqName@46) = null
-    packageFragments('java.lang.T': FqName@47) = null
-    packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.Array': FqName@49) = null
-    packageFragments('kotlin.Int': FqName@50) = null
-    packageFragments('kotlin.T': FqName@51) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    topLevelClasses(JavaClassImpl@21['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@54['NullPointerException']) = LazyJavaClassDescriptor@2['NullPointerException']
-    topLevelClasses(JavaClassImpl@23['RuntimeException']) = LazyJavaClassDescriptor@9['RuntimeException']
-}
-
-LazyJavaPackageFragment@37['<root>'] {
-    classes('Array': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('NullPointerException': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('equals': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('NullPointerException': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('equals': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('inc': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@42['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@44['lang'] {
-    classes('NullPointerException': Name@58) = LazyJavaClassDescriptor@2['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('equals': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('NullPointerException': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('equals': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('inc': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[2] { ResolutionCandidate@107, ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-}
-
-null {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@107, ResolutionCandidate@108 }
-    <name not found> = ArrayList@124[2] { ResolutionCandidate@99, ResolutionCandidate@100 }
-    <name not found> = ArrayList@125[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
-    <name not found> = ArrayList@126[2] { ResolutionCandidate@103, ResolutionCandidate@104 }
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-    <name not found> = EmptyList@62[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
deleted file mode 100644
index 6a2f3b1277a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
+++ /dev/null
@@ -1,171 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassDescriptor@4['NullPointerException'] {
-    constructors = ArrayList@5[2] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['NullPointerException']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['NullPointerException']
-}
-
-LazyJavaClassDescriptor@11['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@12['RuntimeException']
-}
-
-LazyJavaClassTypeConstructor@3['Exception'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { LazyJavaClassifierType@15['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@10['NullPointerException'] {
-    parameters = ArrayList@16[empty]
-    supertypes = ArrayList@17[1] { LazyJavaClassifierType@18['RuntimeException'] }
-}
-
-LazyJavaClassTypeConstructor@12['RuntimeException'] {
-    parameters = ArrayList@19[empty]
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Exception'] }
-}
-
-LazyJavaClassifierType@21['Exception'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@3['Exception']
-}
-
-LazyJavaClassifierType@18['RuntimeException'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@25['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@12['RuntimeException']
-}
-
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'false': Boolean@29
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'true': Boolean@33
-    typeConstructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaClassifierType@15['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('Any': FqName@40) = null
-    packageFragments('Int': FqName@41) = null
-    packageFragments('T': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.Any': FqName@47) = null
-    packageFragments('java.lang.Int': FqName@48) = null
-    packageFragments('java.lang.T': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.Any': FqName@51) = null
-    packageFragments('kotlin.Int': FqName@52) = null
-    packageFragments('kotlin.T': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = null
-    packageFragments('kotlin.jvm': FqName@55) = null
-    topLevelClasses(JavaClassImpl@23['Exception']) = LazyJavaClassDescriptor@2['Exception']
-    topLevelClasses(JavaClassImpl@56['NullPointerException']) = LazyJavaClassDescriptor@4['NullPointerException']
-    topLevelClasses(JavaClassImpl@25['RuntimeException']) = LazyJavaClassDescriptor@11['RuntimeException']
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('Any': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Int': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('NullPointerException': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('_sure': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('equals': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('NullPointerException': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('_sure': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('equals': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@46['lang'] {
-    classes('NullPointerException': Name@60) = LazyJavaClassDescriptor@4['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('_sure': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('equals': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('NullPointerException': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('_sure': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('equals': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
-
-null {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@95[2] { ResolutionCandidate@88, ResolutionCandidate@89 }
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-    <name not found> = EmptyList@64[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
deleted file mode 100644
index dd3e958e4f2..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('ChannelPipeline': FqName@3) = null
-    packageFragments('ChannelPipelineFactory': FqName@4) = null
-    packageFragments('DefaultChannelPipeline': FqName@5) = null
-    packageFragments('StandardPipelineFactory': FqName@6) = null
-    packageFragments('Unit': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.ChannelPipeline': FqName@12) = null
-    packageFragments('java.lang.ChannelPipelineFactory': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.ChannelPipeline': FqName@16) = null
-    packageFragments('kotlin.ChannelPipelineFactory': FqName@17) = null
-    packageFragments('kotlin.Unit': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('DefaultChannelPipeline': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Unit': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('config': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('DefaultChannelPipeline': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('config': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('DefaultChannelPipeline': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('config': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('DefaultChannelPipeline': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('config': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-null {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
deleted file mode 100644
index 28040229fe9..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
+++ /dev/null
@@ -1,362 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Array': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('lol': FqName@19) = null
-    packageFragments('lol.Array': FqName@20) = null
-    packageFragments('lol.B': FqName@21) = null
-    packageFragments('lol.String': FqName@22) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('div': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('minus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('mod': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('times': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('B': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('div': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('minus': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('mod': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('times': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
deleted file mode 100644
index f005ecbe550..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
+++ /dev/null
@@ -1,180 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Boolean': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Boolean': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('kt629': FqName@18) = null
-    packageFragments('kt629.A': FqName@19) = null
-    packageFragments('kt629.Boolean': FqName@20) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('modAssign': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('A': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('modAssign': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
deleted file mode 100644
index 511de412297..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Any': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('s': FqName@21) = null
-    packageFragments('x': FqName@22) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('sure': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('x': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('sure': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('sure': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('x': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('sure': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-null {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
deleted file mode 100644
index dc68571be08..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
+++ /dev/null
@@ -1,145 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.B': FqName@16) = null
-    packageFragments('kotlin.T': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('x': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('B': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('a': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('x': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('x': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('B': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('a': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('x': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt691.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt691.lazy.log
deleted file mode 100644
index 251b178e16b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt691.lazy.log
+++ /dev/null
@@ -1,18 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('foo': FqName@3) = null
-    packageFragments('foo.bar': FqName@4) = null
-    packageFragments('foo.bar.buz': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
deleted file mode 100644
index c01c8a9d0f2..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
+++ /dev/null
@@ -1,470 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@7['Class'] {
-    defaultType = JetTypeImpl@8['Class<1>']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functions('cast': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['cast'] } // through LazyJavaClassMemberScope@10
-    functions('isInstance': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@10
-    nestedClasses('cast': Name@11) = null // through LazyJavaClassMemberScope@10
-    nestedClasses('isInstance': Name@14) = null // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['Class']
-}
-
-LazyJavaClassDescriptor@21['Error'] {
-    typeConstructor = LazyJavaClassTypeConstructor@22['Error']
-}
-
-LazyJavaClassDescriptor@23['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
-}
-
-LazyJavaClassDescriptor@25['GenericDeclaration'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@29['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@30['RuntimeException']
-}
-
-LazyJavaClassDescriptor@31['Serializable'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
-}
-
-LazyJavaClassDescriptor@35['Type'] {
-    functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
-}
-
-LazyJavaClassTypeConstructor@6['AnnotatedElement'] {
-    parameters = ArrayList@39[empty]
-    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@20['Class'] {
-    parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['T'] }
-    supertypes = ArrayList@44[4] { LazyJavaClassifierType@45['Serializable'], LazyJavaClassifierType@46['GenericDeclaration'], LazyJavaClassifierType@47['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@22['Error'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@24['Exception'] {
-    parameters = ArrayList@51[empty]
-    supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@28['GenericDeclaration'] {
-    parameters = ArrayList@54[empty]
-    supertypes = ArrayList@55[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@30['RuntimeException'] {
-    parameters = ArrayList@56[empty]
-    supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['Exception'] }
-}
-
-LazyJavaClassTypeConstructor@34['Serializable'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassTypeConstructor@38['Type'] {
-    parameters = ArrayList@61[empty]
-    supertypes = ArrayList@62[1] { JetTypeImpl@41['Any'] }
-}
-
-LazyJavaClassifierType@63['AnnotatedElement'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@65['AnnotatedElement']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
-}
-
-LazyJavaClassifierType@58['Exception'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@24['Exception']
-}
-
-LazyJavaClassifierType@46['GenericDeclaration'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['GenericDeclaration']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
-}
-
-LazyJavaClassifierType@70['Object'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'false': Boolean@74
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@76['Object'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'false': Boolean@74
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@79['Object'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@78['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'true': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@82['Object'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@72['Object']
-    memberScope = DeserializedClassMemberScope@73
-    nullable = 'true': Boolean@81
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@84['Object'] {
-    classifier = JavaClassImpl@85['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@88['Object'] {
-    classifier = JavaClassImpl@89['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@90['Object'] {
-    classifier = JavaClassImpl@91['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@92['Object'] {
-    classifier = JavaClassImpl@93['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@45['Serializable'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['Serializable']
-    memberScope = LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
-}
-
-LazyJavaClassifierType@96['T'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@98['T']
-    nullable = 'false': Boolean@74
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@98['T']
-    nullable = 'true': Boolean@81
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-LazyJavaClassifierType@50['Throwable'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@53['Throwable'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@104
-}
-
-LazyJavaClassifierType@47['Type'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Type']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Type']
-}
-
-LazyJavaPackageFragmentProvider@109 {
-    packageFragments('<root>': FqName@110) = LazyJavaPackageFragment@111['<root>']
-    packageFragments('Class': FqName@112) = null
-    packageFragments('Error': FqName@113) = null
-    packageFragments('RuntimeException': FqName@114) = null
-    packageFragments('T': FqName@115) = null
-    packageFragments('Throwable': FqName@116) = null
-    packageFragments('Throwables': FqName@117) = null
-    packageFragments('X': FqName@118) = null
-    packageFragments('java': FqName@119) = LazyJavaPackageFragment@120['java']
-    packageFragments('java.io': FqName@121) = LazyJavaPackageFragment@122['io']
-    packageFragments('java.lang': FqName@123) = LazyJavaPackageFragment@124['lang']
-    packageFragments('java.lang.Class': FqName@125) = null
-    packageFragments('java.lang.Error': FqName@126) = null
-    packageFragments('java.lang.RuntimeException': FqName@127) = null
-    packageFragments('java.lang.T': FqName@128) = null
-    packageFragments('java.lang.Throwable': FqName@129) = null
-    packageFragments('java.lang.X': FqName@130) = null
-    packageFragments('java.lang.reflect': FqName@131) = LazyJavaPackageFragment@132['reflect']
-    packageFragments('kotlin': FqName@133) = null
-    packageFragments('kotlin.Class': FqName@134) = null
-    packageFragments('kotlin.Error': FqName@135) = null
-    packageFragments('kotlin.RuntimeException': FqName@136) = null
-    packageFragments('kotlin.T': FqName@137) = null
-    packageFragments('kotlin.Throwable': FqName@138) = null
-    packageFragments('kotlin.X': FqName@139) = null
-    packageFragments('kotlin.io': FqName@140) = null
-    packageFragments('kotlin.jvm': FqName@141) = null
-    topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@142['Class']) = LazyJavaClassDescriptor@7['Class']
-    topLevelClasses(JavaClassImpl@143['Error']) = LazyJavaClassDescriptor@21['Error']
-    topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@23['Exception']
-    topLevelClasses(JavaClassImpl@69['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@144['RuntimeException']) = LazyJavaClassDescriptor@29['RuntimeException']
-    topLevelClasses(JavaClassImpl@95['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
-    topLevelClasses(JavaClassImpl@108['Type']) = LazyJavaClassDescriptor@35['Type']
-}
-
-LazyJavaPackageFragment@111['<root>'] {
-    classes('Class': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('Error': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('RuntimeException': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('Throwable': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
-}
-
-LazyJavaPackageFragment@120['java'] {
-    classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('lang': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@157
-}
-
-LazyJavaPackageFragment@124['lang'] {
-    classes('Class': Name@160) = LazyJavaClassDescriptor@7['Class'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('Error': Name@147) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('RuntimeException': Name@148) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@161
-}
-
-LazyJavaTypeParameterDescriptor@43['T'] {
-    defaultType = JetTypeImpl@163['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@164[1] { NullableType@165 }
-}
-
-LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@167['T']) = LazyJavaTypeParameterDescriptor@43['T']
-}
-
-LazyJavaTypeParameterResolver@168 {
-    resolve(JavaTypeParameterImpl@98['T']) = null
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-null {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
deleted file mode 100644
index 7b33ab386a3..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
+++ /dev/null
@@ -1,468 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Class<1>']
-}
-
-LazyJavaClassDescriptor@2['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@4['Appendable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassDescriptor@10['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@14['Class'] {
-    defaultType = JetTypeImpl@15['Class<1>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-}
-
-LazyJavaClassDescriptor@17['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassDescriptor@21['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@25['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@26['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@27['Object'] {
-    defaultType = JetTypeImpl@28['Object']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
-    functions('getClass': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['getClass'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@30
-    nestedClasses('getClass': Name@31) = null // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['Object']
-}
-
-LazyJavaClassDescriptor@38['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['OutputStream']
-}
-
-LazyJavaClassDescriptor@42['PrintStream'] {
-    defaultType = JetTypeImpl@43['PrintStream']
-    enumEntryIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@45
-    functions('println': Name@46) = ArrayList@47[10] { JavaMethodDescriptor@48['println'], JavaMethodDescriptor@49['println'], JavaMethodDescriptor@50['println'], ... } // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@45
-    nestedClassIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@45
-    nestedClasses('println': Name@46) = null // through LazyJavaClassMemberScope@45
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
-}
-
-LazyJavaClassDescriptor@55['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassDescriptor@57['System'] {
-    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@60 // through LazyJavaClassMemberScope@59
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaStaticClassScope@62
-    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@59
-    nestedClasses('out': Name@64) = null // through LazyJavaClassMemberScope@59
-    properties('out': Name@64) = ArrayList@65[1] { JavaPropertyDescriptor@66['out'] } // through LazyJavaStaticClassScope@62
-    properties('out': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@67['System']
-}
-
-LazyJavaClassDescriptor@68['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@69['Type']
-}
-
-LazyJavaClassTypeConstructor@3['AnnotatedElement'] {
-    supertypes = ArrayList@70[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['Appendable'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@16['Class'] {
-    parameters = ArrayList@76[1] { LazyJavaTypeParameterDescriptor@77['T'] }
-    supertypes = ArrayList@78[4] { LazyJavaClassifierType@79['Serializable'], LazyJavaClassifierType@80['GenericDeclaration'], LazyJavaClassifierType@81['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@20['Closeable'] {
-    parameters = ArrayList@82[empty]
-    supertypes = ArrayList@83[1] { LazyJavaClassifierType@84['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
-    parameters = ArrayList@85[empty]
-    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@26['GenericDeclaration'] {
-    supertypes = ArrayList@88[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@37['Object'] {
-    parameters = ArrayList@89[empty]
-    supertypes = ArrayList@90[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@41['OutputStream'] {
-    parameters = ArrayList@91[empty]
-    supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@54['PrintStream'] {
-    parameters = ArrayList@94[empty]
-    supertypes = ArrayList@95[3] { LazyJavaClassifierType@96['FilterOutputStream'], LazyJavaClassifierType@97['Appendable'], LazyJavaClassifierType@98['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@56['Serializable'] {
-    parameters = ArrayList@99[empty]
-    supertypes = ArrayList@100[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@67['System'] {
-    supertypes = ArrayList@101[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassTypeConstructor@69['Type'] {
-    supertypes = ArrayList@102[1] { JetTypeImpl@71['Any'] }
-}
-
-LazyJavaClassifierType@103['AnnotatedElement'] {
-    classifier = JavaClassImpl@104['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
-}
-
-LazyJavaClassifierType@97['Appendable'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['Appendable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
-}
-
-LazyJavaClassifierType@84['AutoCloseable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassifierType@109['Class<?>'] {
-    arguments = ArrayList@110[1] { LazyStarProjection@111 }
-    classifier = JavaClassImpl@112['Class']
-    nullable = 'false': Boolean@113
-    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-}
-
-LazyJavaClassifierType@114['Class<?>'] {
-    arguments = ArrayList@115[1] { LazyStarProjection@116 }
-    classifier = JavaClassImpl@112['Class']
-    nullable = 'true': Boolean@117
-    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
-}
-
-LazyJavaClassifierType@98['Closeable'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['Closeable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassifierType@93['Closeable'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['Closeable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
-}
-
-LazyJavaClassifierType@96['FilterOutputStream'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
-}
-
-LazyJavaClassifierType@124['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@125
-}
-
-LazyJavaClassifierType@80['GenericDeclaration'] {
-    classifier = JavaClassImpl@126['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@26['GenericDeclaration']
-}
-
-LazyJavaClassifierType@127['Object'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@129['Object']
-    nullable = 'false': Boolean@113
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@131['Object'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@129['Object']
-    nullable = 'true': Boolean@117
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@133['Object'] {
-    classifier = JavaClassImpl@134['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@135['Object'] {
-    classifier = JavaClassImpl@136['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@137['Object'] {
-    classifier = JavaClassImpl@138['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@139['Object'] {
-    classifier = JavaClassImpl@140['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@141['Object'] {
-    classifier = JavaClassImpl@142['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@143['Object'] {
-    classifier = JavaClassImpl@144['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@145['Object'] {
-    classifier = JavaClassImpl@146['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@147['Object'] {
-    classifier = JavaClassImpl@148['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@149['Object'] {
-    classifier = JavaClassImpl@150['Object']
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@87['OutputStream'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@152['OutputStream']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['OutputStream']
-}
-
-LazyJavaClassifierType@153['PrintStream'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['PrintStream']
-    memberScope = LazyJavaClassMemberScope@45
-    nullable = 'false': Boolean@113
-    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
-}
-
-LazyJavaClassifierType@156['PrintStream'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@155['PrintStream']
-    nullable = 'true': Boolean@117
-    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
-}
-
-LazyJavaClassifierType@79['Serializable'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@159['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
-}
-
-LazyJavaClassifierType@160['String'] {
-    arguments = ArrayList@161[empty]
-    classifier = JavaClassImpl@162['String']
-    nullable = 'false': Boolean@113
-    typeConstructor = DeserializedClassTypeConstructor@163
-}
-
-LazyJavaClassifierType@164['String'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@162['String']
-    nullable = 'true': Boolean@117
-    typeConstructor = DeserializedClassTypeConstructor@163
-}
-
-LazyJavaClassifierType@81['Type'] {
-    classifier = JavaClassImpl@166['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@69['Type']
-}
-
-LazyJavaPackageFragmentProvider@167 {
-    packageFragments('<root>': FqName@168) = LazyJavaPackageFragment@169['<root>']
-    packageFragments('Array': FqName@170) = null
-    packageFragments('String': FqName@171) = null
-    packageFragments('System': FqName@172) = null
-    packageFragments('T': FqName@173) = null
-    packageFragments('TypeInfo': FqName@174) = null
-    packageFragments('java': FqName@175) = LazyJavaPackageFragment@176['java']
-    packageFragments('java.io': FqName@177) = LazyJavaPackageFragment@178['io']
-    packageFragments('java.lang': FqName@179) = LazyJavaPackageFragment@180['lang']
-    packageFragments('java.lang.Array': FqName@181) = null
-    packageFragments('java.lang.Class': FqName@182) = null
-    packageFragments('java.lang.Object': FqName@183) = null
-    packageFragments('java.lang.String': FqName@184) = null
-    packageFragments('java.lang.System': FqName@185) = null
-    packageFragments('java.lang.T': FqName@186) = null
-    packageFragments('java.lang.TypeInfo': FqName@187) = null
-    packageFragments('java.lang.reflect': FqName@188) = LazyJavaPackageFragment@189['reflect']
-    packageFragments('kotlin': FqName@190) = null
-    packageFragments('kotlin.Array': FqName@191) = null
-    packageFragments('kotlin.String': FqName@192) = null
-    packageFragments('kotlin.System': FqName@193) = null
-    packageFragments('kotlin.T': FqName@194) = null
-    packageFragments('kotlin.TypeInfo': FqName@195) = null
-    packageFragments('kotlin.io': FqName@196) = null
-    packageFragments('kotlin.jvm': FqName@197) = null
-    topLevelClasses(JavaClassImpl@104['AnnotatedElement']) = LazyJavaClassDescriptor@2['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@106['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@108['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
-    topLevelClasses(JavaClassImpl@198['Class']) = LazyJavaClassDescriptor@14['Class']
-    topLevelClasses(JavaClassImpl@119['Closeable']) = LazyJavaClassDescriptor@17['Closeable']
-    topLevelClasses(JavaClassImpl@123['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@126['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@199['Object']) = LazyJavaClassDescriptor@27['Object']
-    topLevelClasses(JavaClassImpl@152['OutputStream']) = LazyJavaClassDescriptor@38['OutputStream']
-    topLevelClasses(JavaClassImpl@155['PrintStream']) = LazyJavaClassDescriptor@42['PrintStream']
-    topLevelClasses(JavaClassImpl@159['Serializable']) = LazyJavaClassDescriptor@55['Serializable']
-    topLevelClasses(JavaClassImpl@200['System']) = LazyJavaClassDescriptor@57['System']
-    topLevelClasses(JavaClassImpl@166['Type']) = LazyJavaClassDescriptor@68['Type']
-}
-
-LazyJavaPackageFragment@169['<root>'] {
-    classes('Array': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('System': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('getJavaClass': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('java': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('typeinfo': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('getJavaClass': Name@205) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('typeinfo': Name@207) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
-}
-
-LazyJavaPackageFragment@176['java'] {
-    classes('lang': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('lang': Name@212) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@211
-}
-
-LazyJavaPackageFragment@180['lang'] {
-    classes('Class': Name@214) = LazyJavaClassDescriptor@14['Class'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Object': Name@216) = LazyJavaClassDescriptor@27['Object'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('System': Name@204) = LazyJavaClassDescriptor@57['System'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getJavaClass': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('java': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('typeinfo': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('getJavaClass': Name@205) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('typeinfo': Name@207) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@215
-}
-
-LazyJavaTypeParameterDescriptor@77['T'] {
-    defaultType = JetTypeImpl@218['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
-    upperBounds = LinkedHashSet@220[1] { NullableType@221 }
-    upperBoundsAsType = NullableType@221
-}
-
-LazyJavaTypeParameterResolver@222 {
-    resolve(JavaTypeParameterImpl@223['T']) = LazyJavaTypeParameterDescriptor@77['T']
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[10] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-null {
-    <name not found> = ArrayList@248[10] { ResolutionCandidate@226, ResolutionCandidate@227, ResolutionCandidate@228, ... }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
deleted file mode 100644
index fb4696ec818..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
+++ /dev/null
@@ -1,108 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('List': FqName@4) = null
-    packageFragments('Q': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.List': FqName@12) = null
-    packageFragments('java.lang.Q': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.List': FqName@17) = null
-    packageFragments('kotlin.Q': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('map': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('sure': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tail': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('map': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('sure': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('map': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('sure': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('tail': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('map': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('sure': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
deleted file mode 100644
index 6ee83e6698c..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
+++ /dev/null
@@ -1,493 +0,0 @@
-LazyJavaClassDescriptor@0['Appendable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassDescriptor@6['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassDescriptor@10['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassDescriptor@14['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassDescriptor@18['Integer'] {
-    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@20
-    functions('valueOf': Name@21) = ArrayList@22[3] { JavaMethodDescriptor@23['valueOf'], JavaMethodDescriptor@24['valueOf'], JavaMethodDescriptor@25['valueOf'] } // through LazyJavaStaticClassScope@26
-    functions('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaStaticClassScope@26
-    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@20
-    nestedClasses('valueOf': Name@21) = null // through LazyJavaClassMemberScope@20
-    properties('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    properties('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaStaticClassScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@30['Integer']
-}
-
-LazyJavaClassDescriptor@31['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
-}
-
-LazyJavaClassDescriptor@35['PrintStream'] {
-    defaultType = JetTypeImpl@36['PrintStream']
-    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@38
-    functions('println': Name@39) = ArrayList@40[10] { JavaMethodDescriptor@41['println'], JavaMethodDescriptor@42['println'], JavaMethodDescriptor@43['println'], ... } // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@38
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@38
-    nestedClasses('println': Name@39) = null // through LazyJavaClassMemberScope@38
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
-}
-
-LazyJavaClassDescriptor@48['System'] {
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaStaticClassScope@53
-    nestedClassIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@50
-    nestedClasses('out': Name@55) = null // through LazyJavaClassMemberScope@50
-    properties('out': Name@55) = ArrayList@56[1] { JavaPropertyDescriptor@57['out'] } // through LazyJavaStaticClassScope@53
-    properties('out': Name@55) = EmptyList@2[empty] // through LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@58['System']
-}
-
-LazyJavaClassTypeConstructor@5['Appendable'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@9['AutoCloseable'] {
-    parameters = ArrayList@62[empty]
-    supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Closeable'] {
-    parameters = ArrayList@64[empty]
-    supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['AutoCloseable'] }
-}
-
-LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
-    parameters = ArrayList@67[empty]
-    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
-}
-
-LazyJavaClassTypeConstructor@30['Integer'] {
-    supertypes = ArrayList@70[2] { LazyJavaClassifierType@71['Number'], LazyJavaClassifierType@72['Comparable<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@34['OutputStream'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@47['PrintStream'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['FilterOutputStream'], LazyJavaClassifierType@79['Appendable'], LazyJavaClassifierType@80['Closeable'] }
-}
-
-LazyJavaClassTypeConstructor@58['System'] {
-    supertypes = ArrayList@81[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@79['Appendable'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@83['Appendable']
-    memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
-}
-
-LazyJavaClassifierType@66['AutoCloseable'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@85['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
-}
-
-LazyJavaClassifierType@75['Closeable'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@80['Closeable'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['Closeable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
-}
-
-LazyJavaClassifierType@72['Comparable<Integer>'] {
-    arguments = ArrayList@90[1] { TypeProjectionImpl@91 }
-    classifier = JavaClassImpl@92['Comparable']
-    memberScope = SubstitutingScope@93
-    typeConstructor = DeserializedClassTypeConstructor@94
-}
-
-LazyJavaClassifierType@78['FilterOutputStream'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
-}
-
-LazyJavaClassifierType@97['Flushable'] {
-    classifier = null
-    typeConstructor = TypeConstructorImpl$1@98
-}
-
-LazyJavaClassifierType@99['Integer'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['Integer']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@104['Integer'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@106['Integer']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@107['Integer'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['Integer']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@110['Integer'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['Integer']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@113['Integer'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@106['Integer']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@116['Integer'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@109['Integer']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@118['Integer'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@101['Integer']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@120['Integer'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@112['Integer']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@103
-}
-
-LazyJavaClassifierType@71['Number'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['Number']
-    memberScope = DeserializedClassMemberScope@124
-    typeConstructor = DeserializedClassTypeConstructor@125
-}
-
-LazyJavaClassifierType@126['Object'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['Object']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@130['Object'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@128['Object']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@132['Object'] {
-    classifier = JavaClassImpl@133['Object']
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@134['Object'] {
-    classifier = JavaClassImpl@135['Object']
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@136['Object'] {
-    classifier = JavaClassImpl@137['Object']
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@138['Object'] {
-    classifier = JavaClassImpl@139['Object']
-    typeConstructor = DeserializedClassTypeConstructor@129
-}
-
-LazyJavaClassifierType@69['OutputStream'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@141['OutputStream']
-    memberScope = LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
-}
-
-LazyJavaClassifierType@142['PrintStream'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@144['PrintStream']
-    memberScope = LazyJavaClassMemberScope@38
-    nullable = 'false': Boolean@102
-    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
-}
-
-LazyJavaClassifierType@145['PrintStream'] {
-    arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@144['PrintStream']
-    nullable = 'true': Boolean@115
-    typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
-}
-
-LazyJavaClassifierType@147['String'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@149['String']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaClassifierType@151['String'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@153['String']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaClassifierType@154['String'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@156['String']
-    nullable = 'false': Boolean@102
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaClassifierType@157['String'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@153['String']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaClassifierType@159['String'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@149['String']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaClassifierType@161['String'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@156['String']
-    nullable = 'true': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@150
-}
-
-LazyJavaPackageFragmentProvider@163 {
-    packageFragments('<root>': FqName@164) = LazyJavaPackageFragment@165['<root>']
-    packageFragments('Any': FqName@166) = null
-    packageFragments('Array': FqName@167) = null
-    packageFragments('Int': FqName@168) = null
-    packageFragments('Integer': FqName@169) = null
-    packageFragments('String': FqName@170) = null
-    packageFragments('System': FqName@171) = null
-    packageFragments('T': FqName@172) = null
-    packageFragments('java': FqName@173) = LazyJavaPackageFragment@174['java']
-    packageFragments('java.io': FqName@175) = LazyJavaPackageFragment@176['io']
-    packageFragments('java.lang': FqName@177) = LazyJavaPackageFragment@178['lang']
-    packageFragments('java.lang.Any': FqName@179) = null
-    packageFragments('java.lang.Array': FqName@180) = null
-    packageFragments('java.lang.Int': FqName@181) = null
-    packageFragments('java.lang.Integer': FqName@182) = null
-    packageFragments('java.lang.String': FqName@183) = null
-    packageFragments('java.lang.System': FqName@184) = null
-    packageFragments('java.lang.T': FqName@185) = null
-    packageFragments('kotlin': FqName@186) = null
-    packageFragments('kotlin.Any': FqName@187) = null
-    packageFragments('kotlin.Array': FqName@188) = null
-    packageFragments('kotlin.Int': FqName@189) = null
-    packageFragments('kotlin.Integer': FqName@190) = null
-    packageFragments('kotlin.String': FqName@191) = null
-    packageFragments('kotlin.System': FqName@192) = null
-    packageFragments('kotlin.T': FqName@193) = null
-    packageFragments('kotlin.io': FqName@194) = null
-    packageFragments('kotlin.jvm': FqName@195) = null
-    topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
-    topLevelClasses(JavaClassImpl@89['Closeable']) = LazyJavaClassDescriptor@10['Closeable']
-    topLevelClasses(JavaClassImpl@96['FilterOutputStream']) = LazyJavaClassDescriptor@14['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@196['Integer']) = LazyJavaClassDescriptor@18['Integer']
-    topLevelClasses(JavaClassImpl@141['OutputStream']) = LazyJavaClassDescriptor@31['OutputStream']
-    topLevelClasses(JavaClassImpl@144['PrintStream']) = LazyJavaClassDescriptor@35['PrintStream']
-    topLevelClasses(JavaClassImpl@197['System']) = LazyJavaClassDescriptor@48['System']
-}
-
-LazyJavaPackageFragment@165['<root>'] {
-    classes('Any': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Array': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Int': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Integer': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('System': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('sure': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('sure': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@199
-}
-
-LazyJavaPackageFragment@174['java'] {
-    classes('lang': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@209
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@209
-    functions('lang': Name@210) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@209
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@209
-}
-
-LazyJavaPackageFragment@178['lang'] {
-    classes('Integer': Name@202) = LazyJavaClassDescriptor@18['Integer'] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('System': Name@204) = LazyJavaClassDescriptor@48['System'] // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('sure': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('sure': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@212
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[10] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[3] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[3] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249 }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
-
-null {
-    <name not found> = ArrayList@258[10] { ResolutionCandidate@216, ResolutionCandidate@217, ResolutionCandidate@218, ... }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@266[3] { ResolutionCandidate@242, ResolutionCandidate@243, ResolutionCandidate@244 }
-    <name not found> = ArrayList@267[3] { ResolutionCandidate@247, ResolutionCandidate@248, ResolutionCandidate@249 }
-    <name not found> = ArrayList@268[8] { ResolutionCandidate@252, ResolutionCandidate@253, ResolutionCandidate@254, ... }
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-    <name not found> = EmptyList@2[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt762.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt762.lazy.log
deleted file mode 100644
index f77ad62b5b6..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt762.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('aaa': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Array': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Array': FqName@13) = null
-    packageFragments('kotlin.String': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('aaa': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('aaa': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
deleted file mode 100644
index 8c21a96acdd..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
+++ /dev/null
@@ -1,26 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.T': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.T': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-ResolutionTaskHolder@19 {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-}
-
-null {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
deleted file mode 100644
index 37bca5fb81b..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
+++ /dev/null
@@ -1,368 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ArrayList<1>']
-}
-
-LazyJavaClassDescriptor@2['AbstractCollection'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@4['AbstractList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassDescriptor@6['ArrayList'] {
-    constructors = ArrayList@7[3] { JavaConstructorDescriptor@8['<init>'], JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'] } // through LazyJavaClassMemberScope@11
-    defaultType = JetTypeImpl@12['ArrayList<1>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['ArrayList']
-}
-
-LazyJavaClassDescriptor@14['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassDescriptor@16['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaClassTypeConstructor@3['AbstractCollection'] {
-    parameters = ArrayList@18[1] { LazyJavaTypeParameterDescriptor@19['E'] }
-    supertypes = ArrayList@20[1] { LazyJavaClassifierType@21['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@5['AbstractList'] {
-    parameters = ArrayList@22[1] { LazyJavaTypeParameterDescriptor@23['E'] }
-    supertypes = ArrayList@24[2] { LazyJavaClassifierType@25['AbstractCollection<E>'], LazyJavaClassifierType@26['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@13['ArrayList'] {
-    parameters = ArrayList@27[1] { LazyJavaTypeParameterDescriptor@28['E'] }
-    supertypes = ArrayList@29[5] { LazyJavaClassifierType@30['AbstractList<E>'], LazyJavaClassifierType@31['List<E>'], LazyJavaClassifierType@32['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@15['RandomAccess'] {
-    supertypes = ArrayList@33[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Serializable'] {
-    supertypes = ArrayList@35[1] { JetTypeImpl@34['Any'] }
-}
-
-LazyJavaClassifierType@25['AbstractCollection<E>'] {
-    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
-    classifier = JavaClassImpl@38['AbstractCollection']
-    typeConstructor = LazyJavaClassTypeConstructor@3['AbstractCollection']
-}
-
-LazyJavaClassifierType@30['AbstractList<E>'] {
-    arguments = ArrayList@39[1] { TypeProjectionImpl@40 }
-    classifier = JavaClassImpl@41['AbstractList']
-    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractList']
-}
-
-LazyJavaClassifierType@42['Cloneable'] {
-    classifier = JavaClassImpl@43['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@44
-}
-
-LazyJavaClassifierType@45['Collection<? extends E>'] {
-    arguments = ArrayList@46[1] { TypeProjectionImpl@47 }
-    classifier = JavaClassImpl@48['Collection']
-    memberScope = SubstitutingScope@49
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@52['Collection<? extends E>'] {
-    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
-    classifier = JavaClassImpl@48['Collection']
-    memberScope = SubstitutingScope@55
-    nullable = 'true': Boolean@56
-    typeConstructor = DeserializedClassTypeConstructor@57
-}
-
-LazyJavaClassifierType@21['Collection<E>'] {
-    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
-    classifier = JavaClassImpl@60['Collection']
-    memberScope = SubstitutingScope@61
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@66['E'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@77['E'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@79['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@82['E'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@68['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@75['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaClassifierType@31['List<E>'] {
-    classifier = JavaClassImpl@90['List']
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@26['List<E>'] {
-    classifier = JavaClassImpl@92['List']
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@93['Object'] {
-    classifier = JavaClassImpl@94['Object']
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@96['Object'] {
-    classifier = JavaClassImpl@97['Object']
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@98['Object'] {
-    classifier = JavaClassImpl@99['Object']
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@32['RandomAccess'] {
-    classifier = JavaClassImpl@100['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@15['RandomAccess']
-}
-
-LazyJavaClassifierType@101['Serializable'] {
-    classifier = JavaClassImpl@102['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@103 {
-    packageFragments('<root>': FqName@104) = LazyJavaPackageFragment@105['<root>']
-    packageFragments('Iterator': FqName@106) = null
-    packageFragments('MutableCollection': FqName@107) = null
-    packageFragments('T': FqName@108) = null
-    packageFragments('U': FqName@109) = null
-    packageFragments('java': FqName@110) = LazyJavaPackageFragment@111['java']
-    packageFragments('java.io': FqName@112) = LazyJavaPackageFragment@113['io']
-    packageFragments('java.lang': FqName@114) = LazyJavaPackageFragment@115['lang']
-    packageFragments('java.lang.Iterator': FqName@116) = null
-    packageFragments('java.lang.MutableCollection': FqName@117) = null
-    packageFragments('java.lang.T': FqName@118) = null
-    packageFragments('java.lang.U': FqName@119) = null
-    packageFragments('java.util': FqName@120) = LazyJavaPackageFragment@121['util']
-    packageFragments('java.util.Iterator': FqName@122) = null
-    packageFragments('java.util.MutableCollection': FqName@123) = null
-    packageFragments('java.util.T': FqName@124) = null
-    packageFragments('java.util.U': FqName@125) = null
-    packageFragments('kotlin': FqName@126) = null
-    packageFragments('kotlin.Iterator': FqName@127) = null
-    packageFragments('kotlin.MutableCollection': FqName@128) = null
-    packageFragments('kotlin.T': FqName@129) = null
-    packageFragments('kotlin.U': FqName@130) = null
-    packageFragments('kotlin.io': FqName@131) = null
-    packageFragments('kotlin.jvm': FqName@132) = null
-    packageFragments('kotlin.util': FqName@133) = null
-    packageFragments('kotlin.util.Iterator': FqName@134) = null
-    packageFragments('kotlin.util.MutableCollection': FqName@135) = null
-    packageFragments('kotlin.util.T': FqName@136) = null
-    packageFragments('kotlin.util.U': FqName@137) = null
-    topLevelClasses(JavaClassImpl@38['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@41['AbstractList']) = LazyJavaClassDescriptor@4['AbstractList']
-    topLevelClasses(JavaClassImpl@138['ArrayList']) = LazyJavaClassDescriptor@6['ArrayList']
-    topLevelClasses(JavaClassImpl@139['Iterator']) = LazyJavaClassDescriptor@140['Iterator']
-    topLevelClasses(JavaClassImpl@100['RandomAccess']) = LazyJavaClassDescriptor@14['RandomAccess']
-    topLevelClasses(JavaClassImpl@102['Serializable']) = LazyJavaClassDescriptor@16['Serializable']
-}
-
-LazyJavaPackageFragment@111['java'] {
-    classes('lang': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('util': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('lang': Name@145) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('util': Name@147) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@142
-}
-
-LazyJavaPackageFragment@115['lang'] {
-    classes('ArrayList': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('hasNext': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('next': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('to': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('ArrayList': Name@149) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('hasNext': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('next': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('to': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@150
-}
-
-LazyJavaPackageFragment@121['util'] {
-    classes('ArrayList': Name@149) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('Iterator': Name@156) = LazyJavaClassDescriptor@140['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('MutableCollection': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('hasNext': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('next': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('to': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('ArrayList': Name@149) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('hasNext': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('next': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('to': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@155
-}
-
-LazyJavaTypeParameterDescriptor@28['E'] {
-    defaultType = JetTypeImpl@159['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-    upperBounds = LinkedHashSet@160[1] { NullableType@161 }
-}
-
-LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
-LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@64['E']) = LazyJavaTypeParameterDescriptor@23['E']
-}
-
-LazyJavaTypeParameterResolver@163 {
-    resolve(JavaTypeParameterImpl@164['E']) = LazyJavaTypeParameterDescriptor@28['E']
-}
-
-LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@166['E']) = LazyJavaTypeParameterDescriptor@19['E']
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-}
-
-null {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@196[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-    <name not found> = EmptyList@146[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log b/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
deleted file mode 100644
index 69ce912ac2a..00000000000
--- a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
+++ /dev/null
@@ -1,606 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@7['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@9['AbstractList'] {
-    defaultType = JetTypeImpl@10['AbstractList<1>']
-    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassDescriptor@18['ArrayList'] {
-    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
-    defaultType = JetTypeImpl@24['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
-    functionTypeForSamInterface = null
-    functions('iterator': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@28['iterator'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
-    nestedClasses('iterator': Name@26) = null // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['ArrayList']
-}
-
-LazyJavaClassDescriptor@33['List'] {
-    defaultType = JetTypeImpl@34['List<1>']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@36
-    functions('iterator': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['iterator'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@36
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@36
-    nestedClasses('iterator': Name@37) = null // through LazyJavaClassMemberScope@36
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@43['List']
-}
-
-LazyJavaClassDescriptor@44['RandomAccess'] {
-    functions('iterator': Name@11) = EmptyList@45[empty] // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['RandomAccess']
-}
-
-LazyJavaClassDescriptor@49['Serializable'] {
-    functions('iterator': Name@11) = EmptyList@45[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['Serializable']
-}
-
-LazyJavaClassTypeConstructor@8['AbstractCollection'] {
-    parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
-    supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@17['AbstractList'] {
-    parameters = ArrayList@57[1] { LazyJavaTypeParameterDescriptor@58['E'] }
-    supertypes = ArrayList@59[2] { LazyJavaClassifierType@60['AbstractCollection<E>'], LazyJavaClassifierType@61['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@32['ArrayList'] {
-    parameters = ArrayList@62[1] { LazyJavaTypeParameterDescriptor@63['E'] }
-    supertypes = ArrayList@64[5] { LazyJavaClassifierType@65['AbstractList<E>'], LazyJavaClassifierType@66['List<E>'], LazyJavaClassifierType@67['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@43['List'] {
-    parameters = ArrayList@68[1] { LazyJavaTypeParameterDescriptor@69['E'] }
-    supertypes = ArrayList@70[1] { LazyJavaClassifierType@71['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@48['RandomAccess'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { JetTypeImpl@74['Any'] }
-}
-
-LazyJavaClassTypeConstructor@52['Serializable'] {
-    parameters = ArrayList@75[empty]
-    supertypes = ArrayList@76[1] { JetTypeImpl@74['Any'] }
-}
-
-LazyJavaClassifierType@60['AbstractCollection<E>'] {
-    arguments = ArrayList@77[1] { TypeProjectionImpl@78 }
-    classifier = JavaClassImpl@79['AbstractCollection']
-    memberScope = SubstitutingScope@80
-    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
-}
-
-LazyJavaClassifierType@65['AbstractList<E>'] {
-    arguments = ArrayList@81[1] { TypeProjectionImpl@82 }
-    classifier = JavaClassImpl@83['AbstractList']
-    memberScope = SubstitutingScope@84
-    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
-}
-
-LazyJavaClassifierType@85['Cloneable'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaClassImpl@87['Cloneable']
-    memberScope = DeserializedClassMemberScope@88
-    typeConstructor = DeserializedClassTypeConstructor@89
-}
-
-LazyJavaClassifierType@90['Collection<? extends E>'] {
-    arguments = ArrayList@91[1] { TypeProjectionImpl@92 }
-    classifier = JavaClassImpl@93['Collection']
-    memberScope = SubstitutingScope@94
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@97['Collection<? extends E>'] {
-    arguments = ArrayList@98[1] { TypeProjectionImpl@99 }
-    classifier = JavaClassImpl@93['Collection']
-    memberScope = SubstitutingScope@100
-    nullable = 'true': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@102
-}
-
-LazyJavaClassifierType@56['Collection<E>'] {
-    arguments = ArrayList@103[1] { TypeProjectionImpl@104 }
-    classifier = JavaClassImpl@105['Collection']
-    memberScope = SubstitutingScope@106
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@71['Collection<E>'] {
-    arguments = ArrayList@107[1] { TypeProjectionImpl@108 }
-    classifier = JavaClassImpl@109['Collection']
-    memberScope = SubstitutingScope@110
-    typeConstructor = DeserializedClassTypeConstructor@96
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@115['E'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@119['E'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@121['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@122['E'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@125['E'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@132['E'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@138['E'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@148['E'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@150['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@151['E'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@153['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@156['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@157['E'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@159['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@160['E'] {
-    arguments = ArrayList@161[empty]
-    classifier = JavaTypeParameterImpl@162['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@163['E'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@165['E'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@167['E'] {
-    arguments = ArrayList@168[empty]
-    classifier = JavaTypeParameterImpl@162['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@169['E'] {
-    arguments = ArrayList@170[empty]
-    classifier = JavaTypeParameterImpl@150['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@171['E'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@173['E'] {
-    arguments = ArrayList@174[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@175['E'] {
-    arguments = ArrayList@176[empty]
-    classifier = JavaTypeParameterImpl@159['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@177['E'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@124['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@179['E'] {
-    arguments = ArrayList@180[empty]
-    classifier = JavaTypeParameterImpl@117['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@181['E'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@121['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@183['E'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@156['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-}
-
-LazyJavaClassifierType@185['E'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@187['E'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@127['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@189['E'] {
-    arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@153['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@191['E'] {
-    arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@134['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-LazyJavaClassifierType@193['E'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@113['E']
-    nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@195['Iterator<E>'] {
-    arguments = ArrayList@196[1] { TypeProjectionImpl@197 }
-    classifier = JavaClassImpl@198['Iterator']
-    memberScope = SubstitutingScope@199
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@201['Iterator<E>'] {
-    arguments = ArrayList@202[1] { TypeProjectionImpl@203 }
-    classifier = JavaClassImpl@204['Iterator']
-    memberScope = SubstitutingScope@205
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@206['Iterator<E>'] {
-    arguments = ArrayList@207[1] { TypeProjectionImpl@208 }
-    classifier = JavaClassImpl@209['Iterator']
-    memberScope = SubstitutingScope@210
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@211['Iterator<E>'] {
-    arguments = ArrayList@212[1] { TypeProjectionImpl@213 }
-    classifier = JavaClassImpl@214['Iterator']
-    memberScope = SubstitutingScope@215
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@200
-}
-
-LazyJavaClassifierType@216['Iterator<E>'] {
-    arguments = ArrayList@217[1] { TypeProjectionImpl@218 }
-    classifier = JavaClassImpl@204['Iterator']
-    memberScope = SubstitutingScope@219
-    nullable = 'true': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@220
-}
-
-LazyJavaClassifierType@221['Iterator<E>'] {
-    arguments = ArrayList@222[1] { TypeProjectionImpl@223 }
-    classifier = JavaClassImpl@209['Iterator']
-    memberScope = SubstitutingScope@224
-    nullable = 'true': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@220
-}
-
-LazyJavaClassifierType@225['Iterator<E>'] {
-    arguments = ArrayList@226[1] { TypeProjectionImpl@227 }
-    classifier = JavaClassImpl@198['Iterator']
-    memberScope = SubstitutingScope@228
-    nullable = 'true': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@220
-}
-
-LazyJavaClassifierType@229['Iterator<E>'] {
-    arguments = ArrayList@230[1] { TypeProjectionImpl@231 }
-    classifier = JavaClassImpl@214['Iterator']
-    memberScope = SubstitutingScope@232
-    nullable = 'true': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@220
-}
-
-LazyJavaClassifierType@66['List<E>'] {
-    arguments = ArrayList@233[1] { TypeProjectionImpl@234 }
-    classifier = JavaClassImpl@235['List']
-    memberScope = SubstitutingScope@236
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@61['List<E>'] {
-    arguments = ArrayList@238[1] { TypeProjectionImpl@239 }
-    classifier = JavaClassImpl@240['List']
-    memberScope = SubstitutingScope@241
-    typeConstructor = DeserializedClassTypeConstructor@237
-}
-
-LazyJavaClassifierType@242['Object'] {
-    classifier = JavaClassImpl@243['Object']
-    typeConstructor = DeserializedClassTypeConstructor@244
-}
-
-LazyJavaClassifierType@245['Object'] {
-    classifier = JavaClassImpl@246['Object']
-    typeConstructor = DeserializedClassTypeConstructor@244
-}
-
-LazyJavaClassifierType@247['Object'] {
-    classifier = JavaClassImpl@248['Object']
-    typeConstructor = DeserializedClassTypeConstructor@244
-}
-
-LazyJavaClassifierType@67['RandomAccess'] {
-    arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@250['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['RandomAccess']
-}
-
-LazyJavaClassifierType@251['Serializable'] {
-    arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@253['Serializable']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['Serializable']
-}
-
-LazyJavaPackageFragmentProvider@254 {
-    packageFragments('<root>': FqName@255) = LazyJavaPackageFragment@256['<root>']
-    packageFragments('String': FqName@257) = null
-    packageFragments('java': FqName@258) = LazyJavaPackageFragment@259['java']
-    packageFragments('java.io': FqName@260) = LazyJavaPackageFragment@261['io']
-    packageFragments('java.lang': FqName@262) = LazyJavaPackageFragment@263['lang']
-    packageFragments('java.lang.String': FqName@264) = null
-    packageFragments('java.util': FqName@265) = LazyJavaPackageFragment@266['util']
-    packageFragments('java.util.ArrayList': FqName@267) = null
-    packageFragments('java.util.List': FqName@268) = null
-    packageFragments('kotlin': FqName@269) = null
-    packageFragments('kotlin.String': FqName@270) = null
-    packageFragments('kotlin.io': FqName@271) = null
-    packageFragments('kotlin.jvm': FqName@272) = null
-    topLevelClasses(JavaClassImpl@79['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@83['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
-    topLevelClasses(JavaClassImpl@273['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
-    topLevelClasses(JavaClassImpl@274['List']) = LazyJavaClassDescriptor@33['List']
-    topLevelClasses(JavaClassImpl@250['RandomAccess']) = LazyJavaClassDescriptor@44['RandomAccess']
-    topLevelClasses(JavaClassImpl@253['Serializable']) = LazyJavaClassDescriptor@49['Serializable']
-}
-
-LazyJavaPackageFragment@256['<root>'] {
-    classes('ArrayList': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@276
-    classes('String': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@276
-    classes('java': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@276
-    deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@276
-    functions('ArrayList': Name@280) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@276
-    functions('java': Name@281) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@276
-    memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@276
-}
-
-LazyJavaPackageFragment@259['java'] {
-    classes('lang': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('util': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('lang': Name@286) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('util': Name@287) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    memberIndex = computeMemberIndex$1@288 // through LazyPackageFragmentScopeForJavaPackage@284
-}
-
-LazyJavaPackageFragment@263['lang'] {
-    classes('ArrayList': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@289
-    classes('java': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@289
-    deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@289
-    functions('ArrayList': Name@280) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@289
-    memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@289
-}
-
-LazyJavaPackageFragment@266['util'] {
-    classes('ArrayList': Name@292) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@293
-    classes('List': Name@294) = LazyJavaClassDescriptor@33['List'] // through LazyPackageFragmentScopeForJavaPackage@293
-    deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@293
-    functions('ArrayList': Name@295) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@293
-    memberIndex = computeMemberIndex$1@296 // through LazyPackageFragmentScopeForJavaPackage@293
-}
-
-LazyJavaTypeParameterDescriptor@58['E'] {
-    defaultType = JetTypeImpl@297['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-    upperBounds = LinkedHashSet@298[1] { NullableType@299 }
-    upperBoundsAsType = NullableType@299
-}
-
-LazyJavaTypeParameterDescriptor@69['E'] {
-    defaultType = JetTypeImpl@300['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
-    upperBounds = LinkedHashSet@301[1] { NullableType@302 }
-    upperBoundsAsType = NullableType@302
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@303['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-    upperBounds = LinkedHashSet@304[1] { NullableType@305 }
-    upperBoundsAsType = NullableType@305
-}
-
-LazyJavaTypeParameterDescriptor@63['E'] {
-    defaultType = JetTypeImpl@306['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-    upperBounds = LinkedHashSet@307[1] { NullableType@308 }
-}
-
-LazyJavaTypeParameterResolver@309 {
-    resolve(JavaTypeParameterImpl@310['E']) = LazyJavaTypeParameterDescriptor@54['E']
-}
-
-LazyJavaTypeParameterResolver@311 {
-    resolve(JavaTypeParameterImpl@312['E']) = LazyJavaTypeParameterDescriptor@69['E']
-}
-
-LazyJavaTypeParameterResolver@313 {
-    resolve(JavaTypeParameterImpl@314['E']) = LazyJavaTypeParameterDescriptor@63['E']
-}
-
-LazyJavaTypeParameterResolver@315 {
-    resolve(JavaTypeParameterImpl@316['E']) = LazyJavaTypeParameterDescriptor@58['E']
-}
-
-LazyJavaTypeParameterResolver@317 {
-    resolve(JavaTypeParameterImpl@153['E']) = null
-}
-
-LazyJavaTypeParameterResolver@318 {
-    resolve(JavaTypeParameterImpl@156['E']) = null
-}
-
-LazyJavaTypeParameterResolver@319 {
-    resolve(JavaTypeParameterImpl@127['E']) = null
-}
-
-LazyJavaTypeParameterResolver@320 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[3] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-null {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@338[3] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log b/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
deleted file mode 100644
index 4f7524d0b4b..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.A': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('b.A': FqName@8) = null
-    packageFragments('b.Int': FqName@9) = null
-    packageFragments('b.d': FqName@10) = null
-    packageFragments('c': FqName@11) = null
-    packageFragments('c.A': FqName@12) = null
-    packageFragments('c.Int': FqName@13) = null
-    packageFragments('c.d': FqName@14) = null
-    packageFragments('d': FqName@15) = null
-    packageFragments('d.A': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.A': FqName@21) = null
-    packageFragments('java.lang.Int': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('d': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
deleted file mode 100644
index 776f89aed03..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['X<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('V': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.V': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Boolean': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.V': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('p': FqName@21) = null
-    packageFragments('p.B': FqName@22) = null
-    packageFragments('p.Boolean': FqName@23) = null
-    packageFragments('p.String': FqName@24) = null
-    packageFragments('p.V': FqName@25) = null
-    packageFragments('p.X': FqName@26) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('X': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('X': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
deleted file mode 100644
index 7bf7f8ecd7e..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
+++ /dev/null
@@ -1,507 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Class<1>']
-}
-
-LazyJavaClassDescriptor@2['AnnotatedElement'] {
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@8['Class'] {
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@10
-    nestedClasses('invoke': Name@3) = null // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['Class']
-}
-
-LazyJavaClassDescriptor@14['Exception'] {
-    constructors = ArrayList@15[5] { JavaConstructorDescriptor@16['<init>'], JavaConstructorDescriptor@17['<init>'], JavaConstructorDescriptor@18['<init>'], ... } // through LazyJavaClassMemberScope@19
-    defaultType = JetTypeImpl@20['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@21['Exception']
-}
-
-LazyJavaClassDescriptor@22['GenericDeclaration'] {
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@26['Serializable'] {
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Serializable']
-}
-
-LazyJavaClassDescriptor@30['Type'] {
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@33['Type']
-}
-
-LazyJavaClassTypeConstructor@7['AnnotatedElement'] {
-    parameters = ArrayList@34[empty]
-    supertypes = ArrayList@35[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@13['Class'] {
-    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['T'] }
-    supertypes = ArrayList@39[4] { LazyJavaClassifierType@40['Serializable'], LazyJavaClassifierType@41['GenericDeclaration'], LazyJavaClassifierType@42['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@21['Exception'] {
-    parameters = ArrayList@43[empty]
-    supertypes = ArrayList@44[1] { LazyJavaClassifierType@45['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@25['GenericDeclaration'] {
-    parameters = ArrayList@46[empty]
-    supertypes = ArrayList@47[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@29['Serializable'] {
-    parameters = ArrayList@48[empty]
-    supertypes = ArrayList@49[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassTypeConstructor@33['Type'] {
-    parameters = ArrayList@50[empty]
-    supertypes = ArrayList@51[1] { JetTypeImpl@36['Any'] }
-}
-
-LazyJavaClassifierType@52['AnnotatedElement'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['AnnotatedElement']
-    memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@7['AnnotatedElement']
-}
-
-LazyJavaClassifierType@41['GenericDeclaration'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaClassImpl@56['GenericDeclaration']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['GenericDeclaration']
-}
-
-LazyJavaClassifierType@57['Object'] {
-    classifier = JavaClassImpl@58['Object']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@60['Object'] {
-    classifier = JavaClassImpl@61['Object']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@62['Object'] {
-    classifier = JavaClassImpl@63['Object']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@64['Object'] {
-    classifier = JavaClassImpl@65['Object']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@66['Object'] {
-    classifier = JavaClassImpl@67['Object']
-    typeConstructor = DeserializedClassTypeConstructor@59
-}
-
-LazyJavaClassifierType@40['Serializable'] {
-    arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@69['Serializable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Serializable']
-}
-
-LazyJavaClassifierType@70['String'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['String']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@75['String'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@77['String']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@78['String'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['String']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@81['String'] {
-    arguments = ArrayList@82[empty]
-    classifier = JavaClassImpl@80['String']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@84['String'] {
-    arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@77['String']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@86['String'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@72['String']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassifierType@88['Throwable'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['Throwable']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@92['Throwable'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['Throwable']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@95['Throwable'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['Throwable']
-    nullable = 'false': Boolean@73
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@98['Throwable'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@90['Throwable']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@100['Throwable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@94['Throwable']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@102['Throwable'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@97['Throwable']
-    nullable = 'true': Boolean@83
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@42['Type'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['Type']
-    memberScope = LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@33['Type']
-}
-
-LazyJavaPackageFragmentProvider@108 {
-    packageFragments('<root>': FqName@109) = LazyJavaPackageFragment@110['<root>']
-    packageFragments('Class': FqName@111) = null
-    packageFragments('EnumClass': FqName@112) = null
-    packageFragments('Foo': FqName@113) = null
-    packageFragments('String': FqName@114) = null
-    packageFragments('T': FqName@115) = null
-    packageFragments('TInner': FqName@116) = null
-    packageFragments('TOuter': FqName@117) = null
-    packageFragments('Unit': FqName@118) = null
-    packageFragments('Y': FqName@119) = null
-    packageFragments('java': FqName@120) = LazyJavaPackageFragment@121['java']
-    packageFragments('java.io': FqName@122) = LazyJavaPackageFragment@123['io']
-    packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
-    packageFragments('java.lang.Class': FqName@126) = null
-    packageFragments('java.lang.EnumClass': FqName@127) = null
-    packageFragments('java.lang.Foo': FqName@128) = null
-    packageFragments('java.lang.String': FqName@129) = null
-    packageFragments('java.lang.T': FqName@130) = null
-    packageFragments('java.lang.TInner': FqName@131) = null
-    packageFragments('java.lang.TOuter': FqName@132) = null
-    packageFragments('java.lang.Unit': FqName@133) = null
-    packageFragments('java.lang.reflect': FqName@134) = LazyJavaPackageFragment@135['reflect']
-    packageFragments('javaClass': FqName@136) = null
-    packageFragments('kotlin': FqName@137) = null
-    packageFragments('kotlin.Class': FqName@138) = null
-    packageFragments('kotlin.EnumClass': FqName@139) = null
-    packageFragments('kotlin.Foo': FqName@140) = null
-    packageFragments('kotlin.String': FqName@141) = null
-    packageFragments('kotlin.T': FqName@142) = null
-    packageFragments('kotlin.TInner': FqName@143) = null
-    packageFragments('kotlin.TOuter': FqName@144) = null
-    packageFragments('kotlin.Unit': FqName@145) = null
-    packageFragments('kotlin.io': FqName@146) = null
-    packageFragments('kotlin.jvm': FqName@147) = null
-    topLevelClasses(JavaClassImpl@54['AnnotatedElement']) = LazyJavaClassDescriptor@2['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@148['Class']) = LazyJavaClassDescriptor@8['Class']
-    topLevelClasses(JavaClassImpl@149['Exception']) = LazyJavaClassDescriptor@14['Exception']
-    topLevelClasses(JavaClassImpl@56['GenericDeclaration']) = LazyJavaClassDescriptor@22['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@69['Serializable']) = LazyJavaClassDescriptor@26['Serializable']
-    topLevelClasses(JavaClassImpl@107['Type']) = LazyJavaClassDescriptor@30['Type']
-}
-
-LazyJavaPackageFragment@110['<root>'] {
-    classes('Class': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Exception': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('String': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Unit': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('invoke': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('javaClass': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@156 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('Exception': Name@152) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('javaClass': Name@155) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@151
-}
-
-LazyJavaPackageFragment@121['java'] {
-    classes('lang': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@156 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('lang': Name@160) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@159
-}
-
-LazyJavaPackageFragment@125['lang'] {
-    classes('Class': Name@150) = LazyJavaClassDescriptor@8['Class'] // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('Exception': Name@152) = LazyJavaClassDescriptor@14['Exception'] // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('invoke': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('javaClass': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@156 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('Exception': Name@152) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('invoke': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('javaClass': Name@155) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaTypeParameterDescriptor@38['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@164
-    upperBounds = LinkedHashSet@165[1] { NullableType@166 }
-}
-
-LazyJavaTypeParameterResolver@167 {
-    resolve(JavaTypeParameterImpl@168['T']) = LazyJavaTypeParameterDescriptor@38['T']
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[4] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[4] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
-
-null {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@205[5] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@206[5] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-    <name not found> = EmptyList@4[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
deleted file mode 100644
index 60ac279fae7..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('i': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('i': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('i': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('i': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@42[2] { ResolutionCandidate@39, ResolutionCandidate@40 }
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@35, ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
deleted file mode 100644
index 46a7f03e4b0..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
+++ /dev/null
@@ -1,202 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('My': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.My': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.My': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('i': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('i': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('i': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('i': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
deleted file mode 100644
index 30b8a273abe..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
+++ /dev/null
@@ -1,179 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
deleted file mode 100644
index 3b0bbb3458b..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
+++ /dev/null
@@ -1,121 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('s': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('s': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('s': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('s': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
deleted file mode 100644
index 17f49e7a22b..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
+++ /dev/null
@@ -1,94 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('i': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('i': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('i': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('i': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
deleted file mode 100644
index f22f1803cac..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('s': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('s': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('s': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('s': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
deleted file mode 100644
index 0ff5da9660d..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.String': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
deleted file mode 100644
index 3ce73078bfd..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
+++ /dev/null
@@ -1,93 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('i': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('i': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('i': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('i': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
deleted file mode 100644
index 7a21eccbcbb..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
+++ /dev/null
@@ -1,496 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.C': FqName@17) = null
-    packageFragments('java.lang.D': FqName@18) = null
-    packageFragments('java.lang.Foo': FqName@19) = null
-    packageFragments('java.lang.R': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.B': FqName@24) = null
-    packageFragments('kotlin.C': FqName@25) = null
-    packageFragments('kotlin.D': FqName@26) = null
-    packageFragments('kotlin.Foo': FqName@27) = null
-    packageFragments('kotlin.R': FqName@28) = null
-    packageFragments('kotlin.T': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Foo': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('Foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('Foo': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('f': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-null {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
deleted file mode 100644
index b18a5560487..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
+++ /dev/null
@@ -1,446 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Foo': FqName@7) = null
-    packageFragments('R': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.A': FqName@15) = null
-    packageFragments('java.lang.B': FqName@16) = null
-    packageFragments('java.lang.C': FqName@17) = null
-    packageFragments('java.lang.D': FqName@18) = null
-    packageFragments('java.lang.Foo': FqName@19) = null
-    packageFragments('java.lang.R': FqName@20) = null
-    packageFragments('java.lang.T': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.A': FqName@23) = null
-    packageFragments('kotlin.B': FqName@24) = null
-    packageFragments('kotlin.C': FqName@25) = null
-    packageFragments('kotlin.D': FqName@26) = null
-    packageFragments('kotlin.Foo': FqName@27) = null
-    packageFragments('kotlin.R': FqName@28) = null
-    packageFragments('kotlin.T': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Foo': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('Foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('with': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('Foo': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('f': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-null {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
deleted file mode 100644
index dd0e1aa80a7..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
+++ /dev/null
@@ -1,1023 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('F': FqName@8) = null
-    packageFragments('Foo': FqName@9) = null
-    packageFragments('G': FqName@10) = null
-    packageFragments('R': FqName@11) = null
-    packageFragments('T': FqName@12) = null
-    packageFragments('U': FqName@13) = null
-    packageFragments('V': FqName@14) = null
-    packageFragments('X': FqName@15) = null
-    packageFragments('foo': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.B': FqName@21) = null
-    packageFragments('java.lang.C': FqName@22) = null
-    packageFragments('java.lang.D': FqName@23) = null
-    packageFragments('java.lang.E': FqName@24) = null
-    packageFragments('java.lang.F': FqName@25) = null
-    packageFragments('java.lang.Foo': FqName@26) = null
-    packageFragments('java.lang.G': FqName@27) = null
-    packageFragments('java.lang.R': FqName@28) = null
-    packageFragments('java.lang.T': FqName@29) = null
-    packageFragments('java.lang.U': FqName@30) = null
-    packageFragments('java.lang.V': FqName@31) = null
-    packageFragments('java.lang.X': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.B': FqName@34) = null
-    packageFragments('kotlin.C': FqName@35) = null
-    packageFragments('kotlin.D': FqName@36) = null
-    packageFragments('kotlin.E': FqName@37) = null
-    packageFragments('kotlin.F': FqName@38) = null
-    packageFragments('kotlin.Foo': FqName@39) = null
-    packageFragments('kotlin.G': FqName@40) = null
-    packageFragments('kotlin.R': FqName@41) = null
-    packageFragments('kotlin.T': FqName@42) = null
-    packageFragments('kotlin.U': FqName@43) = null
-    packageFragments('kotlin.V': FqName@44) = null
-    packageFragments('kotlin.X': FqName@45) = null
-    packageFragments('kotlin.io': FqName@46) = null
-    packageFragments('kotlin.jvm': FqName@47) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('invoke': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('with': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('Foo': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('f': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('foo': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('invoke': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('with': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('Foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('foo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('invoke': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('with': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('Foo': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('f': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('foo': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('invoke': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('with': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-null {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
deleted file mode 100644
index 0240d4bc063..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
+++ /dev/null
@@ -1,118 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Foo': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.Unit': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Foo': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.Unit': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('Unit': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
deleted file mode 100644
index 6ea642b4158..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
+++ /dev/null
@@ -1,185 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Array': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('C': FqName@6) = null
-    packageFragments('D': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('bar': FqName@10) = null
-    packageFragments('bar.A': FqName@11) = null
-    packageFragments('bar.Array': FqName@12) = null
-    packageFragments('bar.B': FqName@13) = null
-    packageFragments('bar.C': FqName@14) = null
-    packageFragments('bar.D': FqName@15) = null
-    packageFragments('bar.String': FqName@16) = null
-    packageFragments('bar.Unit': FqName@17) = null
-    packageFragments('bar.attr': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.A': FqName@23) = null
-    packageFragments('java.lang.Array': FqName@24) = null
-    packageFragments('java.lang.B': FqName@25) = null
-    packageFragments('java.lang.C': FqName@26) = null
-    packageFragments('java.lang.D': FqName@27) = null
-    packageFragments('java.lang.String': FqName@28) = null
-    packageFragments('java.lang.Unit': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.Array': FqName@32) = null
-    packageFragments('kotlin.B': FqName@33) = null
-    packageFragments('kotlin.C': FqName@34) = null
-    packageFragments('kotlin.D': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.Unit': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('B': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('D': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('attr': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('d': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('A': Name@46) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('B': Name@48) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('D': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('attr': Name@50) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('d': Name@51) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@103[2] { ResolutionCandidate@85, ResolutionCandidate@86 }
-    <name not found> = ArrayList@104[2] { ResolutionCandidate@89, ResolutionCandidate@90 }
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-    <name not found> = EmptyList@44[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
deleted file mode 100644
index af0fb1bb307..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
+++ /dev/null
@@ -1,152 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('X': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Foo': FqName@10) = null
-    packageFragments('java.lang.Unit': FqName@11) = null
-    packageFragments('java.lang.X': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Foo': FqName@14) = null
-    packageFragments('kotlin.Unit': FqName@15) = null
-    packageFragments('kotlin.X': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('m': FqName@19) = null
-    packageFragments('m.C': FqName@20) = null
-    packageFragments('m.Either1': FqName@21) = null
-    packageFragments('m.Foo': FqName@22) = null
-    packageFragments('m.Unit': FqName@23) = null
-    packageFragments('m.X': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('X': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('left': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('right': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('X': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('left': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('right': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
deleted file mode 100644
index c26ed030d49..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('Pair': FqName@6) = null
-    packageFragments('c': FqName@7) = null
-    packageFragments('c.A': FqName@8) = null
-    packageFragments('c.B': FqName@9) = null
-    packageFragments('c.Int': FqName@10) = null
-    packageFragments('c.Pair': FqName@11) = null
-    packageFragments('c.TestBug1': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.B': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.Pair': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.Pair': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('m1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('position': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('m1': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('position': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
deleted file mode 100644
index 0ac53abd309..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
+++ /dev/null
@@ -1,161 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('DOMElementTestClasses': FqName@4) = null
-    packageFragments('EnumStyleClass': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('TestClasses': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Array': FqName@12) = null
-    packageFragments('java.lang.DOMElementTestClasses': FqName@13) = null
-    packageFragments('java.lang.EnumStyleClass': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.TestClasses': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Array': FqName@18) = null
-    packageFragments('kotlin.DOMElementTestClasses': FqName@19) = null
-    packageFragments('kotlin.EnumStyleClass': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.TestClasses': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('DOMElementTestClasses': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('cls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('cls2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('DOMElementTestClasses': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('cls': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('cls2': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('cls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('cls2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('cls': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('cls2': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
deleted file mode 100644
index fb6311b4cf8..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.Unit': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Any': FqName@15) = null
-    packageFragments('kotlin.Unit': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
deleted file mode 100644
index 76c833af05c..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Any': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Any': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('use': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('use': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('use': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('use': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
deleted file mode 100644
index efc7b5da212..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
+++ /dev/null
@@ -1,159 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('c': FqName@8) = null
-    packageFragments('c.Int': FqName@9) = null
-    packageFragments('c.R': FqName@10) = null
-    packageFragments('c.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.R': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.R': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('f': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('with': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('with': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-null {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
deleted file mode 100644
index 48eda5eb98b..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
+++ /dev/null
@@ -1,370 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Foo<1>']
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('A': FqName@53) = null
-    packageFragments('Bar': FqName@54) = null
-    packageFragments('Foo': FqName@55) = null
-    packageFragments('Int': FqName@56) = null
-    packageFragments('T': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.A': FqName@62) = null
-    packageFragments('java.lang.Bar': FqName@63) = null
-    packageFragments('java.lang.Foo': FqName@64) = null
-    packageFragments('java.lang.Int': FqName@65) = null
-    packageFragments('java.lang.T': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.A': FqName@68) = null
-    packageFragments('kotlin.Bar': FqName@69) = null
-    packageFragments('kotlin.Foo': FqName@70) = null
-    packageFragments('kotlin.Int': FqName@71) = null
-    packageFragments('kotlin.T': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = null
-    packageFragments('kotlin.jvm': FqName@74) = null
-    topLevelClasses(JavaClassImpl@75['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@52['<root>'] {
-    classes('Bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Exception': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('fooInt': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Bar': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Exception': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('bar': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('fooInt': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@61['lang'] {
-    classes('Bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('Exception': Name@78) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('fooInt': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Bar': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('bar': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('fooInt': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[4] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-null {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@196[5] { ResolutionCandidate@168, ResolutionCandidate@169, ResolutionCandidate@170, ... }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
deleted file mode 100644
index 1214480e07c..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
+++ /dev/null
@@ -1,205 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('Int': FqName@53) = null
-    packageFragments('List': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('h': FqName@57) = null
-    packageFragments('h.Int': FqName@58) = null
-    packageFragments('h.List': FqName@59) = null
-    packageFragments('h.String': FqName@60) = null
-    packageFragments('h.T': FqName@61) = null
-    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
-    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
-    packageFragments('java.lang.Int': FqName@66) = null
-    packageFragments('java.lang.List': FqName@67) = null
-    packageFragments('java.lang.String': FqName@68) = null
-    packageFragments('java.lang.T': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Int': FqName@71) = null
-    packageFragments('kotlin.List': FqName@72) = null
-    packageFragments('kotlin.String': FqName@73) = null
-    packageFragments('kotlin.T': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    topLevelClasses(JavaClassImpl@77['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@63['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@65['lang'] {
-    classes('Exception': Name@84) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('emptyList': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Exception': Name@84) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('emptyList': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@110[2] { ResolutionCandidate@100, ResolutionCandidate@101 }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
deleted file mode 100644
index 7dac128259d..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeUnmappedArguments.lazy.log
+++ /dev/null
@@ -1,284 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Int': FqName@52) = null
-    packageFragments('c': FqName@53) = null
-    packageFragments('c.Int': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Int': FqName@59) = null
-    packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.Int': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = null
-    packageFragments('kotlin.jvm': FqName@63) = null
-    topLevelClasses(JavaClassImpl@64['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('lang': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('bar': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('zzz': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('Exception': Name@71) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('bar': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@74) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('zzz': Name@75) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[4] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-}
-
-null {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@140[5] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117, ... }
-    <name not found> = ArrayList@141[8] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@120, ResolutionCandidate@121, ResolutionCandidate@122, ... }
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-    <name not found> = EmptyList@69[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
deleted file mode 100644
index cc38f24f774..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
+++ /dev/null
@@ -1,73 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
deleted file mode 100644
index 39d1592750f..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
+++ /dev/null
@@ -1,371 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.String']
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Any']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@8['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@10['Int']
-    <name not found> = JetTypeImpl@11['String']
-    <name not found> = JetTypeImpl@12['T']
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('A': FqName@16) = null
-    packageFragments('Any': FqName@17) = null
-    packageFragments('Int': FqName@18) = null
-    packageFragments('String': FqName@19) = null
-    packageFragments('T': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.A': FqName@25) = null
-    packageFragments('java.lang.Any': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.String': FqName@28) = null
-    packageFragments('java.lang.T': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = null
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.Any': FqName@32) = null
-    packageFragments('kotlin.Int': FqName@33) = null
-    packageFragments('kotlin.String': FqName@34) = null
-    packageFragments('kotlin.T': FqName@35) = null
-    packageFragments('kotlin.io': FqName@36) = null
-    packageFragments('kotlin.jvm': FqName@37) = null
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('Int': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('f': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('id': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('f': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('id': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('f': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('id': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('f': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('id': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[8] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[8] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[8] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[9] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[9] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[9] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[9] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[9] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-null {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@256[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
-    <name not found> = ArrayList@257[8] { ResolutionCandidate@170, ResolutionCandidate@171, ResolutionCandidate@172, ... }
-    <name not found> = ArrayList@258[8] { ResolutionCandidate@185, ResolutionCandidate@186, ResolutionCandidate@187, ... }
-    <name not found> = ArrayList@259[8] { ResolutionCandidate@175, ResolutionCandidate@176, ResolutionCandidate@177, ... }
-    <name not found> = ArrayList@260[8] { ResolutionCandidate@180, ResolutionCandidate@181, ResolutionCandidate@182, ... }
-    <name not found> = ArrayList@261[9] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = ArrayList@262[9] { ResolutionCandidate@200, ResolutionCandidate@201, ResolutionCandidate@202, ... }
-    <name not found> = ArrayList@263[9] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = ArrayList@264[9] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@265[9] { ResolutionCandidate@195, ResolutionCandidate@196, ResolutionCandidate@197, ... }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
deleted file mode 100644
index 7e7b2b9c4a2..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,177 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.Int': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@118[8] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
-    <name not found> = ArrayList@119[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@120[8] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@121[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = ArrayList@122[8] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
deleted file mode 100644
index b667ac74a55..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
+++ /dev/null
@@ -1,334 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@2['kotlin.String']
-    <name not found> = DeserializedType@2['kotlin.String']
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@8['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@10['Int']
-    <name not found> = JetTypeImpl@11['String']
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('A': FqName@15) = null
-    packageFragments('Any': FqName@16) = null
-    packageFragments('Int': FqName@17) = null
-    packageFragments('String': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.A': FqName@23) = null
-    packageFragments('java.lang.Any': FqName@24) = null
-    packageFragments('java.lang.Int': FqName@25) = null
-    packageFragments('java.lang.String': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.Any': FqName@29) = null
-    packageFragments('kotlin.Int': FqName@30) = null
-    packageFragments('kotlin.String': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('f': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('f': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('f': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[10] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[10] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[10] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[10] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[10] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[8] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[8] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-}
-
-null {
-    <name not found> = ArrayList@209[10] { ResolutionCandidate@56, ResolutionCandidate@57, ResolutionCandidate@58, ... }
-    <name not found> = ArrayList@210[10] { ResolutionCandidate@61, ResolutionCandidate@62, ResolutionCandidate@63, ... }
-    <name not found> = ArrayList@211[10] { ResolutionCandidate@66, ResolutionCandidate@67, ResolutionCandidate@68, ... }
-    <name not found> = ArrayList@212[10] { ResolutionCandidate@71, ResolutionCandidate@72, ResolutionCandidate@73, ... }
-    <name not found> = ArrayList@213[10] { ResolutionCandidate@51, ResolutionCandidate@52, ResolutionCandidate@53, ... }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@249[8] { ResolutionCandidate@196, ResolutionCandidate@197, ResolutionCandidate@198, ... }
-    <name not found> = ArrayList@250[8] { ResolutionCandidate@201, ResolutionCandidate@202, ResolutionCandidate@203, ... }
-    <name not found> = ArrayList@251[8] { ResolutionCandidate@206, ResolutionCandidate@207, ResolutionCandidate@208, ... }
-    <name not found> = ArrayList@252[8] { ResolutionCandidate@181, ResolutionCandidate@182, ResolutionCandidate@183, ... }
-    <name not found> = ArrayList@253[8] { ResolutionCandidate@186, ResolutionCandidate@187, ResolutionCandidate@188, ... }
-    <name not found> = ArrayList@254[8] { ResolutionCandidate@191, ResolutionCandidate@192, ResolutionCandidate@193, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
deleted file mode 100644
index ee3cf1bfb52..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
+++ /dev/null
@@ -1,168 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Any']
-    <name not found> = JetTypeImpl@2['T']
-    <name not found> = JetTypeImpl@3['T']
-    <name not found> = JetTypeImpl@4['T']
-    <name not found> = JetTypeImpl@5['T']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Any': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('T': FqName@13) = null
-    packageFragments('a': FqName@14) = null
-    packageFragments('a.A': FqName@15) = null
-    packageFragments('a.Any': FqName@16) = null
-    packageFragments('a.Int': FqName@17) = null
-    packageFragments('a.String': FqName@18) = null
-    packageFragments('a.T': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('java.lang.A': FqName@24) = null
-    packageFragments('java.lang.Any': FqName@25) = null
-    packageFragments('java.lang.Int': FqName@26) = null
-    packageFragments('java.lang.String': FqName@27) = null
-    packageFragments('java.lang.T': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.Any': FqName@31) = null
-    packageFragments('kotlin.Int': FqName@32) = null
-    packageFragments('kotlin.String': FqName@33) = null
-    packageFragments('kotlin.T': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('A': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('foo': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[5] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-null {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@95, ResolutionCandidate@96, ResolutionCandidate@97, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102, ... }
-    <name not found> = ArrayList@117[5] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
-    <name not found> = ArrayList@118[5] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
deleted file mode 100644
index b60401017b0..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
+++ /dev/null
@@ -1,2005 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Unit': FqName@5) = null
-    packageFragments('c': FqName@6) = null
-    packageFragments('c.Unit': FqName@7) = null
-    packageFragments('c.x': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Unit': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Unit': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('z': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('z': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@483 {
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@510 {
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@519 {
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@531 {
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@543 {
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@651 {
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@663 {
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@675[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@677[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@678[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@680[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@681[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@683[1] { ResolutionCandidate@668 }
-    <name not found> = ArrayList@684[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@686[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@687[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@689[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@690[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@692[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@693[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@695[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@696[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@698[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@699[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@701[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@702[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@704[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@705[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@707[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@708[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@710[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@711[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@713[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@714[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@716[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@717[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@719[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@720[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@722[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@723[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@725[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@726[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@728[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@729[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@731[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@732[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@734[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@735[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@737[1] { ResolutionCandidate@632 }
-    <name not found> = ArrayList@738[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@740[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@741[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@743[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@744[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@746[1] { ResolutionCandidate@512 }
-    <name not found> = ArrayList@747[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@749[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@750[1] { ResolutionCandidate@617 }
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@752[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@753[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@755[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@756[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@758[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@759[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@761[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@762[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@764[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@765[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@767[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@768[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@770[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@771[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@653 }
-    <name not found> = ArrayList@773[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@774[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@776[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@777[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@779[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@780[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@782[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@783[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@785[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@786[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@788[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@789[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@791[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@792[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@794[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@795[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@797[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@798[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@800[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@801[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@803[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@804[1] { ResolutionCandidate@524 }
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@806[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@807[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@809[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@810[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@521 }
-    <name not found> = ArrayList@812[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@813[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@815[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@816[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@818[1] { ResolutionCandidate@509 }
-    <name not found> = ArrayList@819[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@821[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@822[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@824[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@825[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@827[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@828[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@830[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@831[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@833[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@834[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@836[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@837[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@839[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@840[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@842[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@843[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@845[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@846[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@848[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@849[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@851[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@852[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@854[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@855[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@857[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@858[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@860[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@861[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@863[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@864[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@865[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@866[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@867[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@869[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@870[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@872[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@873[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@875[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@876[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@878[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@879[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@881[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@882[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@884[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@885[1] { ResolutionCandidate@605 }
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@629 }
-    <name not found> = ArrayList@887[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@888[1] { ResolutionCandidate@656 }
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@890[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
deleted file mode 100644
index e67b4b9c186..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
+++ /dev/null
@@ -1,384 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.Int']
-    <name not found> = DeserializedType@2['kotlin.String']
-    <name not found> = DeserializedType@2['kotlin.String']
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = JetTypeImpl@8['Int']
-    <name not found> = JetTypeImpl@9['Int']
-    <name not found> = JetTypeImpl@10['Int']
-    <name not found> = JetTypeImpl@11['String']
-    <name not found> = JetTypeImpl@12['T']
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('A': FqName@16) = null
-    packageFragments('Any': FqName@17) = null
-    packageFragments('Int': FqName@18) = null
-    packageFragments('String': FqName@19) = null
-    packageFragments('T': FqName@20) = null
-    packageFragments('a': FqName@21) = null
-    packageFragments('a.A': FqName@22) = null
-    packageFragments('a.Any': FqName@23) = null
-    packageFragments('a.Int': FqName@24) = null
-    packageFragments('a.String': FqName@25) = null
-    packageFragments('a.T': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.A': FqName@31) = null
-    packageFragments('java.lang.Any': FqName@32) = null
-    packageFragments('java.lang.Int': FqName@33) = null
-    packageFragments('java.lang.String': FqName@34) = null
-    packageFragments('java.lang.T': FqName@35) = null
-    packageFragments('kotlin': FqName@36) = null
-    packageFragments('kotlin.A': FqName@37) = null
-    packageFragments('kotlin.Any': FqName@38) = null
-    packageFragments('kotlin.Int': FqName@39) = null
-    packageFragments('kotlin.String': FqName@40) = null
-    packageFragments('kotlin.T': FqName@41) = null
-    packageFragments('kotlin.io': FqName@42) = null
-    packageFragments('kotlin.jvm': FqName@43) = null
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('id': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('f': Name@50) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('id': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[10] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[10] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[10] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[10] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[8] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[8] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-}
-
-null {
-    <name not found> = ArrayList@233[10] { ResolutionCandidate@57, ResolutionCandidate@58, ResolutionCandidate@59, ... }
-    <name not found> = ArrayList@234[10] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
-    <name not found> = ArrayList@235[10] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
-    <name not found> = ArrayList@236[10] { ResolutionCandidate@72, ResolutionCandidate@73, ResolutionCandidate@74, ... }
-    <name not found> = ArrayList@237[10] { ResolutionCandidate@77, ResolutionCandidate@78, ResolutionCandidate@79, ... }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@279[8] { ResolutionCandidate@220, ResolutionCandidate@221, ResolutionCandidate@222, ... }
-    <name not found> = ArrayList@280[8] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@232, ... }
-    <name not found> = ArrayList@281[8] { ResolutionCandidate@205, ResolutionCandidate@206, ResolutionCandidate@207, ... }
-    <name not found> = ArrayList@282[8] { ResolutionCandidate@215, ResolutionCandidate@216, ResolutionCandidate@217, ... }
-    <name not found> = ArrayList@283[8] { ResolutionCandidate@225, ResolutionCandidate@226, ResolutionCandidate@227, ... }
-    <name not found> = ArrayList@284[8] { ResolutionCandidate@210, ResolutionCandidate@211, ResolutionCandidate@212, ... }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
deleted file mode 100644
index 6adbec75054..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
+++ /dev/null
@@ -1,164 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['A']
-    <name not found> = JetTypeImpl@2['A']
-    <name not found> = JetTypeImpl@3['A']
-    <name not found> = JetTypeImpl@4['A']
-    <name not found> = JetTypeImpl@5['Any']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Any': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('c': FqName@13) = null
-    packageFragments('c.A': FqName@14) = null
-    packageFragments('c.Any': FqName@15) = null
-    packageFragments('c.Int': FqName@16) = null
-    packageFragments('c.String': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.A': FqName@22) = null
-    packageFragments('java.lang.Any': FqName@23) = null
-    packageFragments('java.lang.Int': FqName@24) = null
-    packageFragments('java.lang.String': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.A': FqName@27) = null
-    packageFragments('kotlin.Any': FqName@28) = null
-    packageFragments('kotlin.Int': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('A': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('A': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[5] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[5] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-null {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@111[5] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@112[5] { ResolutionCandidate@91, ResolutionCandidate@92, ResolutionCandidate@93, ... }
-    <name not found> = ArrayList@113[5] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
deleted file mode 100644
index 6f28ae333d4..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.String': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
deleted file mode 100644
index f3d82910b87..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
+++ /dev/null
@@ -1,444 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['List<1>']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('A': FqName@53) = null
-    packageFragments('Any': FqName@54) = null
-    packageFragments('Int': FqName@55) = null
-    packageFragments('List': FqName@56) = null
-    packageFragments('String': FqName@57) = null
-    packageFragments('T': FqName@58) = null
-    packageFragments('Unit': FqName@59) = null
-    packageFragments('a': FqName@60) = null
-    packageFragments('a.A': FqName@61) = null
-    packageFragments('a.Any': FqName@62) = null
-    packageFragments('a.Int': FqName@63) = null
-    packageFragments('a.List': FqName@64) = null
-    packageFragments('a.String': FqName@65) = null
-    packageFragments('a.T': FqName@66) = null
-    packageFragments('a.Unit': FqName@67) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.A': FqName@72) = null
-    packageFragments('java.lang.Any': FqName@73) = null
-    packageFragments('java.lang.Int': FqName@74) = null
-    packageFragments('java.lang.List': FqName@75) = null
-    packageFragments('java.lang.String': FqName@76) = null
-    packageFragments('java.lang.T': FqName@77) = null
-    packageFragments('java.lang.Unit': FqName@78) = null
-    packageFragments('kotlin': FqName@79) = null
-    packageFragments('kotlin.A': FqName@80) = null
-    packageFragments('kotlin.Any': FqName@81) = null
-    packageFragments('kotlin.Int': FqName@82) = null
-    packageFragments('kotlin.List': FqName@83) = null
-    packageFragments('kotlin.String': FqName@84) = null
-    packageFragments('kotlin.T': FqName@85) = null
-    packageFragments('kotlin.Unit': FqName@86) = null
-    packageFragments('kotlin.io': FqName@87) = null
-    packageFragments('kotlin.jvm': FqName@88) = null
-    topLevelClasses(JavaClassImpl@89['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@71['lang'] {
-    classes('Exception': Name@96) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('doInt': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('doList': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('emptyListOfA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('equals': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('getList': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('strangeList': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('Exception': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('doInt': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('doList': Name@99) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('emptyListOfA': Name@100) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('equals': Name@101) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('getList': Name@102) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('strangeList': Name@103) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[16] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[16] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[4] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[4] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
-
-null {
-    <name not found> = ArrayList@235[16] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
-    <name not found> = ArrayList@236[16] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@274[5] { ResolutionCandidate@227, ResolutionCandidate@228, ResolutionCandidate@229, ... }
-    <name not found> = ArrayList@275[5] { ResolutionCandidate@232, ResolutionCandidate@233, ResolutionCandidate@234, ... }
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-    <name not found> = EmptyList@94[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
deleted file mode 100644
index 0bf3b2ab85f..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
+++ /dev/null
@@ -1,319 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['List<1>']
-}
-
-LazyJavaClassDescriptor@3['Exception'] {
-    constructors = ArrayList@4[5] { JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], ... } // through LazyJavaClassMemberScope@8
-    defaultType = JetTypeImpl@9['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@10['Exception']
-}
-
-LazyJavaClassTypeConstructor@10['Exception'] {
-    parameters = ArrayList@11[empty]
-    supertypes = ArrayList@12[1] { LazyJavaClassifierType@13['Throwable'] }
-}
-
-LazyJavaClassifierType@14['String'] {
-    arguments = ArrayList@15[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@24['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'false': Boolean@17
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@42['Throwable'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@44['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@46['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    nullable = 'true': Boolean@27
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaClassifierType@13['Throwable'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@50 {
-    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
-    packageFragments('A': FqName@53) = null
-    packageFragments('Int': FqName@54) = null
-    packageFragments('List': FqName@55) = null
-    packageFragments('T': FqName@56) = null
-    packageFragments('Unit': FqName@57) = null
-    packageFragments('a': FqName@58) = null
-    packageFragments('a.A': FqName@59) = null
-    packageFragments('a.Int': FqName@60) = null
-    packageFragments('a.List': FqName@61) = null
-    packageFragments('a.T': FqName@62) = null
-    packageFragments('a.Unit': FqName@63) = null
-    packageFragments('java': FqName@64) = LazyJavaPackageFragment@65['java']
-    packageFragments('java.lang': FqName@66) = LazyJavaPackageFragment@67['lang']
-    packageFragments('java.lang.A': FqName@68) = null
-    packageFragments('java.lang.Int': FqName@69) = null
-    packageFragments('java.lang.List': FqName@70) = null
-    packageFragments('java.lang.T': FqName@71) = null
-    packageFragments('java.lang.Unit': FqName@72) = null
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.A': FqName@74) = null
-    packageFragments('kotlin.Int': FqName@75) = null
-    packageFragments('kotlin.List': FqName@76) = null
-    packageFragments('kotlin.T': FqName@77) = null
-    packageFragments('kotlin.Unit': FqName@78) = null
-    packageFragments('kotlin.io': FqName@79) = null
-    packageFragments('kotlin.jvm': FqName@80) = null
-    topLevelClasses(JavaClassImpl@81['Exception']) = LazyJavaClassDescriptor@3['Exception']
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@67['lang'] {
-    classes('Exception': Name@88) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('doInt': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('doList': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('emptyNullableListOfA': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('id': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('strangeNullableList': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('doInt': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('doList': Name@91) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('emptyNullableListOfA': Name@92) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('id': Name@93) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('strangeNullableList': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[16] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[4] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
-
-null {
-    <name not found> = ArrayList@169[16] { ResolutionCandidate@98, ResolutionCandidate@99, ResolutionCandidate@100, ... }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@191[5] { ResolutionCandidate@166, ResolutionCandidate@167, ResolutionCandidate@168, ... }
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-    <name not found> = EmptyList@86[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
deleted file mode 100644
index 4342a434fa7..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.D': FqName@15) = null
-    packageFragments('java.lang.E': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.D': FqName@21) = null
-    packageFragments('kotlin.E': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@51 }
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
deleted file mode 100644
index 53d08ea9414..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
+++ /dev/null
@@ -1,290 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Any': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('b': FqName@7) = null
-    packageFragments('b.Any': FqName@8) = null
-    packageFragments('b.Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Any': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
deleted file mode 100644
index 882b661c401..00000000000
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
+++ /dev/null
@@ -1,105 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['T']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('R': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.R': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Int': FqName@18) = null
-    packageFragments('kotlin.R': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('bar': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('bar': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('bar': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
deleted file mode 100644
index 8f0bfce1c30..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('t': FqName@13) = null
-    packageFragments('test': FqName@14) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('test': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('testFun': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('test': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('testFun': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('testFun': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('testFun': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[2] { ResolutionCandidate@30, ResolutionCandidate@31 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
deleted file mode 100644
index 6001edd2fe0..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
+++ /dev/null
@@ -1,71 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('a': FqName@9) = null
-    packageFragments('a.v': FqName@10) = null
-    packageFragments('b': FqName@11) = null
-    packageFragments('b.v': FqName@12) = null
-    packageFragments('ff': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('vv': FqName@21) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('b': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('v': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('a': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('b': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('f': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('v': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@29[empty]
-}
-
-null {
-    <name not found> = ArrayList@46[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log b/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
deleted file mode 100644
index 49f80828f38..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
+++ /dev/null
@@ -1,201 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = StringValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Klass': FqName@6) = null
-    packageFragments('function': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Klass': FqName@12) = null
-    packageFragments('java.lang.function': FqName@13) = null
-    packageFragments('java.lang.property': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Klass': FqName@16) = null
-    packageFragments('kotlin.function': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.property': FqName@20) = null
-    packageFragments('pkg': FqName@21) = null
-    packageFragments('pkg.Klass': FqName@22) = null
-    packageFragments('pkg.function': FqName@23) = null
-    packageFragments('pkg.property': FqName@24) = null
-    packageFragments('property': FqName@25) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Klass': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('function': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('property': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Klass': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('function': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('Klass': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('function': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('property': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Klass': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('function': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('property': Name@41) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-null {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.lazy.log
deleted file mode 100644
index fccc3a628ff..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportFromCurrentWithDifferentName.lazy.log
+++ /dev/null
@@ -1,17 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('a.A': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@13
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@13
-    functions('lang': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@13
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@13
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
deleted file mode 100644
index 075742d33d2..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('baz': FqName@4) = null
-    packageFragments('baz.Bar': FqName@5) = null
-    packageFragments('baz.C': FqName@6) = null
-    packageFragments('foo': FqName@7) = null
-    packageFragments('foo.Bar': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Bar': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Bar': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
deleted file mode 100644
index 8962a6a32c0..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['a']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('a': FqName@5) = null
-    packageFragments('b': FqName@6) = null
-    packageFragments('b.a': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
deleted file mode 100644
index d9aadc1daa0..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('myApp': FqName@13) = null
-    packageFragments('weatherForecast': FqName@14) = null
-    packageFragments('weatherForecast.weatherToday': FqName@15) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('weatherToday': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('weatherToday': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
deleted file mode 100644
index ed1f012ef33..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('myApp': FqName@13) = null
-    packageFragments('weatherForecast': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('weatherToday': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('weatherToday': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports-hidden.lazy.log b/compiler/testData/diagnostics/tests/scopes/Imports-hidden.lazy.log
deleted file mode 100644
index 0c313950396..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/Imports-hidden.lazy.log
+++ /dev/null
@@ -1,20 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('b': FqName@4) = null
-    packageFragments('b.O': FqName@5) = null
-    packageFragments('c': FqName@6) = null
-    packageFragments('c.O': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log b/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
deleted file mode 100644
index cc6f4557aea..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
+++ /dev/null
@@ -1,525 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['String']
-    <name not found> = JetTypeImpl@7['String']
-    <name not found> = MutableClassDescriptor$1@8
-    <name not found> = MutableClassDescriptor$1@9
-    <name not found> = StringValue@10
-}
-
-LazyJavaPackageFragmentProvider@11 {
-    packageFragments('<root>': FqName@12) = LazyJavaPackageFragment@13['<root>']
-    packageFragments('B': FqName@14) = null
-    packageFragments('Int': FqName@15) = null
-    packageFragments('String': FqName@16) = null
-    packageFragments('a': FqName@17) = null
-    packageFragments('a.B': FqName@18) = null
-    packageFragments('a.bar': FqName@19) = null
-    packageFragments('a.cValue': FqName@20) = null
-    packageFragments('a.dValue': FqName@21) = null
-    packageFragments('a.f': FqName@22) = null
-    packageFragments('a.fff': FqName@23) = null
-    packageFragments('b': FqName@24) = null
-    packageFragments('b.B': FqName@25) = null
-    packageFragments('b.C': FqName@26) = null
-    packageFragments('b.D': FqName@27) = null
-    packageFragments('b.E': FqName@28) = null
-    packageFragments('b.F': FqName@29) = null
-    packageFragments('b.Int': FqName@30) = null
-    packageFragments('b.String': FqName@31) = null
-    packageFragments('b.bar': FqName@32) = null
-    packageFragments('b.constant': FqName@33) = null
-    packageFragments('b.ext': FqName@34) = null
-    packageFragments('b.foo': FqName@35) = null
-    packageFragments('b.value': FqName@36) = null
-    packageFragments('bar': FqName@37) = null
-    packageFragments('c': FqName@38) = null
-    packageFragments('c.C': FqName@39) = null
-    packageFragments('c.f': FqName@40) = null
-    packageFragments('c.i': FqName@41) = null
-    packageFragments('cValue': FqName@42) = null
-    packageFragments('d': FqName@43) = null
-    packageFragments('d.A': FqName@44) = null
-    packageFragments('d.B': FqName@45) = null
-    packageFragments('d.b': FqName@46) = null
-    packageFragments('d.c': FqName@47) = null
-    packageFragments('dValue': FqName@48) = null
-    packageFragments('f': FqName@49) = null
-    packageFragments('fff': FqName@50) = null
-    packageFragments('i': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.B': FqName@56) = null
-    packageFragments('java.lang.Int': FqName@57) = null
-    packageFragments('java.lang.String': FqName@58) = null
-    packageFragments('java.lang.bar': FqName@59) = null
-    packageFragments('java.lang.cValue': FqName@60) = null
-    packageFragments('java.lang.dValue': FqName@61) = null
-    packageFragments('java.lang.f': FqName@62) = null
-    packageFragments('java.lang.fff': FqName@63) = null
-    packageFragments('java.lang.i': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@66) = null
-    packageFragments('kotlin.Int': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.bar': FqName@69) = null
-    packageFragments('kotlin.cValue': FqName@70) = null
-    packageFragments('kotlin.dValue': FqName@71) = null
-    packageFragments('kotlin.f': FqName@72) = null
-    packageFragments('kotlin.fff': FqName@73) = null
-    packageFragments('kotlin.i': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    packageFragments('smth': FqName@77) = null
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@55['lang'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('D': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('F': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('cValue': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('constant': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('dValue': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('ext': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('f': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('fff': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('i': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('value': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('B': Name@84) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('D': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('F': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('bar': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('cValue': Name@98) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('dValue': Name@99) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('ext': Name@92) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('f': Name@100) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('fff': Name@94) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@95) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('i': Name@101) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
-
-null {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@150 }
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-    <name not found> = EmptyList@82[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsConflicting.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportsConflicting.lazy.log
deleted file mode 100644
index bb645d754f9..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportsConflicting.lazy.log
+++ /dev/null
@@ -1,25 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('a': FqName@5) = null
-    packageFragments('b': FqName@6) = null
-    packageFragments('b.foo': FqName@7) = null
-    packageFragments('c': FqName@8) = null
-    packageFragments('c.foo': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.lazy.log
deleted file mode 100644
index 8d8b52877b6..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport.lazy.log
+++ /dev/null
@@ -1,18 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('a.B': FqName@4) = null
-    packageFragments('a.a': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.lazy.log
deleted file mode 100644
index edeb2c3ef5d..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/ImportsUselessSimpleImport2.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('a': FqName@3) = null
-    packageFragments('a.b': FqName@4) = null
-    packageFragments('b': FqName@5) = null
-    packageFragments('b.B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
deleted file mode 100644
index 170a2b30c36..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('test': FqName@12) = null
-    packageFragments('test.t': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('testFun': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('testFun': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
deleted file mode 100644
index 948c23ad766..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
+++ /dev/null
@@ -1,170 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['E']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('E': FqName@7) = null
-    packageFragments('F': FqName@8) = null
-    packageFragments('G': FqName@9) = null
-    packageFragments('H': FqName@10) = null
-    packageFragments('L': FqName@11) = null
-    packageFragments('P': FqName@12) = null
-    packageFragments('Q': FqName@13) = null
-    packageFragments('R': FqName@14) = null
-    packageFragments('T': FqName@15) = null
-    packageFragments('b': FqName@16) = null
-    packageFragments('b.A': FqName@17) = null
-    packageFragments('b.B': FqName@18) = null
-    packageFragments('b.C': FqName@19) = null
-    packageFragments('b.D': FqName@20) = null
-    packageFragments('b.E': FqName@21) = null
-    packageFragments('b.F': FqName@22) = null
-    packageFragments('b.G': FqName@23) = null
-    packageFragments('b.H': FqName@24) = null
-    packageFragments('b.I': FqName@25) = null
-    packageFragments('b.J': FqName@26) = null
-    packageFragments('b.K': FqName@27) = null
-    packageFragments('b.L': FqName@28) = null
-    packageFragments('b.M': FqName@29) = null
-    packageFragments('b.P': FqName@30) = null
-    packageFragments('b.Q': FqName@31) = null
-    packageFragments('b.R': FqName@32) = null
-    packageFragments('b.S': FqName@33) = null
-    packageFragments('b.T': FqName@34) = null
-    packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
-    packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
-    packageFragments('java.lang.A': FqName@39) = null
-    packageFragments('java.lang.D': FqName@40) = null
-    packageFragments('java.lang.E': FqName@41) = null
-    packageFragments('java.lang.F': FqName@42) = null
-    packageFragments('java.lang.G': FqName@43) = null
-    packageFragments('java.lang.H': FqName@44) = null
-    packageFragments('java.lang.L': FqName@45) = null
-    packageFragments('java.lang.P': FqName@46) = null
-    packageFragments('java.lang.Q': FqName@47) = null
-    packageFragments('java.lang.R': FqName@48) = null
-    packageFragments('java.lang.T': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = null
-    packageFragments('kotlin.A': FqName@51) = null
-    packageFragments('kotlin.D': FqName@52) = null
-    packageFragments('kotlin.E': FqName@53) = null
-    packageFragments('kotlin.F': FqName@54) = null
-    packageFragments('kotlin.G': FqName@55) = null
-    packageFragments('kotlin.H': FqName@56) = null
-    packageFragments('kotlin.L': FqName@57) = null
-    packageFragments('kotlin.P': FqName@58) = null
-    packageFragments('kotlin.Q': FqName@59) = null
-    packageFragments('kotlin.R': FqName@60) = null
-    packageFragments('kotlin.T': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = null
-    packageFragments('kotlin.jvm': FqName@63) = null
-}
-
-LazyJavaPackageFragment@36['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@38['lang'] {
-    classes('protected_fun': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('self': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('protected_fun': Name@70) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('self': Name@72) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-    <name not found> = EmptyList@68[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
deleted file mode 100644
index ba07f571608..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
+++ /dev/null
@@ -1,177 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = DeserializedType@1['kotlin.String']
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('C': FqName@10) = null
-    packageFragments('D': FqName@11) = null
-    packageFragments('Int': FqName@12) = null
-    packageFragments('List': FqName@13) = null
-    packageFragments('String': FqName@14) = null
-    packageFragments('T': FqName@15) = null
-    packageFragments('i': FqName@16) = null
-    packageFragments('i.A': FqName@17) = null
-    packageFragments('i.C': FqName@18) = null
-    packageFragments('i.D': FqName@19) = null
-    packageFragments('i.Int': FqName@20) = null
-    packageFragments('i.List': FqName@21) = null
-    packageFragments('i.String': FqName@22) = null
-    packageFragments('i.T': FqName@23) = null
-    packageFragments('i.bar': FqName@24) = null
-    packageFragments('i.bd': FqName@25) = null
-    packageFragments('i.bd1': FqName@26) = null
-    packageFragments('i.foo': FqName@27) = null
-    packageFragments('i.foo1': FqName@28) = null
-    packageFragments('i.length': FqName@29) = null
-    packageFragments('i.length1': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.A': FqName@35) = null
-    packageFragments('java.lang.C': FqName@36) = null
-    packageFragments('java.lang.D': FqName@37) = null
-    packageFragments('java.lang.Int': FqName@38) = null
-    packageFragments('java.lang.List': FqName@39) = null
-    packageFragments('java.lang.String': FqName@40) = null
-    packageFragments('java.lang.T': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.A': FqName@43) = null
-    packageFragments('kotlin.C': FqName@44) = null
-    packageFragments('kotlin.D': FqName@45) = null
-    packageFragments('kotlin.Int': FqName@46) = null
-    packageFragments('kotlin.List': FqName@47) = null
-    packageFragments('kotlin.String': FqName@48) = null
-    packageFragments('kotlin.T': FqName@49) = null
-    packageFragments('kotlin.io': FqName@50) = null
-    packageFragments('kotlin.jvm': FqName@51) = null
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('C': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('D': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('ii': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('size': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('C': Name@58) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('D': Name@60) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('size': Name@62) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
-
-null {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-    <name not found> = EmptyList@56[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
deleted file mode 100644
index 2545c1a19ec..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.B': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1078': FqName@16) = null
-    packageFragments('kt1078.B': FqName@17) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('B': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('B': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1080.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1080.lazy.log
deleted file mode 100644
index 0a4ab61933e..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1080.lazy.log
+++ /dev/null
@@ -1,32 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Test': FqName@3) = null
-    packageFragments('b': FqName@4) = null
-    packageFragments('b.Test': FqName@5) = null
-    packageFragments('b.d': FqName@6) = null
-    packageFragments('b.d.Test': FqName@7) = null
-    packageFragments('d': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Test': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Test': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('kt1080': FqName@18) = null
-    packageFragments('kt1080.Some': FqName@19) = null
-    packageFragments('kt1080.Test': FqName@20) = null
-    packageFragments('kt1080.d': FqName@21) = null
-    packageFragments('reflect': FqName@22) = null
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('Test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
deleted file mode 100644
index 4885a1907c8..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('kt1244': FqName@12) = null
-    packageFragments('kt1244.A': FqName@13) = null
-    packageFragments('kt1244.B': FqName@14) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('A': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1248.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1248.lazy.log
deleted file mode 100644
index 3516a33ea7b..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1248.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = BooleanValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('ParseResult': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Boolean': FqName@12) = null
-    packageFragments('java.lang.ParseResult': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Boolean': FqName@16) = null
-    packageFragments('kotlin.ParseResult': FqName@17) = null
-    packageFragments('kotlin.T': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1248': FqName@21) = null
-    packageFragments('kt1248.Boolean': FqName@22) = null
-    packageFragments('kt1248.ParseResult': FqName@23) = null
-    packageFragments('kt1248.Success': FqName@24) = null
-    packageFragments('kt1248.T': FqName@25) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
deleted file mode 100644
index 4b0a24025a3..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('java.lang.C': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.A': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.C': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kt151': FqName@22) = null
-    packageFragments('kt151.A': FqName@23) = null
-    packageFragments('kt151.B': FqName@24) = null
-    packageFragments('kt151.C': FqName@25) = null
-    packageFragments('kt151.D': FqName@26) = null
-    packageFragments('kt151.E': FqName@27) = null
-    packageFragments('kt151.F': FqName@28) = null
-    packageFragments('kt151.G': FqName@29) = null
-    packageFragments('kt151.T': FqName@30) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('x': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('x': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-null {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1579.lazy.log
deleted file mode 100644
index 35a15bf2c12..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1579.lazy.log
+++ /dev/null
@@ -1,18 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-    packageFragments('lib': FqName@10) = null
-    packageFragments('lib.WithInner': FqName@11) = null
-    packageFragments('user': FqName@12) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
deleted file mode 100644
index 586ee74c46d..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Entry<2>']
-    <name not found> = JetTypeImpl@2['Entry<2>']
-    <name not found> = JetTypeImpl@3['Entry<2>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Entry': FqName@7) = null
-    packageFragments('Map': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.Entry': FqName@11) = null
-    packageFragments('a.String': FqName@12) = null
-    packageFragments('b': FqName@13) = null
-    packageFragments('b.Entry': FqName@14) = null
-    packageFragments('b.String': FqName@15) = null
-    packageFragments('c': FqName@16) = null
-    packageFragments('c.Map': FqName@17) = null
-    packageFragments('c.String': FqName@18) = null
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('java.lang.Entry': FqName@23) = null
-    packageFragments('java.lang.Map': FqName@24) = null
-    packageFragments('java.lang.String': FqName@25) = null
-    packageFragments('kotlin': FqName@26) = null
-    packageFragments('kotlin.Entry': FqName@27) = null
-    packageFragments('kotlin.Map': FqName@28) = null
-    packageFragments('kotlin.String': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = null
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-null {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1580.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1580.lazy.log
deleted file mode 100644
index 6a18936ab1c..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1580.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('WithInner': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.WithInner': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.WithInner': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('lib': FqName@13) = null
-    packageFragments('lib.WithInner': FqName@14) = null
-    packageFragments('user': FqName@15) = null
-    packageFragments('user.WithInner': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1642.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1642.lazy.log
deleted file mode 100644
index c68ca3869b7..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1642.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaClassDescriptor@0['ArrayList'] {
-    functionTypeForSamInterface = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('a': FqName@4) = null
-    packageFragments('a.java': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.util': FqName@10) = LazyJavaPackageFragment@11['util']
-    packageFragments('java.util.ArrayList': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    topLevelClasses(JavaClassImpl@16['ArrayList']) = LazyJavaClassDescriptor@0['ArrayList']
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('util': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('util': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@11['util'] {
-    classes('ArrayList': Name@25) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('ArrayList': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
deleted file mode 100644
index 5862c2081ca..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
+++ /dev/null
@@ -1,74 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.A': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1738': FqName@16) = null
-    packageFragments('kt1738.A': FqName@17) = null
-    packageFragments('kt1738.Int': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
deleted file mode 100644
index 0d82a4397dc..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
+++ /dev/null
@@ -1,130 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Some': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Some': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Some': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt1805': FqName@16) = null
-    packageFragments('kt1805.Some': FqName@17) = null
-    packageFragments('kt1805.SomeSubclass': FqName@18) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('Some': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('SomeSubclass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Some': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('SomeSubclass': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-null {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
deleted file mode 100644
index a732e38653d..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
+++ /dev/null
@@ -1,146 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-DescriptorResolver@2 {
-    <name not found> = DeferredType@3
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('MyObject': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.MyObject': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.MyObject': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kt1806': FqName@21) = null
-    packageFragments('kt1806.MyObject': FqName@22) = null
-    packageFragments('kt1806.String': FqName@23) = null
-    packageFragments('kt1806.Test': FqName@24) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('MyObject1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('doSmth': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('doSmth': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
deleted file mode 100644
index d9fd05190dd..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.B': FqName@13) = null
-    packageFragments('java.lang.C': FqName@14) = null
-    packageFragments('java.lang.D': FqName@15) = null
-    packageFragments('java.lang.T': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.D': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kt1822': FqName@25) = null
-    packageFragments('kt1822.A': FqName@26) = null
-    packageFragments('kt1822.B': FqName@27) = null
-    packageFragments('kt1822.C': FqName@28) = null
-    packageFragments('kt1822.D': FqName@29) = null
-    packageFragments('kt1822.E': FqName@30) = null
-    packageFragments('kt1822.G': FqName@31) = null
-    packageFragments('kt1822.T': FqName@32) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@44 }
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
deleted file mode 100644
index a4a4eb2dc8e..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-LazyJavaClassDescriptor@0['C'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], DeserializedSimpleFunctionDescriptor@3['toString'], DeserializedSimpleFunctionDescriptor@4['equals'], ... } // through LazyJavaClassMemberScope@5
-    constructors = ArrayList@6[1] { JavaConstructorDescriptor@7['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@8['C']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@5
-    functionTypeForSamInterface = null
-    functions('clone': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@4['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@15) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@16) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@19) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@3['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@22) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@5
-    properties('myValue': Name@25) = ArrayList@26[1] { JavaPropertyDescriptor@27['myValue'] } // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@29['C']
-}
-
-LazyJavaClassTypeConstructor@29['C'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { JetTypeImpl@32['Any'] }
-}
-
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('C': FqName@39) = null
-    packageFragments('a': FqName@40) = LazyJavaPackageFragment@41['a']
-    packageFragments('a.C': FqName@42) = null
-    packageFragments('d': FqName@43) = null
-    packageFragments('d.A': FqName@44) = null
-    packageFragments('d.C': FqName@45) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.C': FqName@50) = null
-    packageFragments('kotlin': FqName@51) = null
-    packageFragments('kotlin.C': FqName@52) = null
-    packageFragments('kotlin.io': FqName@53) = null
-    packageFragments('kotlin.jvm': FqName@54) = null
-    topLevelClasses(JavaClassImpl@55['C']) = LazyJavaClassDescriptor@0['C']
-}
-
-LazyJavaPackageFragment@41['a'] {
-    classes('C': Name@56) = LazyJavaClassDescriptor@0['C'] // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('C': Name@59) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@49['lang'] {
-    classes('myValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-null {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
deleted file mode 100644
index 2f4e9c554cc..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
+++ /dev/null
@@ -1,82 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-    <name not found> = JetTypeImpl@4['String']
-    <name not found> = StringValue@5
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Foo': FqName@9) = null
-    packageFragments('Int': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Foo': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Foo': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kt2262': FqName@25) = null
-    packageFragments('kt2262.Bar': FqName@26) = null
-    packageFragments('kt2262.Foo': FqName@27) = null
-    packageFragments('kt2262.Int': FqName@28) = null
-    packageFragments('kt2262.String': FqName@29) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('color': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('i': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-null {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
deleted file mode 100644
index 5ac53062964..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
+++ /dev/null
@@ -1,991 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['ArrayList<1>']
-    <name not found> = JetTypeImpl@4['HashMap<2>']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['String']
-    <name not found> = StringValue@7
-}
-
-LazyJavaClassDescriptor@8['AbstractCollection'] {
-    defaultType = JetTypeImpl@9['AbstractCollection<1>']
-    functions('add': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['add'] } // through LazyJavaClassMemberScope@13
-    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@17['AbstractList'] {
-    defaultType = JetTypeImpl@18['AbstractList<1>']
-    functions('add': Name@19) = ArrayList@20[2] { JavaMethodDescriptor@21['add'], JavaMethodDescriptor@22['add'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractList']
-}
-
-LazyJavaClassDescriptor@27['ArrayList'] {
-    constructors = ArrayList@28[3] { JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'], JavaConstructorDescriptor@31['<init>'] } // through LazyJavaClassMemberScope@32
-    defaultType = JetTypeImpl@33['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@32
-    functionTypeForSamInterface = null
-    functions('add': Name@35) = ArrayList@36[2] { JavaMethodDescriptor@37['add'], JavaMethodDescriptor@38['add'] } // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@32
-    nestedClasses('add': Name@35) = null // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@41['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@42['ArrayList']
-}
-
-LazyJavaClassDescriptor@43['HashMap'] {
-    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
-    defaultType = JetTypeImpl@49['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@50['HashMap']
-}
-
-LazyJavaClassDescriptor@51['RandomAccess'] {
-    functions('add': Name@19) = EmptyList@52[empty] // through LazyJavaClassMemberScope@53
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['RandomAccess']
-}
-
-LazyJavaClassDescriptor@56['Serializable'] {
-    functions('add': Name@19) = EmptyList@52[empty] // through LazyJavaClassMemberScope@57
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@59['Serializable']
-}
-
-LazyJavaClassTypeConstructor@16['AbstractCollection'] {
-    parameters = ArrayList@60[1] { LazyJavaTypeParameterDescriptor@61['E'] }
-    supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@26['AbstractList'] {
-    parameters = ArrayList@64[1] { LazyJavaTypeParameterDescriptor@65['E'] }
-    supertypes = ArrayList@66[2] { LazyJavaClassifierType@67['AbstractCollection<E>'], LazyJavaClassifierType@68['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@42['ArrayList'] {
-    parameters = ArrayList@69[1] { LazyJavaTypeParameterDescriptor@70['E'] }
-    supertypes = ArrayList@71[5] { LazyJavaClassifierType@72['AbstractList<E>'], LazyJavaClassifierType@73['List<E>'], LazyJavaClassifierType@74['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@50['HashMap'] {
-    parameters = ArrayList@75[2] { LazyJavaTypeParameterDescriptor@76['K'], LazyJavaTypeParameterDescriptor@77['V'] }
-}
-
-LazyJavaClassTypeConstructor@55['RandomAccess'] {
-    parameters = ArrayList@78[empty]
-    supertypes = ArrayList@79[1] { JetTypeImpl@80['Any'] }
-}
-
-LazyJavaClassTypeConstructor@59['Serializable'] {
-    parameters = ArrayList@81[empty]
-    supertypes = ArrayList@82[1] { JetTypeImpl@80['Any'] }
-}
-
-LazyJavaClassifierType@67['AbstractCollection<E>'] {
-    arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
-    classifier = JavaClassImpl@85['AbstractCollection']
-    memberScope = SubstitutingScope@86
-    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
-}
-
-LazyJavaClassifierType@72['AbstractList<E>'] {
-    arguments = ArrayList@87[1] { TypeProjectionImpl@88 }
-    classifier = JavaClassImpl@89['AbstractList']
-    memberScope = SubstitutingScope@90
-    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractList']
-}
-
-LazyJavaClassifierType@91['Cloneable'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaClassImpl@93['Cloneable']
-    memberScope = DeserializedClassMemberScope@94
-    typeConstructor = DeserializedClassTypeConstructor@95
-}
-
-LazyJavaClassifierType@96['Collection<? extends E>'] {
-    arguments = ArrayList@97[1] { TypeProjectionImpl@98 }
-    classifier = JavaClassImpl@99['Collection']
-    memberScope = SubstitutingScope@100
-    nullable = 'false': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@102
-}
-
-LazyJavaClassifierType@103['Collection<? extends E>'] {
-    arguments = ArrayList@104[1] { TypeProjectionImpl@105 }
-    classifier = JavaClassImpl@99['Collection']
-    memberScope = SubstitutingScope@106
-    nullable = 'true': Boolean@107
-    typeConstructor = DeserializedClassTypeConstructor@108
-}
-
-LazyJavaClassifierType@63['Collection<E>'] {
-    arguments = ArrayList@109[1] { TypeProjectionImpl@110 }
-    classifier = JavaClassImpl@111['Collection']
-    memberScope = SubstitutingScope@112
-    typeConstructor = DeserializedClassTypeConstructor@102
-}
-
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-LazyJavaClassifierType@117['E'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@121['E'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@124['E'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@131['E'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@134['E'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@136['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@137['E'] {
-    arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@139['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@140['E'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@142['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-LazyJavaClassifierType@143['E'] {
-    arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@145['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@146['E'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@148['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@149['E'] {
-    arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@151['E']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@152['E'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@130['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@156['E'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@151['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@158['E'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@160['E'] {
-    arguments = ArrayList@161[empty]
-    classifier = JavaTypeParameterImpl@136['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@162['E'] {
-    arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@164['E'] {
-    arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@145['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@166['E'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@115['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-LazyJavaClassifierType@168['E'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@148['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@170['E'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@172['E'] {
-    arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@139['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@174['E'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@142['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-LazyJavaClassifierType@176['K'] {
-    arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@178['K']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
-}
-
-LazyJavaClassifierType@180['K'] {
-    arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@182['K']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
-}
-
-LazyJavaClassifierType@183['K'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@178['K']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
-}
-
-LazyJavaClassifierType@185['K'] {
-    arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@182['K']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
-}
-
-LazyJavaClassifierType@68['List<E>'] {
-    arguments = ArrayList@187[1] { TypeProjectionImpl@188 }
-    classifier = JavaClassImpl@189['List']
-    memberScope = SubstitutingScope@190
-    typeConstructor = DeserializedClassTypeConstructor@191
-}
-
-LazyJavaClassifierType@73['List<E>'] {
-    arguments = ArrayList@192[1] { TypeProjectionImpl@193 }
-    classifier = JavaClassImpl@194['List']
-    memberScope = SubstitutingScope@195
-    typeConstructor = DeserializedClassTypeConstructor@191
-}
-
-LazyJavaClassifierType@196['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@197[2] { TypeProjectionImpl@198, TypeProjectionImpl@199 }
-    classifier = JavaClassImpl@200['Map']
-    memberScope = SubstitutingScope@201
-    nullable = 'false': Boolean@101
-    typeConstructor = DeserializedClassTypeConstructor@202
-}
-
-LazyJavaClassifierType@203['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@204[2] { TypeProjectionImpl@205, TypeProjectionImpl@206 }
-    classifier = JavaClassImpl@200['Map']
-    memberScope = SubstitutingScope@207
-    nullable = 'true': Boolean@107
-    typeConstructor = DeserializedClassTypeConstructor@208
-}
-
-LazyJavaClassifierType@209['Object'] {
-    classifier = JavaClassImpl@210['Object']
-    typeConstructor = DeserializedClassTypeConstructor@211
-}
-
-LazyJavaClassifierType@212['Object'] {
-    classifier = JavaClassImpl@213['Object']
-    typeConstructor = DeserializedClassTypeConstructor@211
-}
-
-LazyJavaClassifierType@214['Object'] {
-    classifier = JavaClassImpl@215['Object']
-    typeConstructor = DeserializedClassTypeConstructor@211
-}
-
-LazyJavaClassifierType@74['RandomAccess'] {
-    arguments = ArrayList@216[empty]
-    classifier = JavaClassImpl@217['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@53
-    typeConstructor = LazyJavaClassTypeConstructor@55['RandomAccess']
-}
-
-LazyJavaClassifierType@218['Serializable'] {
-    arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@220['Serializable']
-    memberScope = LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@59['Serializable']
-}
-
-LazyJavaClassifierType@221['V'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@223['V']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
-}
-
-LazyJavaClassifierType@225['V'] {
-    arguments = ArrayList@226[empty]
-    classifier = JavaTypeParameterImpl@227['V']
-    nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
-}
-
-LazyJavaClassifierType@228['V'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@227['V']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
-}
-
-LazyJavaClassifierType@230['V'] {
-    arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@223['V']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
-}
-
-LazyJavaPackageFragmentProvider@232 {
-    packageFragments('$p': FqName@233) = null
-    packageFragments('<root>': FqName@234) = LazyJavaPackageFragment@235['<root>']
-    packageFragments('A': FqName@236) = null
-    packageFragments('BodyTag': FqName@237) = null
-    packageFragments('Element': FqName@238) = null
-    packageFragments('Int': FqName@239) = null
-    packageFragments('String': FqName@240) = null
-    packageFragments('Tag': FqName@241) = null
-    packageFragments('TagWithText': FqName@242) = null
-    packageFragments('X': FqName@243) = null
-    packageFragments('java': FqName@244) = LazyJavaPackageFragment@245['java']
-    packageFragments('java.io': FqName@246) = LazyJavaPackageFragment@247['io']
-    packageFragments('java.lang': FqName@248) = LazyJavaPackageFragment@249['lang']
-    packageFragments('java.lang.$p': FqName@250) = null
-    packageFragments('java.lang.A': FqName@251) = null
-    packageFragments('java.lang.BodyTag': FqName@252) = null
-    packageFragments('java.lang.Element': FqName@253) = null
-    packageFragments('java.lang.Int': FqName@254) = null
-    packageFragments('java.lang.String': FqName@255) = null
-    packageFragments('java.lang.Tag': FqName@256) = null
-    packageFragments('java.lang.TagWithText': FqName@257) = null
-    packageFragments('java.lang.X': FqName@258) = null
-    packageFragments('java.lang.name': FqName@259) = null
-    packageFragments('java.lang.rrr': FqName@260) = null
-    packageFragments('java.lang.s': FqName@261) = null
-    packageFragments('java.lang.x': FqName@262) = null
-    packageFragments('java.util': FqName@263) = LazyJavaPackageFragment@264['util']
-    packageFragments('java.util.ArrayList': FqName@265) = null
-    packageFragments('java.util.HashMap': FqName@266) = null
-    packageFragments('kotlin': FqName@267) = null
-    packageFragments('kotlin.$p': FqName@268) = null
-    packageFragments('kotlin.A': FqName@269) = null
-    packageFragments('kotlin.BodyTag': FqName@270) = null
-    packageFragments('kotlin.Element': FqName@271) = null
-    packageFragments('kotlin.Int': FqName@272) = null
-    packageFragments('kotlin.String': FqName@273) = null
-    packageFragments('kotlin.Tag': FqName@274) = null
-    packageFragments('kotlin.TagWithText': FqName@275) = null
-    packageFragments('kotlin.X': FqName@276) = null
-    packageFragments('kotlin.io': FqName@277) = null
-    packageFragments('kotlin.jvm': FqName@278) = null
-    packageFragments('kotlin.name': FqName@279) = null
-    packageFragments('kotlin.rrr': FqName@280) = null
-    packageFragments('kotlin.s': FqName@281) = null
-    packageFragments('kotlin.x': FqName@282) = null
-    packageFragments('kt_250_617_10': FqName@283) = null
-    packageFragments('kt_250_617_10.$p': FqName@284) = null
-    packageFragments('kt_250_617_10.A': FqName@285) = null
-    packageFragments('kt_250_617_10.B': FqName@286) = null
-    packageFragments('kt_250_617_10.Body': FqName@287) = null
-    packageFragments('kt_250_617_10.Body1': FqName@288) = null
-    packageFragments('kt_250_617_10.BodyTag': FqName@289) = null
-    packageFragments('kt_250_617_10.Element': FqName@290) = null
-    packageFragments('kt_250_617_10.Int': FqName@291) = null
-    packageFragments('kt_250_617_10.M': FqName@292) = null
-    packageFragments('kt_250_617_10.N': FqName@293) = null
-    packageFragments('kt_250_617_10.String': FqName@294) = null
-    packageFragments('kt_250_617_10.Tag': FqName@295) = null
-    packageFragments('kt_250_617_10.TagWithText': FqName@296) = null
-    packageFragments('kt_250_617_10.TextElement': FqName@297) = null
-    packageFragments('kt_250_617_10.X': FqName@298) = null
-    packageFragments('kt_250_617_10.Y': FqName@299) = null
-    packageFragments('kt_250_617_10.Z': FqName@300) = null
-    packageFragments('kt_250_617_10.name': FqName@301) = null
-    packageFragments('kt_250_617_10.rrr': FqName@302) = null
-    packageFragments('kt_250_617_10.s': FqName@303) = null
-    packageFragments('kt_250_617_10.x': FqName@304) = null
-    packageFragments('name': FqName@305) = null
-    packageFragments('rrr': FqName@306) = null
-    packageFragments('s': FqName@307) = null
-    packageFragments('x': FqName@308) = null
-    topLevelClasses(JavaClassImpl@85['AbstractCollection']) = LazyJavaClassDescriptor@8['AbstractCollection']
-    topLevelClasses(JavaClassImpl@89['AbstractList']) = LazyJavaClassDescriptor@17['AbstractList']
-    topLevelClasses(JavaClassImpl@309['ArrayList']) = LazyJavaClassDescriptor@27['ArrayList']
-    topLevelClasses(JavaClassImpl@310['HashMap']) = LazyJavaClassDescriptor@43['HashMap']
-    topLevelClasses(JavaClassImpl@217['RandomAccess']) = LazyJavaClassDescriptor@51['RandomAccess']
-    topLevelClasses(JavaClassImpl@220['Serializable']) = LazyJavaClassDescriptor@56['Serializable']
-}
-
-LazyJavaPackageFragment@245['java'] {
-    classes('lang': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@312
-    classes('util': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@312
-    deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@312
-    functions('lang': Name@315) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@312
-    functions('util': Name@316) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@312
-    memberIndex = computeMemberIndex$1@317 // through LazyPackageFragmentScopeForJavaPackage@312
-}
-
-LazyJavaPackageFragment@249['lang'] {
-    classes('$p': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('ArrayList': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('HashMap': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('TextElement': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('children': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('name': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('rrr': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('s': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('x': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('$p': Name@328) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('ArrayList': Name@320) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('HashMap': Name@321) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('TextElement': Name@322) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('name': Name@329) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('rrr': Name@330) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('s': Name@331) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('x': Name@332) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    memberIndex = computeMemberIndex$1@333 // through LazyPackageFragmentScopeForJavaPackage@319
-}
-
-LazyJavaPackageFragment@264['util'] {
-    classes('ArrayList': Name@334) = LazyJavaClassDescriptor@27['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@335
-    classes('HashMap': Name@336) = LazyJavaClassDescriptor@43['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@335
-    deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('ArrayList': Name@337) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('HashMap': Name@338) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@335
-    memberIndex = computeMemberIndex$1@339 // through LazyPackageFragmentScopeForJavaPackage@335
-}
-
-LazyJavaTypeParameterDescriptor@61['E'] {
-    defaultType = JetTypeImpl@340['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@341[1] { NullableType@342 }
-    upperBoundsAsType = NullableType@342
-}
-
-LazyJavaTypeParameterDescriptor@65['E'] {
-    defaultType = JetTypeImpl@343['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@344[1] { NullableType@345 }
-    upperBoundsAsType = NullableType@345
-}
-
-LazyJavaTypeParameterDescriptor@70['E'] {
-    defaultType = JetTypeImpl@346['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-    upperBounds = LinkedHashSet@347[1] { NullableType@348 }
-    upperBoundsAsType = NullableType@348
-}
-
-LazyJavaTypeParameterDescriptor@76['K'] {
-    defaultType = JetTypeImpl@349['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
-    upperBounds = LinkedHashSet@350[1] { NullableType@351 }
-}
-
-LazyJavaTypeParameterDescriptor@77['V'] {
-    defaultType = JetTypeImpl@352['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
-    upperBounds = LinkedHashSet@353[1] { NullableType@354 }
-}
-
-LazyJavaTypeParameterResolver@355 {
-    resolve(JavaTypeParameterImpl@356['E']) = LazyJavaTypeParameterDescriptor@61['E']
-}
-
-LazyJavaTypeParameterResolver@357 {
-    resolve(JavaTypeParameterImpl@358['E']) = LazyJavaTypeParameterDescriptor@65['E']
-}
-
-LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@70['E']
-}
-
-LazyJavaTypeParameterResolver@361 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
-}
-
-LazyJavaTypeParameterResolver@362 {
-    resolve(JavaTypeParameterImpl@115['E']) = null
-}
-
-LazyJavaTypeParameterResolver@363 {
-    resolve(JavaTypeParameterImpl@145['E']) = null
-}
-
-LazyJavaTypeParameterResolver@364 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
-}
-
-LazyJavaTypeParameterResolver@365 {
-    resolve(JavaTypeParameterImpl@139['E']) = null
-}
-
-LazyJavaTypeParameterResolver@366 {
-    resolve(JavaTypeParameterImpl@367['K']) = LazyJavaTypeParameterDescriptor@76['K']
-    resolve(JavaTypeParameterImpl@368['V']) = LazyJavaTypeParameterDescriptor@77['V']
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = ArrayList@419[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
-}
-
-ResolutionTaskHolder@422 {
-    <name not found> = ArrayList@423[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@427 {
-    <name not found> = ArrayList@428[4] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@433 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@434 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@436 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@437 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@439 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@442 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-ResolutionTaskHolder@443 {
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
-
-null {
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@373 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@461[2] { ResolutionCandidate@420, ResolutionCandidate@421 }
-    <name not found> = ArrayList@462[3] { ResolutionCandidate@424, ResolutionCandidate@425, ResolutionCandidate@426 }
-    <name not found> = ArrayList@463[4] { ResolutionCandidate@429, ResolutionCandidate@430, ResolutionCandidate@431, ... }
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-    <name not found> = EmptyList@52[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
deleted file mode 100644
index 0f565c0f344..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.A': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kt323': FqName@19) = null
-    packageFragments('kt323.A': FqName@20) = null
-    packageFragments('kt323.B': FqName@21) = null
-    packageFragments('kt323.Int': FqName@22) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
deleted file mode 100644
index a776503681e..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
+++ /dev/null
@@ -1,80 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('kt37': FqName@16) = null
-    packageFragments('kt37.C': FqName@17) = null
-    packageFragments('kt37.Int': FqName@18) = null
-    packageFragments('kt37.String': FqName@19) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
deleted file mode 100644
index f58262da951..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@4['Int']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('b': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('b': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
deleted file mode 100644
index 51af6d5cb30..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
+++ /dev/null
@@ -1,218 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Main': FqName@3) = null
-    packageFragments('States': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.States': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.States': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('States': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('States': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('States': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('States': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
deleted file mode 100644
index 5f3c1be46b9..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
+++ /dev/null
@@ -1,83 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('R': FqName@4) = null
-    packageFragments('c': FqName@5) = null
-    packageFragments('c.A': FqName@6) = null
-    packageFragments('c.B': FqName@7) = null
-    packageFragments('c.M': FqName@8) = null
-    packageFragments('c.R': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.R': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.B': FqName@17) = null
-    packageFragments('kotlin.R': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('B': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('R': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('B': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('R': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
deleted file mode 100644
index 73e51e9faee..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
+++ /dev/null
@@ -1,253 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('R': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('Y': FqName@6) = null
-    packageFragments('bar': FqName@7) = null
-    packageFragments('d': FqName@8) = null
-    packageFragments('d.A': FqName@9) = null
-    packageFragments('d.B': FqName@10) = null
-    packageFragments('d.M': FqName@11) = null
-    packageFragments('d.R': FqName@12) = null
-    packageFragments('d.T': FqName@13) = null
-    packageFragments('d.Y': FqName@14) = null
-    packageFragments('d.bar': FqName@15) = null
-    packageFragments('d.r': FqName@16) = null
-    packageFragments('d.y': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.B': FqName@22) = null
-    packageFragments('java.lang.R': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('java.lang.Y': FqName@25) = null
-    packageFragments('java.lang.bar': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.R': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.Y': FqName@31) = null
-    packageFragments('kotlin.bar': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('B': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('R': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('T': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Y': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('bar': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('B': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('R': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('T': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Y': Name@49) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('bar': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@56 }
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-    <name not found> = EmptyList@39[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
deleted file mode 100644
index e1d11378bd4..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
+++ /dev/null
@@ -1,299 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('M': FqName@4) = null
-    packageFragments('P': FqName@5) = null
-    packageFragments('a': FqName@6) = null
-    packageFragments('a.A': FqName@7) = null
-    packageFragments('a.B': FqName@8) = null
-    packageFragments('a.M': FqName@9) = null
-    packageFragments('a.N': FqName@10) = null
-    packageFragments('a.P': FqName@11) = null
-    packageFragments('b': FqName@12) = null
-    packageFragments('b.A': FqName@13) = null
-    packageFragments('b.B': FqName@14) = null
-    packageFragments('b.M': FqName@15) = null
-    packageFragments('b.N': FqName@16) = null
-    packageFragments('b.P': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.B': FqName@22) = null
-    packageFragments('java.lang.M': FqName@23) = null
-    packageFragments('java.lang.P': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.B': FqName@26) = null
-    packageFragments('kotlin.M': FqName@27) = null
-    packageFragments('kotlin.P': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = null
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('M': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('P': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('M': Name@41) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('P': Name@42) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-    <name not found> = EmptyList@35[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
deleted file mode 100644
index eb01268c731..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt939.lazy.log
+++ /dev/null
@@ -1,269 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-    <name not found> = null
-}
-
-LazyJavaClassDescriptor@1['System'] {
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('getProperty': Name@4) = ArrayList@5[2] { JavaMethodDescriptor@6['getProperty'], JavaMethodDescriptor@7['getProperty'] } // through LazyJavaStaticClassScope@8
-    functions('getProperty': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaStaticClassScope@8
-    nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@3
-    nestedClasses('getProperty': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('getProperty': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    properties('getProperty': Name@4) = EmptyList@9[empty] // through LazyJavaStaticClassScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@13['System']
-}
-
-LazyJavaClassTypeConstructor@13['System'] {
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    memberScope = DeserializedClassMemberScope@22
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@42['String'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@44['String'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@46['String'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaPackageFragmentProvider@48 {
-    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('Int': FqName@51) = null
-    packageFragments('String': FqName@52) = null
-    packageFragments('System': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.String': FqName@59) = null
-    packageFragments('java.lang.System': FqName@60) = null
-    packageFragments('kotlin': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.String': FqName@63) = null
-    packageFragments('kotlin.System': FqName@64) = null
-    packageFragments('kotlin.io': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = null
-    packageFragments('kt939': FqName@67) = null
-    packageFragments('kt939.Int': FqName@68) = null
-    packageFragments('kt939.String': FqName@69) = null
-    packageFragments('kt939.System': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['System']) = LazyJavaClassDescriptor@1['System']
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@75) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('System': Name@77) = LazyJavaClassDescriptor@1['System'] // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
-
-null {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@166[2] { ResolutionCandidate@120, ResolutionCandidate@121 }
-    <name not found> = ArrayList@167[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
-    <name not found> = ArrayList@168[7] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@169[7] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@170[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
-    <name not found> = ArrayList@171[8] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
-    <name not found> = ArrayList@172[8] { ResolutionCandidate@143, ResolutionCandidate@144, ResolutionCandidate@145, ... }
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-    <name not found> = EmptyList@9[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
deleted file mode 100644
index f502cd9b5ff..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('foo': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.util': FqName@10) = LazyJavaPackageFragment@11['util']
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-    packageFragments('m': FqName@15) = null
-    packageFragments('r': FqName@16) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('foo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('java': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('foo': Name@24) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('java': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('util': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('util': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@11['util'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('bar': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
deleted file mode 100644
index 4640ee09a8a..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
+++ /dev/null
@@ -1,51 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('c': FqName@6) = null
-    packageFragments('c.Any': FqName@7) = null
-    packageFragments('c.B': FqName@8) = null
-    packageFragments('c.C': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.C': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.C': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
deleted file mode 100644
index f6fdc697abb..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
+++ /dev/null
@@ -1,489 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = IntValue@3
-    <name not found> = IntValue@4
-    <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@7['Int']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('A': FqName@11) = null
-    packageFragments('B': FqName@12) = null
-    packageFragments('C': FqName@13) = null
-    packageFragments('Int': FqName@14) = null
-    packageFragments('T': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.B': FqName@21) = null
-    packageFragments('java.lang.C': FqName@22) = null
-    packageFragments('java.lang.Int': FqName@23) = null
-    packageFragments('java.lang.T': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.B': FqName@27) = null
-    packageFragments('kotlin.C': FqName@28) = null
-    packageFragments('kotlin.Int': FqName@29) = null
-    packageFragments('kotlin.T': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-    packageFragments('test_visibility': FqName@33) = null
-    packageFragments('test_visibility.A': FqName@34) = null
-    packageFragments('test_visibility.B': FqName@35) = null
-    packageFragments('test_visibility.C': FqName@36) = null
-    packageFragments('test_visibility.D': FqName@37) = null
-    packageFragments('test_visibility.E': FqName@38) = null
-    packageFragments('test_visibility.F': FqName@39) = null
-    packageFragments('test_visibility.G': FqName@40) = null
-    packageFragments('test_visibility.Int': FqName@41) = null
-    packageFragments('test_visibility.ProtectedClass': FqName@42) = null
-    packageFragments('test_visibility.ProtectedTrait': FqName@43) = null
-    packageFragments('test_visibility.T': FqName@44) = null
-    packageFragments('test_visibility.Y': FqName@45) = null
-    packageFragments('test_visibility.internal_val': FqName@46) = null
-    packageFragments('test_visibility.private_val': FqName@47) = null
-    packageFragments('test_visibility.protected_val': FqName@48) = null
-    packageFragments('test_visibility2': FqName@49) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@53) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('B': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('doSmth': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('f': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('i': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('internal_fun': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('private_fun': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('B': Name@56) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('doSmth': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('f': Name@59) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('internal_fun': Name@61) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('private_fun': Name@62) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@126 }
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-null {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@159 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@126 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@135 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
deleted file mode 100644
index 1ef20c68ee6..00000000000
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
+++ /dev/null
@@ -1,2159 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaClassDescriptor@3['AbstractCollection'] {
-    defaultType = JetTypeImpl@4['AbstractCollection<1>']
-    functions('Itr': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('ListItr': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('SubList': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('add': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['add'] } // through LazyJavaClassMemberScope@7
-    functions('addAll': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['addAll'] } // through LazyJavaClassMemberScope@7
-    functions('batchRemove': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('clear': Name@17) = ArrayList@18[1] { JavaMethodDescriptor@19['clear'] } // through LazyJavaClassMemberScope@7
-    functions('clone': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('contains': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['contains'] } // through LazyJavaClassMemberScope@7
-    functions('containsAll': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['containsAll'] } // through LazyJavaClassMemberScope@7
-    functions('elementData': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('ensureCapacity': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('ensureCapacityInternal': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('equals': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@32['equals'] } // through LazyJavaClassMemberScope@7
-    functions('fastRemove': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('finalize': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('get': Name@35) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('getClass': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('grow': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('hashCode': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['hashCode'] } // through LazyJavaClassMemberScope@7
-    functions('indexOf': Name@41) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('isEmpty': Name@42) = ArrayList@43[1] { JavaMethodDescriptor@44['isEmpty'] } // through LazyJavaClassMemberScope@7
-    functions('iterator': Name@45) = ArrayList@46[1] { JavaMethodDescriptor@47['iterator'] } // through LazyJavaClassMemberScope@7
-    functions('lastIndexOf': Name@48) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('listIterator': Name@49) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('notify': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('notifyAll': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('outOfBoundsMsg': Name@52) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('rangeCheck': Name@53) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('rangeCheckForAdd': Name@54) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('readObject': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('remove': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['remove'] } // through LazyJavaClassMemberScope@7
-    functions('removeAll': Name@59) = ArrayList@60[1] { JavaMethodDescriptor@61['removeAll'] } // through LazyJavaClassMemberScope@7
-    functions('removeRange': Name@62) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('retainAll': Name@63) = ArrayList@64[1] { JavaMethodDescriptor@65['retainAll'] } // through LazyJavaClassMemberScope@7
-    functions('set': Name@66) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('size': Name@67) = ArrayList@68[1] { JavaMethodDescriptor@69['size'] } // through LazyJavaClassMemberScope@7
-    functions('subList': Name@70) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('toArray': Name@71) = ArrayList@72[2] { JavaMethodDescriptor@73['toArray'], JavaMethodDescriptor@74['toArray'] } // through LazyJavaClassMemberScope@7
-    functions('toString': Name@75) = ArrayList@76[1] { JavaMethodDescriptor@77['toString'] } // through LazyJavaClassMemberScope@7
-    functions('trimToSize': Name@78) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('wait': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    functions('writeObject': Name@80) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@81 // through LazyJavaClassMemberScope@7
-    properties('elementData': Name@82) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('modCount': Name@83) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    properties('size': Name@84) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@85['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@86['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@87['AbstractList'] {
-    defaultType = JetTypeImpl@88['AbstractList<1>']
-    functions('Itr': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('ListItr': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('SubList': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('add': Name@90) = ArrayList@91[2] { JavaMethodDescriptor@92['add'], JavaMethodDescriptor@93['add'] } // through LazyJavaClassMemberScope@89
-    functions('addAll': Name@94) = ArrayList@95[2] { JavaMethodDescriptor@96['addAll'], DeserializedSimpleFunctionDescriptor@97['addAll'] } // through LazyJavaClassMemberScope@89
-    functions('batchRemove': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('clear': Name@98) = ArrayList@99[1] { JavaMethodDescriptor@100['clear'] } // through LazyJavaClassMemberScope@89
-    functions('clone': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('contains': Name@21) = ArrayList@101[1] { DeserializedSimpleFunctionDescriptor@102['contains'] } // through LazyJavaClassMemberScope@89
-    functions('containsAll': Name@24) = ArrayList@103[1] { DeserializedSimpleFunctionDescriptor@104['containsAll'] } // through LazyJavaClassMemberScope@89
-    functions('elementData': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('ensureCapacity': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('ensureCapacityInternal': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('equals': Name@105) = ArrayList@106[1] { JavaMethodDescriptor@107['equals'] } // through LazyJavaClassMemberScope@89
-    functions('fastRemove': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('finalize': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('get': Name@108) = ArrayList@109[1] { JavaMethodDescriptor@110['get'] } // through LazyJavaClassMemberScope@89
-    functions('getClass': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('grow': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('hashCode': Name@111) = ArrayList@112[1] { JavaMethodDescriptor@113['hashCode'] } // through LazyJavaClassMemberScope@89
-    functions('indexOf': Name@114) = ArrayList@115[1] { JavaMethodDescriptor@116['indexOf'] } // through LazyJavaClassMemberScope@89
-    functions('isEmpty': Name@42) = ArrayList@117[1] { DeserializedSimpleFunctionDescriptor@118['isEmpty'] } // through LazyJavaClassMemberScope@89
-    functions('iterator': Name@119) = ArrayList@120[1] { JavaMethodDescriptor@121['iterator'] } // through LazyJavaClassMemberScope@89
-    functions('lastIndexOf': Name@122) = ArrayList@123[1] { JavaMethodDescriptor@124['lastIndexOf'] } // through LazyJavaClassMemberScope@89
-    functions('listIterator': Name@125) = ArrayList@126[2] { JavaMethodDescriptor@127['listIterator'], JavaMethodDescriptor@128['listIterator'] } // through LazyJavaClassMemberScope@89
-    functions('notify': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('notifyAll': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('outOfBoundsMsg': Name@129) = ArrayList@130[1] { JavaMethodDescriptor@131['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@89
-    functions('rangeCheck': Name@53) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('rangeCheckForAdd': Name@132) = ArrayList@133[1] { JavaMethodDescriptor@134['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@89
-    functions('readObject': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('remove': Name@135) = ArrayList@136[2] { JavaMethodDescriptor@137['remove'], DeserializedSimpleFunctionDescriptor@138['remove'] } // through LazyJavaClassMemberScope@89
-    functions('removeAll': Name@59) = ArrayList@139[1] { DeserializedSimpleFunctionDescriptor@140['removeAll'] } // through LazyJavaClassMemberScope@89
-    functions('removeRange': Name@141) = ArrayList@142[1] { JavaMethodDescriptor@143['removeRange'] } // through LazyJavaClassMemberScope@89
-    functions('retainAll': Name@63) = ArrayList@144[1] { DeserializedSimpleFunctionDescriptor@145['retainAll'] } // through LazyJavaClassMemberScope@89
-    functions('set': Name@146) = ArrayList@147[1] { JavaMethodDescriptor@148['set'] } // through LazyJavaClassMemberScope@89
-    functions('size': Name@67) = ArrayList@149[1] { DeserializedSimpleFunctionDescriptor@150['size'] } // through LazyJavaClassMemberScope@89
-    functions('subList': Name@151) = ArrayList@152[1] { JavaMethodDescriptor@153['subList'] } // through LazyJavaClassMemberScope@89
-    functions('toArray': Name@71) = ArrayList@154[2] { JavaMethodDescriptor@155['toArray'], JavaMethodDescriptor@156['toArray'] } // through LazyJavaClassMemberScope@89
-    functions('toString': Name@75) = ArrayList@157[1] { DeserializedSimpleFunctionDescriptor@158['toString'] } // through LazyJavaClassMemberScope@89
-    functions('trimToSize': Name@78) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('wait': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    functions('writeObject': Name@80) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    memberIndex = computeMemberIndex$1@159 // through LazyJavaClassMemberScope@89
-    properties('elementData': Name@82) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    properties('modCount': Name@83) = ArrayList@160[1] { JavaPropertyDescriptor@161['modCount'] } // through LazyJavaClassMemberScope@89
-    properties('size': Name@84) = EmptyList@6[empty] // through LazyJavaClassMemberScope@89
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@162['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@163['AbstractList']
-}
-
-LazyJavaClassDescriptor@164['ArrayList'] {
-    allDescriptors = ArrayList@165[46] { LazyJavaClassDescriptor@166['SubList'], LazyJavaClassDescriptor@167['ListItr'], LazyJavaClassDescriptor@168['Itr'], ... } // through LazyJavaClassMemberScope@169
-    constructors = ArrayList@170[3] { JavaConstructorDescriptor@171['<init>'], JavaConstructorDescriptor@172['<init>'], JavaConstructorDescriptor@173['<init>'] } // through LazyJavaClassMemberScope@169
-    defaultType = JetTypeImpl@174['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@175 // through LazyJavaClassMemberScope@169
-    functions('Itr': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('ListItr': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('SubList': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('add': Name@176) = ArrayList@177[2] { JavaMethodDescriptor@178['add'], JavaMethodDescriptor@179['add'] } // through LazyJavaClassMemberScope@169
-    functions('addAll': Name@180) = ArrayList@181[2] { JavaMethodDescriptor@182['addAll'], JavaMethodDescriptor@183['addAll'] } // through LazyJavaClassMemberScope@169
-    functions('batchRemove': Name@184) = ArrayList@185[1] { JavaMethodDescriptor@186['batchRemove'] } // through LazyJavaClassMemberScope@169
-    functions('clear': Name@187) = ArrayList@188[1] { JavaMethodDescriptor@189['clear'] } // through LazyJavaClassMemberScope@169
-    functions('clone': Name@190) = ArrayList@191[1] { JavaMethodDescriptor@192['clone'] } // through LazyJavaClassMemberScope@169
-    functions('contains': Name@193) = ArrayList@194[1] { JavaMethodDescriptor@195['contains'] } // through LazyJavaClassMemberScope@169
-    functions('containsAll': Name@24) = ArrayList@196[1] { DeserializedSimpleFunctionDescriptor@197['containsAll'] } // through LazyJavaClassMemberScope@169
-    functions('elementData': Name@198) = ArrayList@199[1] { JavaMethodDescriptor@200['elementData'] } // through LazyJavaClassMemberScope@169
-    functions('ensureCapacity': Name@201) = ArrayList@202[1] { JavaMethodDescriptor@203['ensureCapacity'] } // through LazyJavaClassMemberScope@169
-    functions('ensureCapacityInternal': Name@204) = ArrayList@205[1] { JavaMethodDescriptor@206['ensureCapacityInternal'] } // through LazyJavaClassMemberScope@169
-    functions('equals': Name@105) = ArrayList@207[1] { DeserializedSimpleFunctionDescriptor@208['equals'] } // through LazyJavaClassMemberScope@169
-    functions('fastRemove': Name@209) = ArrayList@210[1] { JavaMethodDescriptor@211['fastRemove'] } // through LazyJavaClassMemberScope@169
-    functions('finalize': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('get': Name@212) = ArrayList@213[1] { JavaMethodDescriptor@214['get'] } // through LazyJavaClassMemberScope@169
-    functions('getClass': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('grow': Name@215) = ArrayList@216[1] { JavaMethodDescriptor@217['grow'] } // through LazyJavaClassMemberScope@169
-    functions('hashCode': Name@111) = ArrayList@218[1] { DeserializedSimpleFunctionDescriptor@219['hashCode'] } // through LazyJavaClassMemberScope@169
-    functions('indexOf': Name@220) = ArrayList@221[1] { JavaMethodDescriptor@222['indexOf'] } // through LazyJavaClassMemberScope@169
-    functions('isEmpty': Name@223) = ArrayList@224[1] { JavaMethodDescriptor@225['isEmpty'] } // through LazyJavaClassMemberScope@169
-    functions('iterator': Name@226) = ArrayList@227[1] { JavaMethodDescriptor@228['iterator'] } // through LazyJavaClassMemberScope@169
-    functions('lastIndexOf': Name@229) = ArrayList@230[1] { JavaMethodDescriptor@231['lastIndexOf'] } // through LazyJavaClassMemberScope@169
-    functions('listIterator': Name@232) = ArrayList@233[2] { JavaMethodDescriptor@234['listIterator'], JavaMethodDescriptor@235['listIterator'] } // through LazyJavaClassMemberScope@169
-    functions('notify': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('notifyAll': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('outOfBoundsMsg': Name@236) = ArrayList@237[1] { JavaMethodDescriptor@238['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@169
-    functions('rangeCheck': Name@239) = ArrayList@240[1] { JavaMethodDescriptor@241['rangeCheck'] } // through LazyJavaClassMemberScope@169
-    functions('rangeCheckForAdd': Name@242) = ArrayList@243[1] { JavaMethodDescriptor@244['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@169
-    functions('readObject': Name@245) = ArrayList@246[1] { JavaMethodDescriptor@247['readObject'] } // through LazyJavaClassMemberScope@169
-    functions('remove': Name@248) = ArrayList@249[2] { JavaMethodDescriptor@250['remove'], JavaMethodDescriptor@251['remove'] } // through LazyJavaClassMemberScope@169
-    functions('removeAll': Name@252) = ArrayList@253[1] { JavaMethodDescriptor@254['removeAll'] } // through LazyJavaClassMemberScope@169
-    functions('removeRange': Name@255) = ArrayList@256[1] { JavaMethodDescriptor@257['removeRange'] } // through LazyJavaClassMemberScope@169
-    functions('retainAll': Name@258) = ArrayList@259[1] { JavaMethodDescriptor@260['retainAll'] } // through LazyJavaClassMemberScope@169
-    functions('set': Name@261) = ArrayList@262[1] { JavaMethodDescriptor@263['set'] } // through LazyJavaClassMemberScope@169
-    functions('size': Name@264) = ArrayList@265[1] { JavaMethodDescriptor@266['size'] } // through LazyJavaClassMemberScope@169
-    functions('subList': Name@267) = ArrayList@268[1] { JavaMethodDescriptor@269['subList'] } // through LazyJavaClassMemberScope@169
-    functions('toArray': Name@270) = ArrayList@271[2] { JavaMethodDescriptor@272['toArray'], JavaMethodDescriptor@273['toArray'] } // through LazyJavaClassMemberScope@169
-    functions('toString': Name@75) = ArrayList@274[1] { DeserializedSimpleFunctionDescriptor@275['toString'] } // through LazyJavaClassMemberScope@169
-    functions('trimToSize': Name@276) = ArrayList@277[1] { JavaMethodDescriptor@278['trimToSize'] } // through LazyJavaClassMemberScope@169
-    functions('wait': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@169
-    functions('writeObject': Name@279) = ArrayList@280[1] { JavaMethodDescriptor@281['writeObject'] } // through LazyJavaClassMemberScope@169
-    memberIndex = computeMemberIndex$1@282 // through LazyJavaClassMemberScope@169
-    nestedClassIndex = LinkedHashMap@283 // through LazyJavaClassMemberScope@169
-    nestedClasses('Itr': Name@5) = LazyJavaClassDescriptor@168['Itr'] // through LazyJavaClassMemberScope@169
-    nestedClasses('ListItr': Name@8) = LazyJavaClassDescriptor@167['ListItr'] // through LazyJavaClassMemberScope@169
-    nestedClasses('SubList': Name@9) = LazyJavaClassDescriptor@166['SubList'] // through LazyJavaClassMemberScope@169
-    properties('elementData': Name@82) = ArrayList@284[1] { JavaPropertyDescriptor@285['elementData'] } // through LazyJavaClassMemberScope@169
-    properties('modCount': Name@83) = ArrayList@286[1] { PropertyDescriptorImpl@287['modCount'] } // through LazyJavaClassMemberScope@169
-    properties('size': Name@84) = ArrayList@288[1] { JavaPropertyDescriptor@289['size'] } // through LazyJavaClassMemberScope@169
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@290['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@291['ArrayList']
-}
-
-LazyJavaClassDescriptor@292['ArrayList'] {
-    typeConstructor = LazyJavaClassTypeConstructor@293['ArrayList']
-}
-
-LazyJavaClassDescriptor@294['Arrays'] {
-    nestedClassIndex = LinkedHashMap@295 // through LazyJavaClassMemberScope@296
-    nestedClasses('ArrayList': Name@297) = LazyJavaClassDescriptor@292['ArrayList'] // through LazyJavaClassMemberScope@296
-}
-
-LazyJavaClassDescriptor@298['Integer'] {
-    typeConstructor = LazyJavaClassTypeConstructor@299['Integer']
-}
-
-LazyJavaClassDescriptor@300['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@301['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@302['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@303['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@304['RandomAccess'] {
-    defaultType = JetTypeImpl@305['RandomAccess']
-    functions('Itr': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('ListItr': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('SubList': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('add': Name@90) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('addAll': Name@94) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('batchRemove': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('clear': Name@98) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('clone': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('contains': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('containsAll': Name@24) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('elementData': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('ensureCapacity': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('ensureCapacityInternal': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('equals': Name@105) = ArrayList@307[1] { DeserializedSimpleFunctionDescriptor@308['equals'] } // through LazyJavaClassMemberScope@306
-    functions('fastRemove': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('finalize': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('get': Name@108) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('getClass': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('grow': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('hashCode': Name@111) = ArrayList@309[1] { DeserializedSimpleFunctionDescriptor@310['hashCode'] } // through LazyJavaClassMemberScope@306
-    functions('indexOf': Name@114) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('isEmpty': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('iterator': Name@119) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('lastIndexOf': Name@122) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('listIterator': Name@125) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('notify': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('notifyAll': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('outOfBoundsMsg': Name@129) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('rangeCheck': Name@53) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('rangeCheckForAdd': Name@132) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('readObject': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('remove': Name@135) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('removeAll': Name@59) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('removeRange': Name@141) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('retainAll': Name@63) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('set': Name@146) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('size': Name@67) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('subList': Name@151) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('toArray': Name@71) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('toString': Name@75) = ArrayList@311[1] { DeserializedSimpleFunctionDescriptor@312['toString'] } // through LazyJavaClassMemberScope@306
-    functions('trimToSize': Name@78) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('wait': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    functions('writeObject': Name@80) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    memberIndex = computeMemberIndex$1@313 // through LazyJavaClassMemberScope@306
-    properties('elementData': Name@82) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    properties('modCount': Name@83) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    properties('size': Name@84) = EmptyList@6[empty] // through LazyJavaClassMemberScope@306
-    typeConstructor = LazyJavaClassTypeConstructor@314['RandomAccess']
-}
-
-LazyJavaClassDescriptor@315['Serializable'] {
-    defaultType = JetTypeImpl@316['Serializable']
-    functions('Itr': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('ListItr': Name@8) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('SubList': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('add': Name@90) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('addAll': Name@94) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('batchRemove': Name@16) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('clear': Name@98) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('clone': Name@20) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('contains': Name@21) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('containsAll': Name@24) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('elementData': Name@27) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('ensureCapacity': Name@28) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('ensureCapacityInternal': Name@29) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('equals': Name@105) = ArrayList@318[1] { DeserializedSimpleFunctionDescriptor@319['equals'] } // through LazyJavaClassMemberScope@317
-    functions('fastRemove': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('finalize': Name@34) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('get': Name@108) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('getClass': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('grow': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('hashCode': Name@111) = ArrayList@320[1] { DeserializedSimpleFunctionDescriptor@321['hashCode'] } // through LazyJavaClassMemberScope@317
-    functions('indexOf': Name@114) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('isEmpty': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('iterator': Name@119) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('lastIndexOf': Name@122) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('listIterator': Name@125) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('notify': Name@50) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('notifyAll': Name@51) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('outOfBoundsMsg': Name@129) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('rangeCheck': Name@53) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('rangeCheckForAdd': Name@132) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('readObject': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('remove': Name@135) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('removeAll': Name@59) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('removeRange': Name@141) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('retainAll': Name@63) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('set': Name@146) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('size': Name@67) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('subList': Name@151) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('toArray': Name@71) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('toString': Name@75) = ArrayList@322[1] { DeserializedSimpleFunctionDescriptor@323['toString'] } // through LazyJavaClassMemberScope@317
-    functions('trimToSize': Name@78) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('wait': Name@79) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    functions('writeObject': Name@80) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    memberIndex = computeMemberIndex$1@324 // through LazyJavaClassMemberScope@317
-    properties('elementData': Name@82) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    properties('modCount': Name@83) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    properties('size': Name@84) = EmptyList@6[empty] // through LazyJavaClassMemberScope@317
-    typeConstructor = LazyJavaClassTypeConstructor@325['Serializable']
-}
-
-LazyJavaClassTypeConstructor@86['AbstractCollection'] {
-    parameters = ArrayList@326[1] { LazyJavaTypeParameterDescriptor@327['E'] }
-    supertypes = ArrayList@328[1] { LazyJavaClassifierType@329['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@163['AbstractList'] {
-    parameters = ArrayList@330[1] { LazyJavaTypeParameterDescriptor@331['E'] }
-    supertypes = ArrayList@332[2] { LazyJavaClassifierType@333['AbstractCollection<E>'], LazyJavaClassifierType@334['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@291['ArrayList'] {
-    parameters = ArrayList@335[1] { LazyJavaTypeParameterDescriptor@336['E'] }
-    supertypes = ArrayList@337[5] { LazyJavaClassifierType@338['AbstractList<E>'], LazyJavaClassifierType@339['List<E>'], LazyJavaClassifierType@340['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@293['ArrayList'] {
-    parameters = ArrayList@341[1] { LazyJavaTypeParameterDescriptor@342['E'] }
-}
-
-LazyJavaClassTypeConstructor@299['Integer'] {
-    parameters = ArrayList@343[empty]
-    supertypes = ArrayList@344[2] { LazyJavaClassifierType@345['Number'], LazyJavaClassifierType@346['Comparable<Integer>'] }
-}
-
-LazyJavaClassTypeConstructor@301['ObjectInputStream'] {
-    parameters = ArrayList@347[empty]
-}
-
-LazyJavaClassTypeConstructor@303['ObjectOutputStream'] {
-    parameters = ArrayList@348[empty]
-}
-
-LazyJavaClassTypeConstructor@314['RandomAccess'] {
-    parameters = ArrayList@349[empty]
-    supertypes = ArrayList@350[1] { JetTypeImpl@351['Any'] }
-}
-
-LazyJavaClassTypeConstructor@325['Serializable'] {
-    parameters = ArrayList@352[empty]
-    supertypes = ArrayList@353[1] { JetTypeImpl@351['Any'] }
-}
-
-LazyJavaClassifierType@333['AbstractCollection<E>'] {
-    arguments = ArrayList@354[1] { TypeProjectionImpl@355 }
-    classifier = JavaClassImpl@356['AbstractCollection']
-    memberScope = SubstitutingScope@357
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@86['AbstractCollection']
-}
-
-LazyJavaClassifierType@338['AbstractList<E>'] {
-    arguments = ArrayList@359[1] { TypeProjectionImpl@360 }
-    classifier = JavaClassImpl@361['AbstractList']
-    memberScope = SubstitutingScope@362
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@163['AbstractList']
-}
-
-LazyJavaClassifierType@363['Cloneable'] {
-    arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@365['Cloneable']
-    memberScope = DeserializedClassMemberScope@366
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@367
-}
-
-LazyJavaClassifierType@368['Collection<? extends E>'] {
-    arguments = ArrayList@369[1] { TypeProjectionImpl@370 }
-    classifier = JavaClassImpl@371['Collection']
-    memberScope = SubstitutingScope@372
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@374['Collection<? extends E>'] {
-    arguments = ArrayList@375[1] { TypeProjectionImpl@376 }
-    classifier = JavaClassImpl@377['Collection']
-    memberScope = SubstitutingScope@378
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@379['Collection<? extends E>'] {
-    arguments = ArrayList@380[1] { TypeProjectionImpl@381 }
-    classifier = JavaClassImpl@382['Collection']
-    memberScope = SubstitutingScope@383
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@384['Collection<? extends E>'] {
-    arguments = ArrayList@385[1] { TypeProjectionImpl@386 }
-    classifier = JavaClassImpl@387['Collection']
-    memberScope = SubstitutingScope@388
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@389['Collection<? extends E>'] {
-    arguments = ArrayList@390[1] { TypeProjectionImpl@391 }
-    classifier = JavaClassImpl@392['Collection']
-    memberScope = SubstitutingScope@393
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@394['Collection<? extends E>'] {
-    arguments = ArrayList@395[1] { TypeProjectionImpl@396 }
-    classifier = JavaClassImpl@377['Collection']
-    memberScope = SubstitutingScope@397
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@400['Collection<? extends E>'] {
-    arguments = ArrayList@401[1] { TypeProjectionImpl@402 }
-    classifier = JavaClassImpl@371['Collection']
-    memberScope = SubstitutingScope@403
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@404['Collection<? extends E>'] {
-    arguments = ArrayList@405[1] { TypeProjectionImpl@406 }
-    classifier = JavaClassImpl@392['Collection']
-    memberScope = SubstitutingScope@407
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@408['Collection<? extends E>'] {
-    arguments = ArrayList@409[1] { TypeProjectionImpl@410 }
-    classifier = JavaClassImpl@382['Collection']
-    memberScope = SubstitutingScope@411
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@412['Collection<? extends E>'] {
-    arguments = ArrayList@413[1] { TypeProjectionImpl@414 }
-    classifier = JavaClassImpl@387['Collection']
-    memberScope = SubstitutingScope@415
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@416['Collection<?>'] {
-    arguments = ArrayList@417[1] { LazyStarProjection@418 }
-    classifier = JavaClassImpl@419['Collection']
-    memberScope = SubstitutingScope@420
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@421['Collection<?>'] {
-    arguments = ArrayList@422[1] { LazyStarProjection@423 }
-    classifier = JavaClassImpl@424['Collection']
-    memberScope = SubstitutingScope@425
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@426['Collection<?>'] {
-    arguments = ArrayList@427[1] { LazyStarProjection@428 }
-    classifier = JavaClassImpl@429['Collection']
-    memberScope = SubstitutingScope@430
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@431['Collection<?>'] {
-    arguments = ArrayList@432[1] { LazyStarProjection@433 }
-    classifier = JavaClassImpl@434['Collection']
-    memberScope = SubstitutingScope@435
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@436['Collection<?>'] {
-    arguments = ArrayList@437[1] { LazyStarProjection@438 }
-    classifier = JavaClassImpl@439['Collection']
-    memberScope = SubstitutingScope@440
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@441['Collection<?>'] {
-    arguments = ArrayList@442[1] { LazyStarProjection@443 }
-    classifier = JavaClassImpl@444['Collection']
-    memberScope = SubstitutingScope@445
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@446['Collection<?>'] {
-    arguments = ArrayList@447[1] { LazyStarProjection@448 }
-    classifier = JavaClassImpl@444['Collection']
-    memberScope = SubstitutingScope@449
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@450['Collection<?>'] {
-    arguments = ArrayList@451[1] { LazyStarProjection@452 }
-    classifier = JavaClassImpl@424['Collection']
-    memberScope = SubstitutingScope@453
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@454['Collection<?>'] {
-    arguments = ArrayList@455[1] { LazyStarProjection@456 }
-    classifier = JavaClassImpl@429['Collection']
-    memberScope = SubstitutingScope@457
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@458['Collection<?>'] {
-    arguments = ArrayList@459[1] { LazyStarProjection@460 }
-    classifier = JavaClassImpl@419['Collection']
-    memberScope = SubstitutingScope@461
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@462['Collection<?>'] {
-    arguments = ArrayList@463[1] { LazyStarProjection@464 }
-    classifier = JavaClassImpl@434['Collection']
-    memberScope = SubstitutingScope@465
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@466['Collection<?>'] {
-    arguments = ArrayList@467[1] { LazyStarProjection@468 }
-    classifier = JavaClassImpl@439['Collection']
-    memberScope = SubstitutingScope@469
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@399
-}
-
-LazyJavaClassifierType@329['Collection<E>'] {
-    arguments = ArrayList@470[1] { TypeProjectionImpl@471 }
-    classifier = JavaClassImpl@472['Collection']
-    memberScope = SubstitutingScope@473
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@373
-}
-
-LazyJavaClassifierType@346['Comparable<Integer>'] {
-    classifier = JavaClassImpl@474['Comparable']
-    typeConstructor = DeserializedClassTypeConstructor@475
-}
-
-LazyJavaClassifierType@476['E'] {
-    arguments = ArrayList@477[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    memberScope = LazyScopeAdapter@479
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@481['E'] {
-    arguments = ArrayList@482[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@485['E'] {
-    arguments = ArrayList@486[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@488['E'] {
-    arguments = ArrayList@489[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@491['E'] {
-    arguments = ArrayList@492[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@497['E'] {
-    arguments = ArrayList@498[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@500['E'] {
-    arguments = ArrayList@501[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@503['E'] {
-    arguments = ArrayList@504[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@506['E'] {
-    arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@509['E'] {
-    arguments = ArrayList@510[empty]
-    classifier = JavaTypeParameterImpl@511['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@512['E'] {
-    arguments = ArrayList@513[empty]
-    classifier = JavaTypeParameterImpl@514['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@515['E'] {
-    arguments = ArrayList@516[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@518['E'] {
-    arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@520['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@521['E'] {
-    arguments = ArrayList@522[empty]
-    classifier = JavaTypeParameterImpl@523['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@524['E'] {
-    arguments = ArrayList@525[empty]
-    classifier = JavaTypeParameterImpl@526['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@528['E'] {
-    arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@530['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@531['E'] {
-    arguments = ArrayList@532[empty]
-    classifier = JavaTypeParameterImpl@533['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@534['E'] {
-    arguments = ArrayList@535[empty]
-    classifier = JavaTypeParameterImpl@536['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@537['E'] {
-    arguments = ArrayList@538[empty]
-    classifier = JavaTypeParameterImpl@539['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@540['E'] {
-    arguments = ArrayList@541[empty]
-    classifier = JavaTypeParameterImpl@542['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@543['E'] {
-    arguments = ArrayList@544[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@546['E'] {
-    arguments = ArrayList@547[empty]
-    classifier = JavaTypeParameterImpl@548['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@549['E'] {
-    arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@551['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@552['E'] {
-    arguments = ArrayList@553[empty]
-    classifier = JavaTypeParameterImpl@554['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@555['E'] {
-    arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@557['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@558['E'] {
-    arguments = ArrayList@559[empty]
-    classifier = JavaTypeParameterImpl@560['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@561['E'] {
-    arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@563['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@564['E'] {
-    arguments = ArrayList@565[empty]
-    classifier = JavaTypeParameterImpl@566['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@567['E'] {
-    arguments = ArrayList@568[empty]
-    classifier = JavaTypeParameterImpl@569['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@570['E'] {
-    arguments = ArrayList@571[empty]
-    classifier = JavaTypeParameterImpl@572['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@573['E'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@575['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@576['E'] {
-    arguments = ArrayList@577[empty]
-    classifier = JavaTypeParameterImpl@578['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@579['E'] {
-    arguments = ArrayList@580[empty]
-    classifier = JavaTypeParameterImpl@581['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@582['E'] {
-    arguments = ArrayList@583[empty]
-    classifier = JavaTypeParameterImpl@584['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@585['E'] {
-    arguments = ArrayList@586[empty]
-    classifier = JavaTypeParameterImpl@587['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@588['E'] {
-    arguments = ArrayList@589[empty]
-    classifier = JavaTypeParameterImpl@590['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@591['E'] {
-    arguments = ArrayList@592[empty]
-    classifier = JavaTypeParameterImpl@593['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@594['E'] {
-    arguments = ArrayList@595[empty]
-    classifier = JavaTypeParameterImpl@596['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@597['E'] {
-    arguments = ArrayList@598[empty]
-    classifier = JavaTypeParameterImpl@599['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@600['E'] {
-    arguments = ArrayList@601[empty]
-    classifier = JavaTypeParameterImpl@602['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@603['E'] {
-    arguments = ArrayList@604[empty]
-    classifier = JavaTypeParameterImpl@605['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@606['E'] {
-    arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@608['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@609['E'] {
-    arguments = ArrayList@610[empty]
-    classifier = JavaTypeParameterImpl@611['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@612['E'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@614['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@615['E'] {
-    arguments = ArrayList@616[empty]
-    classifier = JavaTypeParameterImpl@617['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@618['E'] {
-    arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@620['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@621['E'] {
-    arguments = ArrayList@622[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@623['E'] {
-    arguments = ArrayList@624[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@625['E'] {
-    arguments = ArrayList@626[empty]
-    classifier = JavaTypeParameterImpl@548['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@627['E'] {
-    arguments = ArrayList@628[empty]
-    classifier = JavaTypeParameterImpl@530['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@629['E'] {
-    arguments = ArrayList@630[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@631['E'] {
-    arguments = ArrayList@632[empty]
-    classifier = JavaTypeParameterImpl@575['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@633['E'] {
-    arguments = ArrayList@634[empty]
-    classifier = JavaTypeParameterImpl@563['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@635['E'] {
-    arguments = ArrayList@636[empty]
-    classifier = JavaTypeParameterImpl@566['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@637['E'] {
-    arguments = ArrayList@638[empty]
-    classifier = JavaTypeParameterImpl@520['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@639['E'] {
-    arguments = ArrayList@640[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@641['E'] {
-    arguments = ArrayList@642[empty]
-    classifier = JavaTypeParameterImpl@596['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@643['E'] {
-    arguments = ArrayList@644[empty]
-    classifier = JavaTypeParameterImpl@581['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@645['E'] {
-    arguments = ArrayList@646[empty]
-    classifier = JavaTypeParameterImpl@511['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@647['E'] {
-    arguments = ArrayList@648[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@649['E'] {
-    arguments = ArrayList@650[empty]
-    classifier = JavaTypeParameterImpl@599['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@651['E'] {
-    arguments = ArrayList@652[empty]
-    classifier = JavaTypeParameterImpl@602['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@653['E'] {
-    arguments = ArrayList@654[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@655['E'] {
-    arguments = ArrayList@656[empty]
-    classifier = JavaTypeParameterImpl@551['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@657['E'] {
-    arguments = ArrayList@658[empty]
-    classifier = JavaTypeParameterImpl@514['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@659['E'] {
-    arguments = ArrayList@660[empty]
-    classifier = JavaTypeParameterImpl@539['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@661['E'] {
-    arguments = ArrayList@662[empty]
-    classifier = JavaTypeParameterImpl@578['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@663['E'] {
-    arguments = ArrayList@664[empty]
-    classifier = JavaTypeParameterImpl@590['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@665['E'] {
-    arguments = ArrayList@666[empty]
-    classifier = JavaTypeParameterImpl@557['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@667['E'] {
-    arguments = ArrayList@668[empty]
-    classifier = JavaTypeParameterImpl@523['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@669['E'] {
-    arguments = ArrayList@670[empty]
-    classifier = JavaTypeParameterImpl@584['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@671['E'] {
-    arguments = ArrayList@672[empty]
-    classifier = JavaTypeParameterImpl@572['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@673['E'] {
-    arguments = ArrayList@674[empty]
-    classifier = JavaTypeParameterImpl@533['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@675['E'] {
-    arguments = ArrayList@676[empty]
-    classifier = JavaTypeParameterImpl@569['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@677['E'] {
-    arguments = ArrayList@678[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@679['E'] {
-    arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@681['E'] {
-    arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@593['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@683['E'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@526['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@685['E'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@687['E'] {
-    arguments = ArrayList@688[empty]
-    classifier = JavaTypeParameterImpl@587['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@689['E'] {
-    arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@536['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@691['E'] {
-    arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@542['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@693['E'] {
-    arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@617['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@695['E'] {
-    arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@611['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@697['E'] {
-    arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@554['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@699['E'] {
-    arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@608['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@701['E'] {
-    arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@605['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@703['E'] {
-    arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@483['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@705['E'] {
-    arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@560['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@707['E'] {
-    arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@709['E'] {
-    arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@614['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@711['E'] {
-    arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-}
-
-LazyJavaClassifierType@713['E'] {
-    arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@620['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-}
-
-LazyJavaClassifierType@715['Iterator<E>'] {
-    arguments = ArrayList@716[1] { TypeProjectionImpl@717 }
-    classifier = JavaClassImpl@718['Iterator']
-    memberScope = SubstitutingScope@719
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@720
-}
-
-LazyJavaClassifierType@721['Iterator<E>'] {
-    arguments = ArrayList@722[1] { TypeProjectionImpl@723 }
-    classifier = JavaClassImpl@724['Iterator']
-    memberScope = SubstitutingScope@725
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@720
-}
-
-LazyJavaClassifierType@726['Iterator<E>'] {
-    arguments = ArrayList@727[1] { TypeProjectionImpl@728 }
-    classifier = JavaClassImpl@729['Iterator']
-    memberScope = SubstitutingScope@730
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@720
-}
-
-LazyJavaClassifierType@731['Iterator<E>'] {
-    arguments = ArrayList@732[1] { TypeProjectionImpl@733 }
-    classifier = JavaClassImpl@724['Iterator']
-    memberScope = SubstitutingScope@734
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@735
-}
-
-LazyJavaClassifierType@736['Iterator<E>'] {
-    arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
-    classifier = JavaClassImpl@718['Iterator']
-    memberScope = SubstitutingScope@739
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@735
-}
-
-LazyJavaClassifierType@740['Iterator<E>'] {
-    arguments = ArrayList@741[1] { TypeProjectionImpl@742 }
-    classifier = JavaClassImpl@729['Iterator']
-    memberScope = SubstitutingScope@743
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@735
-}
-
-LazyJavaClassifierType@339['List<E>'] {
-    arguments = ArrayList@744[1] { TypeProjectionImpl@745 }
-    classifier = JavaClassImpl@746['List']
-    memberScope = SubstitutingScope@747
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@334['List<E>'] {
-    arguments = ArrayList@749[1] { TypeProjectionImpl@750 }
-    classifier = JavaClassImpl@751['List']
-    memberScope = SubstitutingScope@752
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@753['List<E>'] {
-    arguments = ArrayList@754[1] { TypeProjectionImpl@755 }
-    classifier = JavaClassImpl@756['List']
-    memberScope = SubstitutingScope@757
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@758['List<E>'] {
-    arguments = ArrayList@759[1] { TypeProjectionImpl@760 }
-    classifier = JavaClassImpl@761['List']
-    memberScope = SubstitutingScope@762
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@763['List<E>'] {
-    arguments = ArrayList@764[1] { TypeProjectionImpl@765 }
-    classifier = JavaClassImpl@756['List']
-    memberScope = SubstitutingScope@766
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@767
-}
-
-LazyJavaClassifierType@768['List<E>'] {
-    arguments = ArrayList@769[1] { TypeProjectionImpl@770 }
-    classifier = JavaClassImpl@761['List']
-    memberScope = SubstitutingScope@771
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@767
-}
-
-LazyJavaClassifierType@772['ListIterator<E>'] {
-    arguments = ArrayList@773[1] { TypeProjectionImpl@774 }
-    classifier = JavaClassImpl@775['ListIterator']
-    memberScope = SubstitutingScope@776
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@777
-}
-
-LazyJavaClassifierType@778['ListIterator<E>'] {
-    arguments = ArrayList@779[1] { TypeProjectionImpl@780 }
-    classifier = JavaClassImpl@781['ListIterator']
-    memberScope = SubstitutingScope@782
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@777
-}
-
-LazyJavaClassifierType@783['ListIterator<E>'] {
-    arguments = ArrayList@784[1] { TypeProjectionImpl@785 }
-    classifier = JavaClassImpl@786['ListIterator']
-    memberScope = SubstitutingScope@787
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@777
-}
-
-LazyJavaClassifierType@788['ListIterator<E>'] {
-    arguments = ArrayList@789[1] { TypeProjectionImpl@790 }
-    classifier = JavaClassImpl@791['ListIterator']
-    memberScope = SubstitutingScope@792
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@777
-}
-
-LazyJavaClassifierType@793['ListIterator<E>'] {
-    arguments = ArrayList@794[1] { TypeProjectionImpl@795 }
-    classifier = JavaClassImpl@775['ListIterator']
-    memberScope = SubstitutingScope@796
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@798['ListIterator<E>'] {
-    arguments = ArrayList@799[1] { TypeProjectionImpl@800 }
-    classifier = JavaClassImpl@791['ListIterator']
-    memberScope = SubstitutingScope@801
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@802['ListIterator<E>'] {
-    arguments = ArrayList@803[1] { TypeProjectionImpl@804 }
-    classifier = JavaClassImpl@786['ListIterator']
-    memberScope = SubstitutingScope@805
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@806['ListIterator<E>'] {
-    arguments = ArrayList@807[1] { TypeProjectionImpl@808 }
-    classifier = JavaClassImpl@781['ListIterator']
-    memberScope = SubstitutingScope@809
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@797
-}
-
-LazyJavaClassifierType@345['Number'] {
-    arguments = ArrayList@810[empty]
-    classifier = JavaClassImpl@811['Number']
-    typeConstructor = DeserializedClassTypeConstructor@812
-}
-
-LazyJavaClassifierType@813['Object'] {
-    arguments = ArrayList@814[empty]
-    classifier = JavaClassImpl@815['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@818['Object'] {
-    arguments = ArrayList@819[empty]
-    classifier = JavaClassImpl@820['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@821['Object'] {
-    arguments = ArrayList@822[empty]
-    classifier = JavaClassImpl@823['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@824['Object'] {
-    arguments = ArrayList@825[empty]
-    classifier = JavaClassImpl@826['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@827['Object'] {
-    arguments = ArrayList@828[empty]
-    classifier = JavaClassImpl@829['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@830['Object'] {
-    arguments = ArrayList@831[empty]
-    classifier = JavaClassImpl@832['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@833['Object'] {
-    arguments = ArrayList@834[empty]
-    classifier = JavaClassImpl@835['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@836['Object'] {
-    arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@838['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@839['Object'] {
-    arguments = ArrayList@840[empty]
-    classifier = JavaClassImpl@841['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@842['Object'] {
-    arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@844['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@845['Object'] {
-    arguments = ArrayList@846[empty]
-    classifier = JavaClassImpl@847['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@848['Object'] {
-    arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@850['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@851['Object'] {
-    arguments = ArrayList@852[empty]
-    classifier = JavaClassImpl@853['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@854['Object'] {
-    arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@835['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@856['Object'] {
-    arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@838['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@858['Object'] {
-    arguments = ArrayList@859[empty]
-    classifier = JavaClassImpl@850['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@860['Object'] {
-    arguments = ArrayList@861[empty]
-    classifier = JavaClassImpl@823['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@862['Object'] {
-    arguments = ArrayList@863[empty]
-    classifier = JavaClassImpl@820['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@864['Object'] {
-    arguments = ArrayList@865[empty]
-    classifier = JavaClassImpl@853['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@866['Object'] {
-    arguments = ArrayList@867[empty]
-    classifier = JavaClassImpl@847['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@868['Object'] {
-    arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@841['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@870['Object'] {
-    arguments = ArrayList@871[empty]
-    classifier = JavaClassImpl@832['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@872['Object'] {
-    arguments = ArrayList@873[empty]
-    classifier = JavaClassImpl@844['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@874['Object'] {
-    arguments = ArrayList@875[empty]
-    classifier = JavaClassImpl@815['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@876['Object'] {
-    arguments = ArrayList@877[empty]
-    classifier = JavaClassImpl@826['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@878['Object'] {
-    arguments = ArrayList@879[empty]
-    classifier = JavaClassImpl@829['Object']
-    memberScope = DeserializedClassMemberScope@816
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@880['Object'] {
-    classifier = JavaClassImpl@881['Object']
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@882['Object'] {
-    classifier = JavaClassImpl@883['Object']
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@884['Object'] {
-    classifier = JavaClassImpl@885['Object']
-    typeConstructor = DeserializedClassTypeConstructor@817
-}
-
-LazyJavaClassifierType@886['ObjectInputStream'] {
-    arguments = ArrayList@887[empty]
-    classifier = JavaClassImpl@888['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@889
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@301['ObjectInputStream']
-}
-
-LazyJavaClassifierType@890['ObjectInputStream'] {
-    arguments = ArrayList@891[empty]
-    classifier = JavaClassImpl@888['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@889
-    nullable = 'true': Boolean@398
-    typeConstructor = LazyJavaClassTypeConstructor@301['ObjectInputStream']
-}
-
-LazyJavaClassifierType@892['ObjectOutputStream'] {
-    arguments = ArrayList@893[empty]
-    classifier = JavaClassImpl@894['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@895
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@303['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@896['ObjectOutputStream'] {
-    arguments = ArrayList@897[empty]
-    classifier = JavaClassImpl@894['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@895
-    nullable = 'true': Boolean@398
-    typeConstructor = LazyJavaClassTypeConstructor@303['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@340['RandomAccess'] {
-    arguments = ArrayList@898[empty]
-    classifier = JavaClassImpl@899['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@306
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@314['RandomAccess']
-}
-
-LazyJavaClassifierType@900['Serializable'] {
-    arguments = ArrayList@901[empty]
-    classifier = JavaClassImpl@902['Serializable']
-    memberScope = LazyJavaClassMemberScope@317
-    nullable = 'false': Boolean@358
-    typeConstructor = LazyJavaClassTypeConstructor@325['Serializable']
-}
-
-LazyJavaClassifierType@903['String'] {
-    arguments = ArrayList@904[empty]
-    classifier = JavaClassImpl@905['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@908['String'] {
-    arguments = ArrayList@909[empty]
-    classifier = JavaClassImpl@910['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@911['String'] {
-    arguments = ArrayList@912[empty]
-    classifier = JavaClassImpl@913['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@914['String'] {
-    arguments = ArrayList@915[empty]
-    classifier = JavaClassImpl@905['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@916['String'] {
-    arguments = ArrayList@917[empty]
-    classifier = JavaClassImpl@913['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@918['String'] {
-    arguments = ArrayList@919[empty]
-    classifier = JavaClassImpl@910['String']
-    memberScope = DeserializedClassMemberScope@906
-    nullable = 'true': Boolean@398
-    typeConstructor = DeserializedClassTypeConstructor@907
-}
-
-LazyJavaClassifierType@920['T'] {
-    arguments = ArrayList@921[empty]
-    classifier = JavaTypeParameterImpl@922['T']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
-}
-
-LazyJavaClassifierType@924['T'] {
-    arguments = ArrayList@925[empty]
-    classifier = JavaTypeParameterImpl@926['T']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
-}
-
-LazyJavaClassifierType@927['T'] {
-    arguments = ArrayList@928[empty]
-    classifier = JavaTypeParameterImpl@929['T']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
-}
-
-LazyJavaClassifierType@931['T'] {
-    arguments = ArrayList@932[empty]
-    classifier = JavaTypeParameterImpl@933['T']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
-}
-
-LazyJavaClassifierType@934['T'] {
-    arguments = ArrayList@935[empty]
-    classifier = JavaTypeParameterImpl@926['T']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
-}
-
-LazyJavaClassifierType@936['T'] {
-    arguments = ArrayList@937[empty]
-    classifier = JavaTypeParameterImpl@922['T']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
-}
-
-LazyJavaClassifierType@938['T'] {
-    arguments = ArrayList@939[empty]
-    classifier = JavaTypeParameterImpl@933['T']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
-}
-
-LazyJavaClassifierType@940['T'] {
-    arguments = ArrayList@941[empty]
-    classifier = JavaTypeParameterImpl@929['T']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
-}
-
-LazyJavaPackageFragmentProvider@942 {
-    packageFragments('<root>': FqName@943) = LazyJavaPackageFragment@944['<root>']
-    packageFragments('A': FqName@945) = null
-    packageFragments('Int': FqName@946) = null
-    packageFragments('Integer': FqName@947) = null
-    packageFragments('a': FqName@948) = null
-    packageFragments('a.A': FqName@949) = null
-    packageFragments('a.PO': FqName@950) = null
-    packageFragments('a.foo': FqName@951) = null
-    packageFragments('a.makeA': FqName@952) = null
-    packageFragments('b': FqName@953) = null
-    packageFragments('b.A': FqName@954) = null
-    packageFragments('b.B': FqName@955) = null
-    packageFragments('b.Int': FqName@956) = null
-    packageFragments('b.Integer': FqName@957) = null
-    packageFragments('b.NewClass': FqName@958) = null
-    packageFragments('b.Q': FqName@959) = null
-    packageFragments('b.java': FqName@960) = null
-    packageFragments('java': FqName@961) = LazyJavaPackageFragment@962['java']
-    packageFragments('java.io': FqName@963) = LazyJavaPackageFragment@964['io']
-    packageFragments('java.lang': FqName@965) = LazyJavaPackageFragment@966['lang']
-    packageFragments('java.lang.A': FqName@967) = null
-    packageFragments('java.lang.Int': FqName@968) = null
-    packageFragments('java.lang.Integer': FqName@969) = null
-    packageFragments('java.util': FqName@970) = LazyJavaPackageFragment@971['util']
-    packageFragments('java.util.ArrayList': FqName@972) = null
-    packageFragments('java.util.Arrays': FqName@973) = null
-    packageFragments('kotlin': FqName@974) = null
-    packageFragments('kotlin.A': FqName@975) = null
-    packageFragments('kotlin.Int': FqName@976) = null
-    packageFragments('kotlin.Integer': FqName@977) = null
-    packageFragments('kotlin.io': FqName@978) = null
-    packageFragments('kotlin.jvm': FqName@979) = null
-    topLevelClasses(JavaClassImpl@356['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@361['AbstractList']) = LazyJavaClassDescriptor@87['AbstractList']
-    topLevelClasses(JavaClassImpl@980['ArrayList']) = LazyJavaClassDescriptor@164['ArrayList']
-    topLevelClasses(JavaClassImpl@981['Arrays']) = LazyJavaClassDescriptor@294['Arrays']
-    topLevelClasses(JavaClassImpl@982['Integer']) = LazyJavaClassDescriptor@298['Integer']
-    topLevelClasses(JavaClassImpl@888['ObjectInputStream']) = LazyJavaClassDescriptor@300['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@894['ObjectOutputStream']) = LazyJavaClassDescriptor@302['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@899['RandomAccess']) = LazyJavaClassDescriptor@304['RandomAccess']
-    topLevelClasses(JavaClassImpl@902['Serializable']) = LazyJavaClassDescriptor@315['Serializable']
-}
-
-LazyJavaPackageFragment@962['java'] {
-    classes('lang': Name@983) = null // through LazyPackageFragmentScopeForJavaPackage@984
-    classes('util': Name@985) = null // through LazyPackageFragmentScopeForJavaPackage@984
-    deserializedPackageScope = Empty@986 // through LazyPackageFragmentScopeForJavaPackage@984
-    functions('lang': Name@987) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@984
-    memberIndex = computeMemberIndex$1@988 // through LazyPackageFragmentScopeForJavaPackage@984
-}
-
-LazyJavaPackageFragment@966['lang'] {
-    classes('A': Name@989) = null // through LazyPackageFragmentScopeForJavaPackage@990
-    classes('Integer': Name@991) = LazyJavaClassDescriptor@298['Integer'] // through LazyPackageFragmentScopeForJavaPackage@990
-    classes('bar': Name@992) = null // through LazyPackageFragmentScopeForJavaPackage@990
-    classes('foo': Name@993) = null // through LazyPackageFragmentScopeForJavaPackage@990
-    classes('java': Name@994) = null // through LazyPackageFragmentScopeForJavaPackage@990
-    classes('makeA': Name@995) = null // through LazyPackageFragmentScopeForJavaPackage@990
-    deserializedPackageScope = Empty@986 // through LazyPackageFragmentScopeForJavaPackage@990
-    functions('A': Name@989) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@990
-    functions('bar': Name@992) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@990
-    functions('foo': Name@993) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@990
-    functions('makeA': Name@995) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@990
-    memberIndex = computeMemberIndex$1@996 // through LazyPackageFragmentScopeForJavaPackage@990
-}
-
-LazyJavaPackageFragment@971['util'] {
-    classes('ArrayList': Name@997) = LazyJavaClassDescriptor@164['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@998
-    classes('Arrays': Name@999) = LazyJavaClassDescriptor@294['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@998
-}
-
-LazyJavaTypeParameterDescriptor@327['E'] {
-    defaultType = JetTypeImpl@1000['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@527
-    upperBounds = LinkedHashSet@1001[1] { NullableType@1002 }
-    upperBoundsAsType = NullableType@1002
-}
-
-LazyJavaTypeParameterDescriptor@336['E'] {
-    defaultType = JetTypeImpl@1003['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@484
-    upperBounds = LinkedHashSet@1004[1] { NullableType@1005 }
-    upperBoundsAsType = NullableType@1005
-}
-
-LazyJavaTypeParameterDescriptor@331['E'] {
-    defaultType = JetTypeImpl@1006['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-    upperBounds = LinkedHashSet@1007[1] { NullableType@1008 }
-    upperBoundsAsType = NullableType@1008
-}
-
-LazyJavaTypeParameterDescriptor@342['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1009
-    upperBounds = LinkedHashSet@1010[1] { NullableType@1011 }
-}
-
-LazyJavaTypeParameterDescriptor@1012['T'] {
-    defaultType = JetTypeImpl@1013['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
-    upperBounds = LinkedHashSet@1014[1] { NullableType@1015 }
-    upperBoundsAsType = NullableType@1015
-}
-
-LazyJavaTypeParameterDescriptor@1016['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
-    upperBounds = LinkedHashSet@1017[1] { NullableType@1018 }
-    upperBoundsAsType = NullableType@1018
-}
-
-LazyJavaTypeParameterResolver@1019 {
-    resolve(JavaTypeParameterImpl@1020['E']) = LazyJavaTypeParameterDescriptor@327['E']
-}
-
-LazyJavaTypeParameterResolver@1021 {
-    resolve(JavaTypeParameterImpl@1022['E']) = LazyJavaTypeParameterDescriptor@331['E']
-}
-
-LazyJavaTypeParameterResolver@1023 {
-    resolve(JavaTypeParameterImpl@1024['E']) = LazyJavaTypeParameterDescriptor@342['E']
-}
-
-LazyJavaTypeParameterResolver@1025 {
-    resolve(JavaTypeParameterImpl@1026['E']) = LazyJavaTypeParameterDescriptor@336['E']
-}
-
-LazyJavaTypeParameterResolver@1027 {
-    resolve(JavaTypeParameterImpl@599['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1028 {
-    resolve(JavaTypeParameterImpl@511['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1029 {
-    resolve(JavaTypeParameterImpl@581['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1030 {
-    resolve(JavaTypeParameterImpl@620['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1031 {
-    resolve(JavaTypeParameterImpl@514['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1032 {
-    resolve(JavaTypeParameterImpl@505['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1033 {
-    resolve(JavaTypeParameterImpl@587['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1034 {
-    resolve(JavaTypeParameterImpl@520['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1035 {
-    resolve(JavaTypeParameterImpl@617['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1036 {
-    resolve(JavaTypeParameterImpl@593['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1037 {
-    resolve(JavaTypeParameterImpl@545['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1038 {
-    resolve(JavaTypeParameterImpl@569['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1039 {
-    resolve(JavaTypeParameterImpl@614['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1040 {
-    resolve(JavaTypeParameterImpl@551['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1041 {
-    resolve(JavaTypeParameterImpl@539['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1042 {
-    resolve(JavaTypeParameterImpl@605['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1043 {
-    resolve(JavaTypeParameterImpl@490['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1044 {
-    resolve(JavaTypeParameterImpl@554['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1045 {
-    resolve(JavaTypeParameterImpl@487['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1046 {
-    resolve(JavaTypeParameterImpl@563['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1047 {
-    resolve(JavaTypeParameterImpl@578['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1048 {
-    resolve(JavaTypeParameterImpl@502['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1049 {
-    resolve(JavaTypeParameterImpl@526['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1050 {
-    resolve(JavaTypeParameterImpl@530['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1051 {
-    resolve(JavaTypeParameterImpl@560['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1052 {
-    resolve(JavaTypeParameterImpl@1053['T']) = LazyJavaTypeParameterDescriptor@1012['T']
-}
-
-LazyJavaTypeParameterResolver@1054 {
-    resolve(JavaTypeParameterImpl@1055['T']) = LazyJavaTypeParameterDescriptor@1016['T']
-}
-
-ResolutionTaskHolder@1056 {
-    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1059 {
-    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1062 {
-    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1065 {
-    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1068 {
-    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1071 {
-    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1074 {
-    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1077 {
-    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
-
-ResolutionTaskHolder@1080 {
-    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
-}
-
-ResolutionTaskHolder@1083 {
-    <name not found> = ArrayList@1084[3] { ResolutionCandidate@1085, ResolutionCandidate@1086, ResolutionCandidate@1087 }
-}
-
-null {
-    <name not found> = ArrayList@1088[1] { ResolutionCandidate@1073 }
-    <name not found> = ArrayList@1089[1] { ResolutionCandidate@1079 }
-    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1076 }
-    <name not found> = ArrayList@1091[1] { ResolutionCandidate@1082 }
-    <name not found> = ArrayList@1092[1] { ResolutionCandidate@1058 }
-    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1064 }
-    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1067 }
-    <name not found> = ArrayList@1095[1] { ResolutionCandidate@1070 }
-    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1061 }
-    <name not found> = ArrayList@1097[3] { ResolutionCandidate@1085, ResolutionCandidate@1086, ResolutionCandidate@1087 }
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-    <name not found> = EmptyList@6[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log b/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
deleted file mode 100644
index 687065e829e..00000000000
--- a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
+++ /dev/null
@@ -1,132 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('AccessForwardDeclarationInScript': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.y': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.io': FqName@10) = null
-    packageFragments('kotlin.jvm': FqName@11) = null
-    packageFragments('kotlin.y': FqName@12) = null
-    packageFragments('y': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('y': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('y': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log b/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
deleted file mode 100644
index 109f0f003f7..00000000000
--- a/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('ComplexScript': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/script/SimpleScript.lazy.log b/compiler/testData/diagnostics/tests/script/SimpleScript.lazy.log
deleted file mode 100644
index 6f822d28405..00000000000
--- a/compiler/testData/diagnostics/tests/script/SimpleScript.lazy.log
+++ /dev/null
@@ -1,16 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('SimpleScript': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
-}
diff --git a/compiler/testData/diagnostics/tests/script/imports.lazy.log b/compiler/testData/diagnostics/tests/script/imports.lazy.log
deleted file mode 100644
index ad9fe3e8020..00000000000
--- a/compiler/testData/diagnostics/tests/script/imports.lazy.log
+++ /dev/null
@@ -1,61 +0,0 @@
-LazyJavaClassDescriptor@0['ArrayList'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@1['ArrayList']
-}
-
-LazyJavaClassTypeConstructor@1['ArrayList'] {
-    parameters = ArrayList@2[1] { LazyJavaTypeParameterDescriptor@3['E'] }
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('ArrayList': FqName@7) = null
-    packageFragments('Imports': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.ArrayList': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.util': FqName@16) = LazyJavaPackageFragment@17['util']
-    packageFragments('java.util.ArrayList': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.ArrayList': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    topLevelClasses(JavaClassImpl@24['ArrayList']) = LazyJavaClassDescriptor@0['ArrayList']
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('ArrayList': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('java': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('java': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('util': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('util': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@17['util'] {
-    classes('ArrayList': Name@39) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('ArrayList': Name@41) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaTypeParameterDescriptor@3['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-    upperBounds = LinkedHashSet@44[1] { NullableType@45 }
-}
-
-LazyJavaTypeParameterResolver@46 {
-    resolve(JavaTypeParameterImpl@47['E']) = LazyJavaTypeParameterDescriptor@3['E']
-}
diff --git a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
deleted file mode 100644
index e66ac31fa8c..00000000000
--- a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
+++ /dev/null
@@ -1,280 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Nothing': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Nothing': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Nothing': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Nothing': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-null {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
deleted file mode 100644
index a191eabfe3d..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
+++ /dev/null
@@ -1,141 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('A': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Array': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('A': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('Array': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('A': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Array': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Array': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
deleted file mode 100644
index ef5bd35001f..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
deleted file mode 100644
index 6ebac4ba8bd..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
deleted file mode 100644
index 700c88b5357..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
+++ /dev/null
@@ -1,38 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Function0<1>']
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('f': FqName@8) = null
-    packageFragments('i': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
deleted file mode 100644
index 8520bc4ccca..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('RedefinePropertyInFor': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-ResolutionTaskHolder@19 {
-    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@21 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@24 }
-    <name not found> = ArrayList@36[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
deleted file mode 100644
index 798231e4b6a..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('RedefinePropertyInFunction': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
deleted file mode 100644
index e41632bc3f0..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
deleted file mode 100644
index ef5bd35001f..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
deleted file mode 100644
index 628b36dcc25..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
deleted file mode 100644
index 03a9d5da3be..00000000000
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
deleted file mode 100644
index 8beb9343e87..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['B']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.A': FqName@11) = null
-    packageFragments('java.lang.B': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('o': FqName@18) = null
-    packageFragments('o.A': FqName@19) = null
-    packageFragments('o.B': FqName@20) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[2] { ResolutionCandidate@47, ResolutionCandidate@48 }
-}
-
-null {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@55[2] { ResolutionCandidate@47, ResolutionCandidate@48 }
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
deleted file mode 100644
index 4516224c567..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
+++ /dev/null
@@ -1,158 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = NullValue@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('useInt': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('useInt': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('useInt': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('useInt': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
deleted file mode 100644
index 447a512b437..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Request': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('foo': FqName@5) = null
-    packageFragments('foo.Request': FqName@6) = null
-    packageFragments('foo.String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Request': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Request': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
deleted file mode 100644
index 8c3027dae75..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('aaa': FqName@4) = null
-    packageFragments('aaa.Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.io': FqName@13) = null
-    packageFragments('kotlin.jvm': FqName@14) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('bar': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-null {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@26 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
deleted file mode 100644
index ae48b9a20b3..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
+++ /dev/null
@@ -1,123 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('Nothing': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.C': FqName@9) = null
-    packageFragments('java.lang.Nothing': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.C': FqName@12) = null
-    packageFragments('kotlin.Nothing': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Nothing': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('nn': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('nn': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('nn': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('nn': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@58, ResolutionCandidate@59 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
deleted file mode 100644
index 2bb1dd384e9..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
+++ /dev/null
@@ -1,75 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
deleted file mode 100644
index 5828e931f20..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
+++ /dev/null
@@ -1,63 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('a': FqName@5) = null
-    packageFragments('a.String': FqName@6) = null
-    packageFragments('a.T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
deleted file mode 100644
index 8b7793dcb0f..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
+++ /dev/null
@@ -1,539 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('A': FqName@52) = null
-    packageFragments('Any': FqName@53) = null
-    packageFragments('B': FqName@54) = null
-    packageFragments('C': FqName@55) = null
-    packageFragments('Int': FqName@56) = null
-    packageFragments('MutableList': FqName@57) = null
-    packageFragments('String': FqName@58) = null
-    packageFragments('T': FqName@59) = null
-    packageFragments('a': FqName@60) = null
-    packageFragments('a.A': FqName@61) = null
-    packageFragments('a.Any': FqName@62) = null
-    packageFragments('a.B': FqName@63) = null
-    packageFragments('a.C': FqName@64) = null
-    packageFragments('a.Int': FqName@65) = null
-    packageFragments('a.MutableList': FqName@66) = null
-    packageFragments('a.String': FqName@67) = null
-    packageFragments('a.T': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.A': FqName@73) = null
-    packageFragments('java.lang.Any': FqName@74) = null
-    packageFragments('java.lang.B': FqName@75) = null
-    packageFragments('java.lang.C': FqName@76) = null
-    packageFragments('java.lang.Int': FqName@77) = null
-    packageFragments('java.lang.MutableList': FqName@78) = null
-    packageFragments('java.lang.String': FqName@79) = null
-    packageFragments('java.lang.T': FqName@80) = null
-    packageFragments('kotlin': FqName@81) = null
-    packageFragments('kotlin.A': FqName@82) = null
-    packageFragments('kotlin.Any': FqName@83) = null
-    packageFragments('kotlin.B': FqName@84) = null
-    packageFragments('kotlin.C': FqName@85) = null
-    packageFragments('kotlin.Int': FqName@86) = null
-    packageFragments('kotlin.MutableList': FqName@87) = null
-    packageFragments('kotlin.String': FqName@88) = null
-    packageFragments('kotlin.T': FqName@89) = null
-    packageFragments('kotlin.io': FqName@90) = null
-    packageFragments('kotlin.jvm': FqName@91) = null
-    topLevelClasses(JavaClassImpl@92['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@96) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@72['lang'] {
-    classes('Exception': Name@99) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('arrayListOf': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('equals': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('id': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('three': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('two': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('use': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('Exception': Name@99) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('arrayListOf': Name@101) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('equals': Name@102) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('foo': Name@103) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('id': Name@104) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('three': Name@105) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('two': Name@106) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('use': Name@107) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-ResolutionTaskHolder@207 {
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[4] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-null {
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@155 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@337[5] { ResolutionCandidate@278, ResolutionCandidate@279, ResolutionCandidate@280, ... }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
deleted file mode 100644
index 065879a39c6..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
+++ /dev/null
@@ -1,649 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['data']
-}
-
-LazyJavaClassDescriptor@5['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractMap']
-}
-
-LazyJavaClassDescriptor@7['Exception'] {
-    constructors = ArrayList@8[5] { JavaConstructorDescriptor@9['<init>'], JavaConstructorDescriptor@10['<init>'], JavaConstructorDescriptor@11['<init>'], ... } // through LazyJavaClassMemberScope@12
-    defaultType = JetTypeImpl@13['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@14['Exception']
-}
-
-LazyJavaClassDescriptor@15['HashMap'] {
-    constructors = ArrayList@16[4] { JavaConstructorDescriptor@17['<init>'], JavaConstructorDescriptor@18['<init>'], JavaConstructorDescriptor@19['<init>'], ... } // through LazyJavaClassMemberScope@20
-    defaultType = JetTypeImpl@21['HashMap<2>']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@22['HashMap']
-}
-
-LazyJavaClassDescriptor@23['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassTypeConstructor@6['AbstractMap'] {
-    parameters = ArrayList@25[2] { LazyJavaTypeParameterDescriptor@26['K'], LazyJavaTypeParameterDescriptor@27['V'] }
-    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Map<K, V>'] }
-}
-
-LazyJavaClassTypeConstructor@14['Exception'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@22['HashMap'] {
-    parameters = ArrayList@33[2] { LazyJavaTypeParameterDescriptor@34['K'], LazyJavaTypeParameterDescriptor@35['V'] }
-    supertypes = ArrayList@36[4] { LazyJavaClassifierType@37['AbstractMap<K, V>'], LazyJavaClassifierType@38['Map<K, V>'], LazyJavaClassifierType@39['Cloneable'], ... }
-}
-
-LazyJavaClassifierType@37['AbstractMap<K, V>'] {
-    arguments = ArrayList@40[2] { TypeProjectionImpl@41, TypeProjectionImpl@42 }
-    classifier = JavaClassImpl@43['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractMap']
-}
-
-LazyJavaClassifierType@39['Cloneable'] {
-    classifier = JavaClassImpl@44['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@45
-}
-
-LazyJavaClassifierType@46['K'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaTypeParameterImpl@48['K']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@51['K'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaTypeParameterImpl@53['K']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@58['K'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@60['K']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@61['K'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@53['K']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@64['K'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@60['K']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@66['K'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@56['K']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaClassifierType@68['K'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@48['K']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-LazyJavaClassifierType@70['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@71[2] { TypeProjectionImpl@72, TypeProjectionImpl@73 }
-    classifier = JavaClassImpl@74['Map']
-    memberScope = SubstitutingScope@75
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@77['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@78[2] { TypeProjectionImpl@79, TypeProjectionImpl@80 }
-    classifier = JavaClassImpl@74['Map']
-    memberScope = SubstitutingScope@81
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@82
-}
-
-LazyJavaClassifierType@29['Map<K, V>'] {
-    arguments = ArrayList@83[2] { TypeProjectionImpl@84, TypeProjectionImpl@85 }
-    classifier = JavaClassImpl@86['Map']
-    memberScope = SubstitutingScope@87
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@38['Map<K, V>'] {
-    classifier = JavaClassImpl@88['Map']
-    typeConstructor = DeserializedClassTypeConstructor@76
-}
-
-LazyJavaClassifierType@89['Object'] {
-    classifier = JavaClassImpl@90['Object']
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaClassifierType@92['Serializable'] {
-    classifier = JavaClassImpl@93['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
-}
-
-LazyJavaClassifierType@94['String'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['String']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@98['String'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@100['String']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@101['String'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@104['String'] {
-    arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@100['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@106['String'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@103['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@108['String'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@96['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@97
-}
-
-LazyJavaClassifierType@110['Throwable'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@112['Throwable']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@114['Throwable'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['Throwable']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@117['Throwable'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['Throwable']
-    nullable = 'false': Boolean@49
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@120['Throwable'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@112['Throwable']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@122['Throwable'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@119['Throwable']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@124['Throwable'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@116['Throwable']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@32['Throwable'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@113
-}
-
-LazyJavaClassifierType@128['V'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['V']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@132['V'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['V']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@136['V'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@138['V']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@139['V'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@141['V']
-    nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@142['V'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@134['V']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaClassifierType@144['V'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@130['V']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@146['V'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@138['V']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@148['V'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@141['V']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaPackageFragmentProvider@150 {
-    packageFragments('<root>': FqName@151) = LazyJavaPackageFragment@152['<root>']
-    packageFragments('Int': FqName@153) = null
-    packageFragments('K': FqName@154) = null
-    packageFragments('MutableList': FqName@155) = null
-    packageFragments('MutableMap': FqName@156) = null
-    packageFragments('String': FqName@157) = null
-    packageFragments('T': FqName@158) = null
-    packageFragments('Tag': FqName@159) = null
-    packageFragments('V': FqName@160) = null
-    packageFragments('a': FqName@161) = null
-    packageFragments('a.Int': FqName@162) = null
-    packageFragments('a.K': FqName@163) = null
-    packageFragments('a.MutableList': FqName@164) = null
-    packageFragments('a.MutableMap': FqName@165) = null
-    packageFragments('a.String': FqName@166) = null
-    packageFragments('a.T': FqName@167) = null
-    packageFragments('a.Tag': FqName@168) = null
-    packageFragments('a.V': FqName@169) = null
-    packageFragments('a.data': FqName@170) = null
-    packageFragments('data': FqName@171) = null
-    packageFragments('java': FqName@172) = LazyJavaPackageFragment@173['java']
-    packageFragments('java.io': FqName@174) = LazyJavaPackageFragment@175['io']
-    packageFragments('java.lang': FqName@176) = LazyJavaPackageFragment@177['lang']
-    packageFragments('java.lang.Int': FqName@178) = null
-    packageFragments('java.lang.K': FqName@179) = null
-    packageFragments('java.lang.MutableList': FqName@180) = null
-    packageFragments('java.lang.MutableMap': FqName@181) = null
-    packageFragments('java.lang.String': FqName@182) = null
-    packageFragments('java.lang.T': FqName@183) = null
-    packageFragments('java.lang.Tag': FqName@184) = null
-    packageFragments('java.lang.V': FqName@185) = null
-    packageFragments('java.lang.data': FqName@186) = null
-    packageFragments('java.util': FqName@187) = LazyJavaPackageFragment@188['util']
-    packageFragments('java.util.HashMap': FqName@189) = null
-    packageFragments('kotlin': FqName@190) = null
-    packageFragments('kotlin.Int': FqName@191) = null
-    packageFragments('kotlin.K': FqName@192) = null
-    packageFragments('kotlin.MutableList': FqName@193) = null
-    packageFragments('kotlin.MutableMap': FqName@194) = null
-    packageFragments('kotlin.String': FqName@195) = null
-    packageFragments('kotlin.T': FqName@196) = null
-    packageFragments('kotlin.Tag': FqName@197) = null
-    packageFragments('kotlin.V': FqName@198) = null
-    packageFragments('kotlin.data': FqName@199) = null
-    packageFragments('kotlin.io': FqName@200) = null
-    packageFragments('kotlin.jvm': FqName@201) = null
-    topLevelClasses(JavaClassImpl@43['AbstractMap']) = LazyJavaClassDescriptor@5['AbstractMap']
-    topLevelClasses(JavaClassImpl@202['Exception']) = LazyJavaClassDescriptor@7['Exception']
-    topLevelClasses(JavaClassImpl@203['HashMap']) = LazyJavaClassDescriptor@15['HashMap']
-    topLevelClasses(JavaClassImpl@93['Serializable']) = LazyJavaClassDescriptor@23['Serializable']
-}
-
-LazyJavaPackageFragment@173['java'] {
-    classes('lang': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    classes('util': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('lang': Name@208) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('util': Name@210) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@205
-}
-
-LazyJavaPackageFragment@177['lang'] {
-    classes('Exception': Name@212) = LazyJavaClassDescriptor@7['Exception'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('HashMap': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('arrayListOf': Name@215) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('attributes': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('equals': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('set': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('Exception': Name@212) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('HashMap': Name@214) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('arrayListOf': Name@215) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('equals': Name@217) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('set': Name@218) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@219 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-LazyJavaPackageFragment@188['util'] {
-    classes('HashMap': Name@220) = LazyJavaClassDescriptor@15['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@221
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('HashMap': Name@222) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    memberIndex = computeMemberIndex$1@223 // through LazyPackageFragmentScopeForJavaPackage@221
-}
-
-LazyJavaTypeParameterDescriptor@34['K'] {
-    defaultType = JetTypeImpl@224['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-    upperBounds = LinkedHashSet@225[1] { NullableType@226 }
-}
-
-LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-}
-
-LazyJavaTypeParameterDescriptor@35['V'] {
-    defaultType = JetTypeImpl@227['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-    upperBounds = LinkedHashSet@228[1] { NullableType@229 }
-}
-
-LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-}
-
-LazyJavaTypeParameterResolver@230 {
-    resolve(JavaTypeParameterImpl@231['K']) = LazyJavaTypeParameterDescriptor@26['K']
-    resolve(JavaTypeParameterImpl@232['V']) = LazyJavaTypeParameterDescriptor@27['V']
-}
-
-LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@234['K']) = LazyJavaTypeParameterDescriptor@34['K']
-    resolve(JavaTypeParameterImpl@235['V']) = LazyJavaTypeParameterDescriptor@35['V']
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[4] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[4] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
-
-null {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@363[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@372[4] { ResolutionCandidate@332, ResolutionCandidate@333, ResolutionCandidate@334, ... }
-    <name not found> = ArrayList@373[5] { ResolutionCandidate@337, ResolutionCandidate@338, ResolutionCandidate@339, ... }
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-    <name not found> = EmptyList@209[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
deleted file mode 100644
index 684a4c20e3a..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
+++ /dev/null
@@ -1,102 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('C': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.C': FqName@12) = null
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.T': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Any': FqName@16) = null
-    packageFragments('kotlin.C': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.T': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('C': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('C': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('C': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('f': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-null {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-    <name not found> = EmptyList@28[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
deleted file mode 100644
index 234e244e3ad..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Array': FqName@6) = null
-    packageFragments('B': FqName@7) = null
-    packageFragments('Pair': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('a': FqName@10) = null
-    packageFragments('a.A': FqName@11) = null
-    packageFragments('a.Array': FqName@12) = null
-    packageFragments('a.B': FqName@13) = null
-    packageFragments('a.Pair': FqName@14) = null
-    packageFragments('a.String': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.A': FqName@20) = null
-    packageFragments('java.lang.Array': FqName@21) = null
-    packageFragments('java.lang.B': FqName@22) = null
-    packageFragments('java.lang.Pair': FqName@23) = null
-    packageFragments('java.lang.String': FqName@24) = null
-    packageFragments('kotlin': FqName@25) = null
-    packageFragments('kotlin.A': FqName@26) = null
-    packageFragments('kotlin.Array': FqName@27) = null
-    packageFragments('kotlin.B': FqName@28) = null
-    packageFragments('kotlin.Pair': FqName@29) = null
-    packageFragments('kotlin.String': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('Pair': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('foo': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Pair': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
deleted file mode 100644
index e47e1f35f2b..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
+++ /dev/null
@@ -1,243 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Nothing']
-}
-
-LazyJavaClassDescriptor@2['Exception'] {
-    constructors = ArrayList@3[5] { JavaConstructorDescriptor@4['<init>'], JavaConstructorDescriptor@5['<init>'], JavaConstructorDescriptor@6['<init>'], ... } // through LazyJavaClassMemberScope@7
-    defaultType = JetTypeImpl@8['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@9['Exception']
-}
-
-LazyJavaClassTypeConstructor@9['Exception'] {
-    parameters = ArrayList@10[empty]
-    supertypes = ArrayList@11[1] { LazyJavaClassifierType@12['Throwable'] }
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaClassifierType@31['Throwable'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['Throwable'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@38['Throwable'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'false': Boolean@16
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@40['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@37['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@45['Throwable'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@12['Throwable'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@48['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaPackageFragmentProvider@49 {
-    packageFragments('<root>': FqName@50) = LazyJavaPackageFragment@51['<root>']
-    packageFragments('Any': FqName@52) = null
-    packageFragments('JetExpression': FqName@53) = null
-    packageFragments('PsiElement': FqName@54) = null
-    packageFragments('String': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.Any': FqName@60) = null
-    packageFragments('java.lang.JetExpression': FqName@61) = null
-    packageFragments('java.lang.PsiElement': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Any': FqName@65) = null
-    packageFragments('kotlin.JetExpression': FqName@66) = null
-    packageFragments('kotlin.PsiElement': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['Exception']) = LazyJavaClassDescriptor@2['Exception']
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('println': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('equals': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('println': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('println': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Exception': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('equals': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('println': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[4] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-null {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@130, ResolutionCandidate@131, ResolutionCandidate@132, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
deleted file mode 100644
index d8f41e37610..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
+++ /dev/null
@@ -1,60 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('T': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('java.lang.T': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.A': FqName@14) = null
-    packageFragments('kotlin.B': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
deleted file mode 100644
index 8ff8eaaada4..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
+++ /dev/null
@@ -1,335 +0,0 @@
-LazyJavaClassDescriptor@0['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@2['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@3['Class']
-}
-
-LazyJavaClassDescriptor@4['Exception'] {
-    constructors = ArrayList@5[5] { JavaConstructorDescriptor@6['<init>'], JavaConstructorDescriptor@7['<init>'], JavaConstructorDescriptor@8['<init>'], ... } // through LazyJavaClassMemberScope@9
-    defaultType = JetTypeImpl@10['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@11['Exception']
-}
-
-LazyJavaClassDescriptor@12['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@13['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@14['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassDescriptor@16['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@17['Type']
-}
-
-LazyJavaClassTypeConstructor@1['AnnotatedElement'] {
-    supertypes = ArrayList@18[1] { JetTypeImpl@19['Any'] }
-}
-
-LazyJavaClassTypeConstructor@3['Class'] {
-    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['T'] }
-    supertypes = ArrayList@22[4] { LazyJavaClassifierType@23['Serializable'], LazyJavaClassifierType@24['GenericDeclaration'], LazyJavaClassifierType@25['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@11['Exception'] {
-    parameters = ArrayList@26[empty]
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Throwable'] }
-}
-
-LazyJavaClassTypeConstructor@13['GenericDeclaration'] {
-    supertypes = ArrayList@29[1] { JetTypeImpl@19['Any'] }
-}
-
-LazyJavaClassTypeConstructor@15['Serializable'] {
-    supertypes = ArrayList@30[1] { JetTypeImpl@19['Any'] }
-}
-
-LazyJavaClassTypeConstructor@17['Type'] {
-    supertypes = ArrayList@31[1] { JetTypeImpl@19['Any'] }
-}
-
-LazyJavaClassifierType@32['AnnotatedElement'] {
-    classifier = JavaClassImpl@33['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@1['AnnotatedElement']
-}
-
-LazyJavaClassifierType@24['GenericDeclaration'] {
-    classifier = JavaClassImpl@34['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@13['GenericDeclaration']
-}
-
-LazyJavaClassifierType@35['Object'] {
-    classifier = JavaClassImpl@36['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@38['Object'] {
-    classifier = JavaClassImpl@39['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@42['Object'] {
-    classifier = JavaClassImpl@43['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@44['Object'] {
-    classifier = JavaClassImpl@45['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
-}
-
-LazyJavaClassifierType@23['Serializable'] {
-    classifier = JavaClassImpl@46['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@15['Serializable']
-}
-
-LazyJavaClassifierType@47['String'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@49['String']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@52['String'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['String']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@55['String'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@57['String']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@58['String'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaClassImpl@57['String']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@61['String'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaClassImpl@54['String']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@63['String'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaClassImpl@49['String']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@51
-}
-
-LazyJavaClassifierType@65['Throwable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['Throwable']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@69['Throwable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Throwable']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@72['Throwable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Throwable']
-    nullable = 'false': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@75['Throwable'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@67['Throwable']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@77['Throwable'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@74['Throwable']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@79['Throwable'] {
-    arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@71['Throwable']
-    nullable = 'true': Boolean@60
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@28['Throwable'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaClassImpl@82['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@68
-}
-
-LazyJavaClassifierType@25['Type'] {
-    classifier = JavaClassImpl@83['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@17['Type']
-}
-
-LazyJavaPackageFragmentProvider@84 {
-    packageFragments('<root>': FqName@85) = LazyJavaPackageFragment@86['<root>']
-    packageFragments('A': FqName@87) = null
-    packageFragments('Any': FqName@88) = null
-    packageFragments('Class': FqName@89) = null
-    packageFragments('SelfJson': FqName@90) = null
-    packageFragments('T': FqName@91) = null
-    packageFragments('java': FqName@92) = LazyJavaPackageFragment@93['java']
-    packageFragments('java.io': FqName@94) = LazyJavaPackageFragment@95['io']
-    packageFragments('java.lang': FqName@96) = LazyJavaPackageFragment@97['lang']
-    packageFragments('java.lang.A': FqName@98) = null
-    packageFragments('java.lang.Any': FqName@99) = null
-    packageFragments('java.lang.Class': FqName@100) = null
-    packageFragments('java.lang.SelfJson': FqName@101) = null
-    packageFragments('java.lang.T': FqName@102) = null
-    packageFragments('java.lang.reflect': FqName@103) = LazyJavaPackageFragment@104['reflect']
-    packageFragments('javaClass': FqName@105) = null
-    packageFragments('kotlin': FqName@106) = null
-    packageFragments('kotlin.A': FqName@107) = null
-    packageFragments('kotlin.Any': FqName@108) = null
-    packageFragments('kotlin.Class': FqName@109) = null
-    packageFragments('kotlin.SelfJson': FqName@110) = null
-    packageFragments('kotlin.T': FqName@111) = null
-    packageFragments('kotlin.io': FqName@112) = null
-    packageFragments('kotlin.jvm': FqName@113) = null
-    topLevelClasses(JavaClassImpl@33['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@114['Class']) = LazyJavaClassDescriptor@2['Class']
-    topLevelClasses(JavaClassImpl@115['Exception']) = LazyJavaClassDescriptor@4['Exception']
-    topLevelClasses(JavaClassImpl@34['GenericDeclaration']) = LazyJavaClassDescriptor@12['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@46['Serializable']) = LazyJavaClassDescriptor@14['Serializable']
-    topLevelClasses(JavaClassImpl@83['Type']) = LazyJavaClassDescriptor@16['Type']
-}
-
-LazyJavaPackageFragment@86['<root>'] {
-    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Class': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Exception': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('Exception': Name@119) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@117
-}
-
-LazyJavaPackageFragment@93['java'] {
-    classes('lang': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('lang': Name@125) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-LazyJavaPackageFragment@97['lang'] {
-    classes('Class': Name@118) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Exception': Name@119) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('Exception': Name@119) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
-}
-
-LazyJavaTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-    upperBounds = LinkedHashSet@130[1] { NullableType@131 }
-    upperBoundsAsType = NullableType@131
-}
-
-LazyJavaTypeParameterResolver@132 {
-    resolve(JavaTypeParameterImpl@133['T']) = LazyJavaTypeParameterDescriptor@21['T']
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[4] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
-
-null {
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@159[5] { ResolutionCandidate@151, ResolutionCandidate@152, ResolutionCandidate@153, ... }
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-    <name not found> = EmptyList@121[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
deleted file mode 100644
index 64e8a2fb9e4..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt6242.lazy.log
+++ /dev/null
@@ -1,111 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullValue@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['inline']
-    valueArguments(ValueParameterDescriptorImpl@5['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('String': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('inline': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.inline': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.inline': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('block': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('inline': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('block': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('block': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('block': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@62 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
deleted file mode 100644
index 02da3f9fbfe..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
+++ /dev/null
@@ -1,131 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Pair<2>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('B': FqName@6) = null
-    packageFragments('MutableList': FqName@7) = null
-    packageFragments('Pair': FqName@8) = null
-    packageFragments('Test': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.MutableList': FqName@16) = null
-    packageFragments('java.lang.Pair': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.MutableList': FqName@21) = null
-    packageFragments('kotlin.Pair': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('MutableList': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Pair': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('to': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Pair': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('to': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('Pair': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('to': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Pair': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('to': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
deleted file mode 100644
index 094381febef..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
+++ /dev/null
@@ -1,247 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Any': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Sub': FqName@52) = null
-    packageFragments('Super': FqName@53) = null
-    packageFragments('f': FqName@54) = null
-    packageFragments('f.Any': FqName@55) = null
-    packageFragments('f.String': FqName@56) = null
-    packageFragments('f.Sub': FqName@57) = null
-    packageFragments('f.Super': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Any': FqName@63) = null
-    packageFragments('java.lang.String': FqName@64) = null
-    packageFragments('java.lang.Sub': FqName@65) = null
-    packageFragments('java.lang.Super': FqName@66) = null
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.Any': FqName@68) = null
-    packageFragments('kotlin.String': FqName@69) = null
-    packageFragments('kotlin.Sub': FqName@70) = null
-    packageFragments('kotlin.Super': FqName@71) = null
-    packageFragments('kotlin.io': FqName@72) = null
-    packageFragments('kotlin.jvm': FqName@73) = null
-    topLevelClasses(JavaClassImpl@74['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@62['lang'] {
-    classes('Exception': Name@81) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('println': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Exception': Name@81) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('println': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@123 }
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = ArrayList@125[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[4] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
-
-null {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@123 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@120 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@150[2] { ResolutionCandidate@130, ResolutionCandidate@131 }
-    <name not found> = ArrayList@151[2] { ResolutionCandidate@126, ResolutionCandidate@127 }
-    <name not found> = ArrayList@152[5] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136, ... }
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-    <name not found> = EmptyList@79[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
deleted file mode 100644
index 6304d92bb9e..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
+++ /dev/null
@@ -1,336 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Boolean']
-    <name not found> = JetTypeImpl@2['Int']
-    <name not found> = NullValue@3
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Test': FqName@8) = null
-    packageFragments('bar': FqName@9) = null
-    packageFragments('bar.Int': FqName@10) = null
-    packageFragments('bar.Test': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.Test': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.Test': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('useInt': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('useInt': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@27[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-    <name not found> = EmptyList@27[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
deleted file mode 100644
index d4f6e932fce..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
+++ /dev/null
@@ -1,124 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.A': FqName@12) = null
-    packageFragments('java.lang.Any': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.Any': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[8] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@99[8] { ResolutionCandidate@82, ResolutionCandidate@83, ResolutionCandidate@84, ... }
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
deleted file mode 100644
index 0d8ee90ef6e..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
+++ /dev/null
@@ -1,233 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = IntValue@2
-    <name not found> = JetTypeImpl@3['Int']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('Int': FqName@7) = null
-    packageFragments('bar': FqName@8) = null
-    packageFragments('bar.Int': FqName@9) = null
-    packageFragments('bar.i': FqName@10) = null
-    packageFragments('foo': FqName@11) = null
-    packageFragments('foo.A': FqName@12) = null
-    packageFragments('foo.Int': FqName@13) = null
-    packageFragments('foo.bar': FqName@14) = null
-    packageFragments('foo.foo': FqName@15) = null
-    packageFragments('foo.i': FqName@16) = null
-    packageFragments('java': FqName@17) = LazyJavaPackageFragment@18['java']
-    packageFragments('java.lang': FqName@19) = LazyJavaPackageFragment@20['lang']
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@20['lang'] {
-    classes('bar': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('useInt': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('useInt': Name@37) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
deleted file mode 100644
index d3392158c40..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Any': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Any': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
deleted file mode 100644
index 5b39409ccaa..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
+++ /dev/null
@@ -1,89 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = IntValue@1
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-}
-
-ResolutionTaskHolder@48 {
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
-}
-
-null {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@50 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
deleted file mode 100644
index d3eb712072d..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
+++ /dev/null
@@ -1,325 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ExtensionFunction0<2>']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('Unit': FqName@8) = null
-    packageFragments('foo': FqName@9) = null
-    packageFragments('foo.A': FqName@10) = null
-    packageFragments('foo.Int': FqName@11) = null
-    packageFragments('foo.Unit': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Unit': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.A': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Unit': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('i': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('useFunction': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('useInt': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('useFunction': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('useInt': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@45 {
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-}
-
-null {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@106 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@76 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@47 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
deleted file mode 100644
index d2c7ca254da..00000000000
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
+++ /dev/null
@@ -1,379 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['ExtensionFunction0<2>']
-    <name not found> = JetTypeImpl@2['Int']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('C': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Unit': FqName@9) = null
-    packageFragments('foo': FqName@10) = null
-    packageFragments('foo.A': FqName@11) = null
-    packageFragments('foo.C': FqName@12) = null
-    packageFragments('foo.Int': FqName@13) = null
-    packageFragments('foo.Unit': FqName@14) = null
-    packageFragments('java': FqName@15) = LazyJavaPackageFragment@16['java']
-    packageFragments('java.lang': FqName@17) = LazyJavaPackageFragment@18['lang']
-    packageFragments('java.lang.A': FqName@19) = null
-    packageFragments('java.lang.C': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.Unit': FqName@22) = null
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.A': FqName@24) = null
-    packageFragments('kotlin.C': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.Unit': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-}
-
-LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@18['lang'] {
-    classes('c': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('useFunction': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('useInt': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('useFunction': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('useInt': Name@40) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@54 {
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@34[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
-}
-
-null {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@152 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@56 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
deleted file mode 100644
index b1b91d7f20c..00000000000
--- a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
+++ /dev/null
@@ -1,109 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Array': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('List': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Array': FqName@11) = null
-    packageFragments('java.lang.E': FqName@12) = null
-    packageFragments('java.lang.Int': FqName@13) = null
-    packageFragments('java.lang.List': FqName@14) = null
-    packageFragments('java.lang.x': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.Array': FqName@17) = null
-    packageFragments('kotlin.E': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.List': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.x': FqName@23) = null
-    packageFragments('x': FqName@24) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Array': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('List': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('toArray': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('x': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('toArray': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('x': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('toArray': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('x': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('toArray': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('x': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@51 {
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@43 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
deleted file mode 100644
index 1af884098a0..00000000000
--- a/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
+++ /dev/null
@@ -1,68 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('MyClass': FqName@4) = null
-    packageFragments('S': FqName@5) = null
-    packageFragments('T': FqName@6) = null
-    packageFragments('h': FqName@7) = null
-    packageFragments('h.Any': FqName@8) = null
-    packageFragments('h.MyClass': FqName@9) = null
-    packageFragments('h.S': FqName@10) = null
-    packageFragments('h.T': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.MyClass': FqName@17) = null
-    packageFragments('java.lang.S': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.MyClass': FqName@22) = null
-    packageFragments('kotlin.S': FqName@23) = null
-    packageFragments('kotlin.T': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@15['lang'] {
-    classes('MyClass': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('MyClass': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-    <name not found> = EmptyList@31[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
deleted file mode 100644
index 950cc633e2d..00000000000
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('List': FqName@3) = null
-    packageFragments('T': FqName@4) = null
-    packageFragments('foo': FqName@5) = null
-    packageFragments('foo.List': FqName@6) = null
-    packageFragments('foo.T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.List': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.List': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('List': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('f': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('f': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
deleted file mode 100644
index f187c221fb8..00000000000
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
+++ /dev/null
@@ -1,201 +0,0 @@
-LazyJavaClassDescriptor@0['Exception'] {
-    constructors = ArrayList@1[5] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'], JavaConstructorDescriptor@4['<init>'], ... } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@6['Exception']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@7['Exception']
-}
-
-LazyJavaClassTypeConstructor@7['Exception'] {
-    parameters = ArrayList@8[empty]
-    supertypes = ArrayList@9[1] { LazyJavaClassifierType@10['Throwable'] }
-}
-
-LazyJavaClassifierType@11['String'] {
-    arguments = ArrayList@12[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@16['String'] {
-    arguments = ArrayList@17[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@22['String'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@18['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@13['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaClassifierType@29['Throwable'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@33['Throwable'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@36['Throwable'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'false': Boolean@14
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@39['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@41['Throwable'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@35['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@43['Throwable'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@38['Throwable']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaClassifierType@10['Throwable'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@32
-}
-
-LazyJavaPackageFragmentProvider@47 {
-    packageFragments('<root>': FqName@48) = LazyJavaPackageFragment@49['<root>']
-    packageFragments('Collection': FqName@50) = null
-    packageFragments('List': FqName@51) = null
-    packageFragments('List1': FqName@52) = null
-    packageFragments('List2': FqName@53) = null
-    packageFragments('T': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Collection': FqName@59) = null
-    packageFragments('java.lang.List': FqName@60) = null
-    packageFragments('java.lang.List1': FqName@61) = null
-    packageFragments('java.lang.List2': FqName@62) = null
-    packageFragments('java.lang.T': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = null
-    packageFragments('kotlin.Collection': FqName@65) = null
-    packageFragments('kotlin.List': FqName@66) = null
-    packageFragments('kotlin.List1': FqName@67) = null
-    packageFragments('kotlin.List2': FqName@68) = null
-    packageFragments('kotlin.T': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@72['Exception']) = LazyJavaClassDescriptor@0['Exception']
-}
-
-LazyJavaPackageFragment@49['<root>'] {
-    classes('Collection': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Exception': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('List': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('List1': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('List2': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('f1': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('f1': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('List1': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('List2': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('f1': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('f1': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[4] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = ArrayList@108[4] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@113[3] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96 }
-    <name not found> = ArrayList@114[5] { ResolutionCandidate@109, ResolutionCandidate@110, ResolutionCandidate@111, ... }
-    <name not found> = ArrayList@115[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
-    <name not found> = ArrayList@116[5] { ResolutionCandidate@104, ResolutionCandidate@105, ResolutionCandidate@106, ... }
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-    <name not found> = EmptyList@81[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
deleted file mode 100644
index 53e7a395489..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/kt-1457.lazy.log
+++ /dev/null
@@ -1,1958 +0,0 @@
-LazyJavaClassDescriptor@0['AbstractCollection'] {
-    defaultType = JetTypeImpl@1['AbstractCollection<1>']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('add': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['add'] } // through LazyJavaClassMemberScope@4
-    functions('addAll': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['addAll'] } // through LazyJavaClassMemberScope@4
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clear': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['clear'] } // through LazyJavaClassMemberScope@4
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('contains': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['contains'] } // through LazyJavaClassMemberScope@4
-    functions('containsAll': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['containsAll'] } // through LazyJavaClassMemberScope@4
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('equals': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['equals'] } // through LazyJavaClassMemberScope@4
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('get': Name@32) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@35) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('indexOf': Name@38) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('isEmpty': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['isEmpty'] } // through LazyJavaClassMemberScope@4
-    functions('iterator': Name@42) = ArrayList@43[1] { JavaMethodDescriptor@44['iterator'] } // through LazyJavaClassMemberScope@4
-    functions('lastIndexOf': Name@45) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('listIterator': Name@46) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('outOfBoundsMsg': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('rangeCheckForAdd': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('remove': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['remove'] } // through LazyJavaClassMemberScope@4
-    functions('removeAll': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['removeAll'] } // through LazyJavaClassMemberScope@4
-    functions('removeRange': Name@59) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('retainAll': Name@60) = ArrayList@61[1] { JavaMethodDescriptor@62['retainAll'] } // through LazyJavaClassMemberScope@4
-    functions('set': Name@63) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('size': Name@64) = ArrayList@65[1] { JavaMethodDescriptor@66['size'] } // through LazyJavaClassMemberScope@4
-    functions('subList': Name@67) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toArray': Name@68) = ArrayList@69[2] { JavaMethodDescriptor@70['toArray'], JavaMethodDescriptor@71['toArray'] } // through LazyJavaClassMemberScope@4
-    functions('toString': Name@72) = ArrayList@73[1] { JavaMethodDescriptor@74['toString'] } // through LazyJavaClassMemberScope@4
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@78 // through LazyJavaClassMemberScope@4
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@82['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@83['AbstractCollection']
-}
-
-LazyJavaClassDescriptor@84['AbstractList'] {
-    defaultType = JetTypeImpl@85['AbstractList<1>']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('add': Name@87) = ArrayList@88[2] { JavaMethodDescriptor@89['add'], JavaMethodDescriptor@90['add'] } // through LazyJavaClassMemberScope@86
-    functions('addAll': Name@91) = ArrayList@92[2] { JavaMethodDescriptor@93['addAll'], DeserializedSimpleFunctionDescriptor@94['addAll'] } // through LazyJavaClassMemberScope@86
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('clear': Name@95) = ArrayList@96[1] { JavaMethodDescriptor@97['clear'] } // through LazyJavaClassMemberScope@86
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('contains': Name@18) = ArrayList@98[1] { DeserializedSimpleFunctionDescriptor@99['contains'] } // through LazyJavaClassMemberScope@86
-    functions('containsAll': Name@21) = ArrayList@100[1] { DeserializedSimpleFunctionDescriptor@101['containsAll'] } // through LazyJavaClassMemberScope@86
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('equals': Name@102) = ArrayList@103[1] { JavaMethodDescriptor@104['equals'] } // through LazyJavaClassMemberScope@86
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('get': Name@105) = ArrayList@106[1] { JavaMethodDescriptor@107['get'] } // through LazyJavaClassMemberScope@86
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('hashCode': Name@108) = ArrayList@109[1] { JavaMethodDescriptor@110['hashCode'] } // through LazyJavaClassMemberScope@86
-    functions('indexOf': Name@111) = ArrayList@112[1] { JavaMethodDescriptor@113['indexOf'] } // through LazyJavaClassMemberScope@86
-    functions('isEmpty': Name@39) = ArrayList@114[1] { DeserializedSimpleFunctionDescriptor@115['isEmpty'] } // through LazyJavaClassMemberScope@86
-    functions('iterator': Name@116) = ArrayList@117[1] { JavaMethodDescriptor@118['iterator'] } // through LazyJavaClassMemberScope@86
-    functions('lastIndexOf': Name@119) = ArrayList@120[1] { JavaMethodDescriptor@121['lastIndexOf'] } // through LazyJavaClassMemberScope@86
-    functions('listIterator': Name@122) = ArrayList@123[2] { JavaMethodDescriptor@124['listIterator'], JavaMethodDescriptor@125['listIterator'] } // through LazyJavaClassMemberScope@86
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('outOfBoundsMsg': Name@126) = ArrayList@127[1] { JavaMethodDescriptor@128['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@86
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('rangeCheckForAdd': Name@129) = ArrayList@130[1] { JavaMethodDescriptor@131['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@86
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('remove': Name@132) = ArrayList@133[2] { JavaMethodDescriptor@134['remove'], DeserializedSimpleFunctionDescriptor@135['remove'] } // through LazyJavaClassMemberScope@86
-    functions('removeAll': Name@56) = ArrayList@136[1] { DeserializedSimpleFunctionDescriptor@137['removeAll'] } // through LazyJavaClassMemberScope@86
-    functions('removeRange': Name@138) = ArrayList@139[1] { JavaMethodDescriptor@140['removeRange'] } // through LazyJavaClassMemberScope@86
-    functions('retainAll': Name@60) = ArrayList@141[1] { DeserializedSimpleFunctionDescriptor@142['retainAll'] } // through LazyJavaClassMemberScope@86
-    functions('set': Name@143) = ArrayList@144[1] { JavaMethodDescriptor@145['set'] } // through LazyJavaClassMemberScope@86
-    functions('size': Name@64) = ArrayList@146[1] { DeserializedSimpleFunctionDescriptor@147['size'] } // through LazyJavaClassMemberScope@86
-    functions('subList': Name@148) = ArrayList@149[1] { JavaMethodDescriptor@150['subList'] } // through LazyJavaClassMemberScope@86
-    functions('toArray': Name@68) = ArrayList@151[2] { JavaMethodDescriptor@152['toArray'], JavaMethodDescriptor@153['toArray'] } // through LazyJavaClassMemberScope@86
-    functions('toString': Name@72) = ArrayList@154[1] { DeserializedSimpleFunctionDescriptor@155['toString'] } // through LazyJavaClassMemberScope@86
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    memberIndex = computeMemberIndex$1@156 // through LazyJavaClassMemberScope@86
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    properties('modCount': Name@80) = ArrayList@157[1] { JavaPropertyDescriptor@158['modCount'] } // through LazyJavaClassMemberScope@86
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@86
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@159['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@160['AbstractList']
-}
-
-LazyJavaClassDescriptor@161['ArrayList'] {
-    allDescriptors = ArrayList@162[46] { LazyJavaClassDescriptor@163['SubList'], LazyJavaClassDescriptor@164['ListItr'], LazyJavaClassDescriptor@165['Itr'], ... } // through LazyJavaClassMemberScope@166
-    constructors = ArrayList@167[3] { JavaConstructorDescriptor@168['<init>'], JavaConstructorDescriptor@169['<init>'], JavaConstructorDescriptor@170['<init>'] } // through LazyJavaClassMemberScope@166
-    defaultType = JetTypeImpl@171['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@172 // through LazyJavaClassMemberScope@166
-    functionTypeForSamInterface = null
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('add': Name@173) = ArrayList@174[2] { JavaMethodDescriptor@175['add'], JavaMethodDescriptor@176['add'] } // through LazyJavaClassMemberScope@166
-    functions('addAll': Name@177) = ArrayList@178[2] { JavaMethodDescriptor@179['addAll'], JavaMethodDescriptor@180['addAll'] } // through LazyJavaClassMemberScope@166
-    functions('batchRemove': Name@181) = ArrayList@182[1] { JavaMethodDescriptor@183['batchRemove'] } // through LazyJavaClassMemberScope@166
-    functions('clear': Name@184) = ArrayList@185[1] { JavaMethodDescriptor@186['clear'] } // through LazyJavaClassMemberScope@166
-    functions('clone': Name@187) = ArrayList@188[1] { JavaMethodDescriptor@189['clone'] } // through LazyJavaClassMemberScope@166
-    functions('contains': Name@190) = ArrayList@191[1] { JavaMethodDescriptor@192['contains'] } // through LazyJavaClassMemberScope@166
-    functions('containsAll': Name@21) = ArrayList@193[1] { DeserializedSimpleFunctionDescriptor@194['containsAll'] } // through LazyJavaClassMemberScope@166
-    functions('elementData': Name@195) = ArrayList@196[1] { JavaMethodDescriptor@197['elementData'] } // through LazyJavaClassMemberScope@166
-    functions('ensureCapacity': Name@198) = ArrayList@199[1] { JavaMethodDescriptor@200['ensureCapacity'] } // through LazyJavaClassMemberScope@166
-    functions('ensureCapacityInternal': Name@201) = ArrayList@202[1] { JavaMethodDescriptor@203['ensureCapacityInternal'] } // through LazyJavaClassMemberScope@166
-    functions('equals': Name@102) = ArrayList@204[1] { DeserializedSimpleFunctionDescriptor@205['equals'] } // through LazyJavaClassMemberScope@166
-    functions('fastRemove': Name@206) = ArrayList@207[1] { JavaMethodDescriptor@208['fastRemove'] } // through LazyJavaClassMemberScope@166
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('get': Name@209) = ArrayList@210[1] { JavaMethodDescriptor@211['get'] } // through LazyJavaClassMemberScope@166
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('grow': Name@212) = ArrayList@213[1] { JavaMethodDescriptor@214['grow'] } // through LazyJavaClassMemberScope@166
-    functions('hashCode': Name@108) = ArrayList@215[1] { DeserializedSimpleFunctionDescriptor@216['hashCode'] } // through LazyJavaClassMemberScope@166
-    functions('indexOf': Name@217) = ArrayList@218[1] { JavaMethodDescriptor@219['indexOf'] } // through LazyJavaClassMemberScope@166
-    functions('isEmpty': Name@220) = ArrayList@221[1] { JavaMethodDescriptor@222['isEmpty'] } // through LazyJavaClassMemberScope@166
-    functions('iterator': Name@223) = ArrayList@224[1] { JavaMethodDescriptor@225['iterator'] } // through LazyJavaClassMemberScope@166
-    functions('lastIndexOf': Name@226) = ArrayList@227[1] { JavaMethodDescriptor@228['lastIndexOf'] } // through LazyJavaClassMemberScope@166
-    functions('listIterator': Name@229) = ArrayList@230[2] { JavaMethodDescriptor@231['listIterator'], JavaMethodDescriptor@232['listIterator'] } // through LazyJavaClassMemberScope@166
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('outOfBoundsMsg': Name@233) = ArrayList@234[1] { JavaMethodDescriptor@235['outOfBoundsMsg'] } // through LazyJavaClassMemberScope@166
-    functions('rangeCheck': Name@236) = ArrayList@237[1] { JavaMethodDescriptor@238['rangeCheck'] } // through LazyJavaClassMemberScope@166
-    functions('rangeCheckForAdd': Name@239) = ArrayList@240[1] { JavaMethodDescriptor@241['rangeCheckForAdd'] } // through LazyJavaClassMemberScope@166
-    functions('readObject': Name@242) = ArrayList@243[1] { JavaMethodDescriptor@244['readObject'] } // through LazyJavaClassMemberScope@166
-    functions('remove': Name@245) = ArrayList@246[2] { JavaMethodDescriptor@247['remove'], JavaMethodDescriptor@248['remove'] } // through LazyJavaClassMemberScope@166
-    functions('removeAll': Name@249) = ArrayList@250[1] { JavaMethodDescriptor@251['removeAll'] } // through LazyJavaClassMemberScope@166
-    functions('removeRange': Name@252) = ArrayList@253[1] { JavaMethodDescriptor@254['removeRange'] } // through LazyJavaClassMemberScope@166
-    functions('retainAll': Name@255) = ArrayList@256[1] { JavaMethodDescriptor@257['retainAll'] } // through LazyJavaClassMemberScope@166
-    functions('set': Name@258) = ArrayList@259[1] { JavaMethodDescriptor@260['set'] } // through LazyJavaClassMemberScope@166
-    functions('size': Name@261) = ArrayList@262[1] { JavaMethodDescriptor@263['size'] } // through LazyJavaClassMemberScope@166
-    functions('subList': Name@264) = ArrayList@265[1] { JavaMethodDescriptor@266['subList'] } // through LazyJavaClassMemberScope@166
-    functions('toArray': Name@267) = ArrayList@268[2] { JavaMethodDescriptor@269['toArray'], JavaMethodDescriptor@270['toArray'] } // through LazyJavaClassMemberScope@166
-    functions('toString': Name@72) = ArrayList@271[1] { DeserializedSimpleFunctionDescriptor@272['toString'] } // through LazyJavaClassMemberScope@166
-    functions('trimToSize': Name@273) = ArrayList@274[1] { JavaMethodDescriptor@275['trimToSize'] } // through LazyJavaClassMemberScope@166
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@166
-    functions('writeObject': Name@276) = ArrayList@277[1] { JavaMethodDescriptor@278['writeObject'] } // through LazyJavaClassMemberScope@166
-    memberIndex = computeMemberIndex$1@279 // through LazyJavaClassMemberScope@166
-    nestedClassIndex = LinkedHashMap@280 // through LazyJavaClassMemberScope@166
-    nestedClasses('Itr': Name@2) = LazyJavaClassDescriptor@165['Itr'] // through LazyJavaClassMemberScope@166
-    nestedClasses('ListItr': Name@5) = LazyJavaClassDescriptor@164['ListItr'] // through LazyJavaClassMemberScope@166
-    nestedClasses('SubList': Name@6) = LazyJavaClassDescriptor@163['SubList'] // through LazyJavaClassMemberScope@166
-    properties('elementData': Name@79) = ArrayList@281[1] { JavaPropertyDescriptor@282['elementData'] } // through LazyJavaClassMemberScope@166
-    properties('modCount': Name@80) = ArrayList@283[1] { PropertyDescriptorImpl@284['modCount'] } // through LazyJavaClassMemberScope@166
-    properties('size': Name@81) = ArrayList@285[1] { JavaPropertyDescriptor@286['size'] } // through LazyJavaClassMemberScope@166
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@287['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@288['ArrayList']
-}
-
-LazyJavaClassDescriptor@289['ObjectInputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@290['ObjectInputStream']
-}
-
-LazyJavaClassDescriptor@291['ObjectOutputStream'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectOutputStream']
-}
-
-LazyJavaClassDescriptor@293['RandomAccess'] {
-    defaultType = JetTypeImpl@294['RandomAccess']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('add': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('addAll': Name@91) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('clear': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('contains': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('containsAll': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('equals': Name@102) = ArrayList@296[1] { DeserializedSimpleFunctionDescriptor@297['equals'] } // through LazyJavaClassMemberScope@295
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('get': Name@105) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('hashCode': Name@108) = ArrayList@298[1] { DeserializedSimpleFunctionDescriptor@299['hashCode'] } // through LazyJavaClassMemberScope@295
-    functions('indexOf': Name@111) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('isEmpty': Name@39) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('iterator': Name@116) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('lastIndexOf': Name@119) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('listIterator': Name@122) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('outOfBoundsMsg': Name@126) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('rangeCheckForAdd': Name@129) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('remove': Name@132) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('removeAll': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('removeRange': Name@138) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('retainAll': Name@60) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('set': Name@143) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('size': Name@64) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('subList': Name@148) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('toArray': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('toString': Name@72) = ArrayList@300[1] { DeserializedSimpleFunctionDescriptor@301['toString'] } // through LazyJavaClassMemberScope@295
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    memberIndex = computeMemberIndex$1@302 // through LazyJavaClassMemberScope@295
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@295
-    typeConstructor = LazyJavaClassTypeConstructor@303['RandomAccess']
-}
-
-LazyJavaClassDescriptor@304['Serializable'] {
-    defaultType = JetTypeImpl@305['Serializable']
-    functions('Itr': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('ListItr': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('SubList': Name@6) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('add': Name@87) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('addAll': Name@91) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('batchRemove': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('clear': Name@95) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('clone': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('contains': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('containsAll': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('elementData': Name@24) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('ensureCapacity': Name@25) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('ensureCapacityInternal': Name@26) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('equals': Name@102) = ArrayList@307[1] { DeserializedSimpleFunctionDescriptor@308['equals'] } // through LazyJavaClassMemberScope@306
-    functions('fastRemove': Name@30) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('finalize': Name@31) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('get': Name@105) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('getClass': Name@33) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('grow': Name@34) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('hashCode': Name@108) = ArrayList@309[1] { DeserializedSimpleFunctionDescriptor@310['hashCode'] } // through LazyJavaClassMemberScope@306
-    functions('indexOf': Name@111) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('isEmpty': Name@39) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('iterator': Name@116) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('lastIndexOf': Name@119) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('listIterator': Name@122) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('notify': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('notifyAll': Name@48) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('outOfBoundsMsg': Name@126) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('rangeCheck': Name@50) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('rangeCheckForAdd': Name@129) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('readObject': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('remove': Name@132) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('removeAll': Name@56) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('removeRange': Name@138) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('retainAll': Name@60) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('set': Name@143) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('size': Name@64) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('subList': Name@148) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('toArray': Name@68) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('toString': Name@72) = ArrayList@311[1] { DeserializedSimpleFunctionDescriptor@312['toString'] } // through LazyJavaClassMemberScope@306
-    functions('trimToSize': Name@75) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('wait': Name@76) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    functions('writeObject': Name@77) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    memberIndex = computeMemberIndex$1@313 // through LazyJavaClassMemberScope@306
-    properties('elementData': Name@79) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    properties('modCount': Name@80) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    properties('size': Name@81) = EmptyList@3[empty] // through LazyJavaClassMemberScope@306
-    typeConstructor = LazyJavaClassTypeConstructor@314['Serializable']
-}
-
-LazyJavaClassTypeConstructor@83['AbstractCollection'] {
-    parameters = ArrayList@315[1] { LazyJavaTypeParameterDescriptor@316['E'] }
-    supertypes = ArrayList@317[1] { LazyJavaClassifierType@318['Collection<E>'] }
-}
-
-LazyJavaClassTypeConstructor@160['AbstractList'] {
-    parameters = ArrayList@319[1] { LazyJavaTypeParameterDescriptor@320['E'] }
-    supertypes = ArrayList@321[2] { LazyJavaClassifierType@322['AbstractCollection<E>'], LazyJavaClassifierType@323['List<E>'] }
-}
-
-LazyJavaClassTypeConstructor@288['ArrayList'] {
-    parameters = ArrayList@324[1] { LazyJavaTypeParameterDescriptor@325['E'] }
-    supertypes = ArrayList@326[5] { LazyJavaClassifierType@327['AbstractList<E>'], LazyJavaClassifierType@328['List<E>'], LazyJavaClassifierType@329['RandomAccess'], ... }
-}
-
-LazyJavaClassTypeConstructor@290['ObjectInputStream'] {
-    parameters = ArrayList@330[empty]
-}
-
-LazyJavaClassTypeConstructor@292['ObjectOutputStream'] {
-    parameters = ArrayList@331[empty]
-}
-
-LazyJavaClassTypeConstructor@303['RandomAccess'] {
-    parameters = ArrayList@332[empty]
-    supertypes = ArrayList@333[1] { JetTypeImpl@334['Any'] }
-}
-
-LazyJavaClassTypeConstructor@314['Serializable'] {
-    parameters = ArrayList@335[empty]
-    supertypes = ArrayList@336[1] { JetTypeImpl@334['Any'] }
-}
-
-LazyJavaClassifierType@322['AbstractCollection<E>'] {
-    arguments = ArrayList@337[1] { TypeProjectionImpl@338 }
-    classifier = JavaClassImpl@339['AbstractCollection']
-    memberScope = SubstitutingScope@340
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@83['AbstractCollection']
-}
-
-LazyJavaClassifierType@327['AbstractList<E>'] {
-    arguments = ArrayList@342[1] { TypeProjectionImpl@343 }
-    classifier = JavaClassImpl@344['AbstractList']
-    memberScope = SubstitutingScope@345
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@160['AbstractList']
-}
-
-LazyJavaClassifierType@346['Cloneable'] {
-    arguments = ArrayList@347[empty]
-    classifier = JavaClassImpl@348['Cloneable']
-    memberScope = DeserializedClassMemberScope@349
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@350
-}
-
-LazyJavaClassifierType@351['Collection<? extends E>'] {
-    arguments = ArrayList@352[1] { TypeProjectionImpl@353 }
-    classifier = JavaClassImpl@354['Collection']
-    memberScope = SubstitutingScope@355
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@357['Collection<? extends E>'] {
-    arguments = ArrayList@358[1] { TypeProjectionImpl@359 }
-    classifier = JavaClassImpl@360['Collection']
-    memberScope = SubstitutingScope@361
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@362['Collection<? extends E>'] {
-    arguments = ArrayList@363[1] { TypeProjectionImpl@364 }
-    classifier = JavaClassImpl@365['Collection']
-    memberScope = SubstitutingScope@366
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@367['Collection<? extends E>'] {
-    arguments = ArrayList@368[1] { TypeProjectionImpl@369 }
-    classifier = JavaClassImpl@370['Collection']
-    memberScope = SubstitutingScope@371
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@372['Collection<? extends E>'] {
-    arguments = ArrayList@373[1] { TypeProjectionImpl@374 }
-    classifier = JavaClassImpl@375['Collection']
-    memberScope = SubstitutingScope@376
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@377['Collection<? extends E>'] {
-    arguments = ArrayList@378[1] { TypeProjectionImpl@379 }
-    classifier = JavaClassImpl@375['Collection']
-    memberScope = SubstitutingScope@380
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@383['Collection<? extends E>'] {
-    arguments = ArrayList@384[1] { TypeProjectionImpl@385 }
-    classifier = JavaClassImpl@370['Collection']
-    memberScope = SubstitutingScope@386
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@387['Collection<? extends E>'] {
-    arguments = ArrayList@388[1] { TypeProjectionImpl@389 }
-    classifier = JavaClassImpl@354['Collection']
-    memberScope = SubstitutingScope@390
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@391['Collection<? extends E>'] {
-    arguments = ArrayList@392[1] { TypeProjectionImpl@393 }
-    classifier = JavaClassImpl@365['Collection']
-    memberScope = SubstitutingScope@394
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@395['Collection<? extends E>'] {
-    arguments = ArrayList@396[1] { TypeProjectionImpl@397 }
-    classifier = JavaClassImpl@360['Collection']
-    memberScope = SubstitutingScope@398
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@399['Collection<?>'] {
-    arguments = ArrayList@400[1] { LazyStarProjection@401 }
-    classifier = JavaClassImpl@402['Collection']
-    memberScope = SubstitutingScope@403
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@404['Collection<?>'] {
-    arguments = ArrayList@405[1] { LazyStarProjection@406 }
-    classifier = JavaClassImpl@407['Collection']
-    memberScope = SubstitutingScope@408
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@409['Collection<?>'] {
-    arguments = ArrayList@410[1] { LazyStarProjection@411 }
-    classifier = JavaClassImpl@412['Collection']
-    memberScope = SubstitutingScope@413
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@414['Collection<?>'] {
-    arguments = ArrayList@415[1] { LazyStarProjection@416 }
-    classifier = JavaClassImpl@417['Collection']
-    memberScope = SubstitutingScope@418
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@419['Collection<?>'] {
-    arguments = ArrayList@420[1] { LazyStarProjection@421 }
-    classifier = JavaClassImpl@422['Collection']
-    memberScope = SubstitutingScope@423
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@424['Collection<?>'] {
-    arguments = ArrayList@425[1] { LazyStarProjection@426 }
-    classifier = JavaClassImpl@427['Collection']
-    memberScope = SubstitutingScope@428
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@429['Collection<?>'] {
-    arguments = ArrayList@430[1] { LazyStarProjection@431 }
-    classifier = JavaClassImpl@407['Collection']
-    memberScope = SubstitutingScope@432
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@433['Collection<?>'] {
-    arguments = ArrayList@434[1] { LazyStarProjection@435 }
-    classifier = JavaClassImpl@417['Collection']
-    memberScope = SubstitutingScope@436
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@437['Collection<?>'] {
-    arguments = ArrayList@438[1] { LazyStarProjection@439 }
-    classifier = JavaClassImpl@427['Collection']
-    memberScope = SubstitutingScope@440
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@441['Collection<?>'] {
-    arguments = ArrayList@442[1] { LazyStarProjection@443 }
-    classifier = JavaClassImpl@412['Collection']
-    memberScope = SubstitutingScope@444
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@445['Collection<?>'] {
-    arguments = ArrayList@446[1] { LazyStarProjection@447 }
-    classifier = JavaClassImpl@422['Collection']
-    memberScope = SubstitutingScope@448
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@449['Collection<?>'] {
-    arguments = ArrayList@450[1] { LazyStarProjection@451 }
-    classifier = JavaClassImpl@402['Collection']
-    memberScope = SubstitutingScope@452
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@382
-}
-
-LazyJavaClassifierType@318['Collection<E>'] {
-    arguments = ArrayList@453[1] { TypeProjectionImpl@454 }
-    classifier = JavaClassImpl@455['Collection']
-    memberScope = SubstitutingScope@456
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@356
-}
-
-LazyJavaClassifierType@457['E'] {
-    arguments = ArrayList@458[empty]
-    classifier = JavaTypeParameterImpl@459['E']
-    memberScope = LazyScopeAdapter@460
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@462['E'] {
-    arguments = ArrayList@463[empty]
-    classifier = JavaTypeParameterImpl@464['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@466['E'] {
-    arguments = ArrayList@467[empty]
-    classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@470['E'] {
-    arguments = ArrayList@471[empty]
-    classifier = JavaTypeParameterImpl@472['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@473['E'] {
-    arguments = ArrayList@474[empty]
-    classifier = JavaTypeParameterImpl@475['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@476['E'] {
-    arguments = ArrayList@477[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@479['E'] {
-    arguments = ArrayList@480[empty]
-    classifier = JavaTypeParameterImpl@481['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@482['E'] {
-    arguments = ArrayList@483[empty]
-    classifier = JavaTypeParameterImpl@484['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@485['E'] {
-    arguments = ArrayList@486[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@488['E'] {
-    arguments = ArrayList@489[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@491['E'] {
-    arguments = ArrayList@492[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@497['E'] {
-    arguments = ArrayList@498[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@500['E'] {
-    arguments = ArrayList@501[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@503['E'] {
-    arguments = ArrayList@504[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@506['E'] {
-    arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@509['E'] {
-    arguments = ArrayList@510[empty]
-    classifier = JavaTypeParameterImpl@511['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@512['E'] {
-    arguments = ArrayList@513[empty]
-    classifier = JavaTypeParameterImpl@514['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@515['E'] {
-    arguments = ArrayList@516[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@518['E'] {
-    arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@520['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@521['E'] {
-    arguments = ArrayList@522[empty]
-    classifier = JavaTypeParameterImpl@523['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@524['E'] {
-    arguments = ArrayList@525[empty]
-    classifier = JavaTypeParameterImpl@526['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@527['E'] {
-    arguments = ArrayList@528[empty]
-    classifier = JavaTypeParameterImpl@529['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@530['E'] {
-    arguments = ArrayList@531[empty]
-    classifier = JavaTypeParameterImpl@532['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@533['E'] {
-    arguments = ArrayList@534[empty]
-    classifier = JavaTypeParameterImpl@535['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@536['E'] {
-    arguments = ArrayList@537[empty]
-    classifier = JavaTypeParameterImpl@538['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@539['E'] {
-    arguments = ArrayList@540[empty]
-    classifier = JavaTypeParameterImpl@541['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@542['E'] {
-    arguments = ArrayList@543[empty]
-    classifier = JavaTypeParameterImpl@544['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@545['E'] {
-    arguments = ArrayList@546[empty]
-    classifier = JavaTypeParameterImpl@547['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@548['E'] {
-    arguments = ArrayList@549[empty]
-    classifier = JavaTypeParameterImpl@550['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@551['E'] {
-    arguments = ArrayList@552[empty]
-    classifier = JavaTypeParameterImpl@553['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@554['E'] {
-    arguments = ArrayList@555[empty]
-    classifier = JavaTypeParameterImpl@556['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@557['E'] {
-    arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@559['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@560['E'] {
-    arguments = ArrayList@561[empty]
-    classifier = JavaTypeParameterImpl@562['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@563['E'] {
-    arguments = ArrayList@564[empty]
-    classifier = JavaTypeParameterImpl@565['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@566['E'] {
-    arguments = ArrayList@567[empty]
-    classifier = JavaTypeParameterImpl@568['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@569['E'] {
-    arguments = ArrayList@570[empty]
-    classifier = JavaTypeParameterImpl@571['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@572['E'] {
-    arguments = ArrayList@573[empty]
-    classifier = JavaTypeParameterImpl@574['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@575['E'] {
-    arguments = ArrayList@576[empty]
-    classifier = JavaTypeParameterImpl@577['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@578['E'] {
-    arguments = ArrayList@579[empty]
-    classifier = JavaTypeParameterImpl@580['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@581['E'] {
-    arguments = ArrayList@582[empty]
-    classifier = JavaTypeParameterImpl@583['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@584['E'] {
-    arguments = ArrayList@585[empty]
-    classifier = JavaTypeParameterImpl@586['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@587['E'] {
-    arguments = ArrayList@588[empty]
-    classifier = JavaTypeParameterImpl@589['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@590['E'] {
-    arguments = ArrayList@591[empty]
-    classifier = JavaTypeParameterImpl@592['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@593['E'] {
-    arguments = ArrayList@594[empty]
-    classifier = JavaTypeParameterImpl@595['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@596['E'] {
-    arguments = ArrayList@597[empty]
-    classifier = JavaTypeParameterImpl@598['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@599['E'] {
-    arguments = ArrayList@600[empty]
-    classifier = JavaTypeParameterImpl@601['E']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@602['E'] {
-    arguments = ArrayList@603[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@604['E'] {
-    arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@568['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@606['E'] {
-    arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@535['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@608['E'] {
-    arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@472['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@610['E'] {
-    arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@612['E'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@523['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@614['E'] {
-    arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@616['E'] {
-    arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@538['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@618['E'] {
-    arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@586['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@620['E'] {
-    arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@601['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@622['E'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@580['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@624['E'] {
-    arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@529['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@626['E'] {
-    arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@628['E'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@577['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@630['E'] {
-    arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@553['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@632['E'] {
-    arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@459['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@634['E'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@511['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@636['E'] {
-    arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@638['E'] {
-    arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@541['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@640['E'] {
-    arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@550['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@642['E'] {
-    arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@544['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@644['E'] {
-    arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@475['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@646['E'] {
-    arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@514['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@648['E'] {
-    arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@650['E'] {
-    arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@583['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@652['E'] {
-    arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@484['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@654['E'] {
-    arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@565['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-}
-
-LazyJavaClassifierType@656['E'] {
-    arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@556['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@658['E'] {
-    arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@660['E'] {
-    arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@595['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@662['E'] {
-    arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@532['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@664['E'] {
-    arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@505['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@666['E'] {
-    arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@508['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@668['E'] {
-    arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@562['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@670['E'] {
-    arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@589['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@672['E'] {
-    arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@598['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@674['E'] {
-    arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@502['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@676['E'] {
-    arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@547['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@678['E'] {
-    arguments = ArrayList@679[empty]
-    classifier = JavaTypeParameterImpl@464['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@680['E'] {
-    arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@559['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@682['E'] {
-    arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@574['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@684['E'] {
-    arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@571['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@686['E'] {
-    arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@481['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@688['E'] {
-    arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@520['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@690['E'] {
-    arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@692['E'] {
-    arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@592['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@694['E'] {
-    arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@526['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@696['Iterator<E>'] {
-    arguments = ArrayList@697[1] { TypeProjectionImpl@698 }
-    classifier = JavaClassImpl@699['Iterator']
-    memberScope = SubstitutingScope@700
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@701
-}
-
-LazyJavaClassifierType@702['Iterator<E>'] {
-    arguments = ArrayList@703[1] { TypeProjectionImpl@704 }
-    classifier = JavaClassImpl@705['Iterator']
-    memberScope = SubstitutingScope@706
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@701
-}
-
-LazyJavaClassifierType@707['Iterator<E>'] {
-    arguments = ArrayList@708[1] { TypeProjectionImpl@709 }
-    classifier = JavaClassImpl@710['Iterator']
-    memberScope = SubstitutingScope@711
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@701
-}
-
-LazyJavaClassifierType@712['Iterator<E>'] {
-    arguments = ArrayList@713[1] { TypeProjectionImpl@714 }
-    classifier = JavaClassImpl@699['Iterator']
-    memberScope = SubstitutingScope@715
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@716
-}
-
-LazyJavaClassifierType@717['Iterator<E>'] {
-    arguments = ArrayList@718[1] { TypeProjectionImpl@719 }
-    classifier = JavaClassImpl@705['Iterator']
-    memberScope = SubstitutingScope@720
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@716
-}
-
-LazyJavaClassifierType@721['Iterator<E>'] {
-    arguments = ArrayList@722[1] { TypeProjectionImpl@723 }
-    classifier = JavaClassImpl@710['Iterator']
-    memberScope = SubstitutingScope@724
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@716
-}
-
-LazyJavaClassifierType@323['List<E>'] {
-    arguments = ArrayList@725[1] { TypeProjectionImpl@726 }
-    classifier = JavaClassImpl@727['List']
-    memberScope = SubstitutingScope@728
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@730['List<E>'] {
-    arguments = ArrayList@731[1] { TypeProjectionImpl@732 }
-    classifier = JavaClassImpl@733['List']
-    memberScope = SubstitutingScope@734
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@735['List<E>'] {
-    arguments = ArrayList@736[1] { TypeProjectionImpl@737 }
-    classifier = JavaClassImpl@738['List']
-    memberScope = SubstitutingScope@739
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@328['List<E>'] {
-    arguments = ArrayList@740[1] { TypeProjectionImpl@741 }
-    classifier = JavaClassImpl@742['List']
-    memberScope = SubstitutingScope@743
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@729
-}
-
-LazyJavaClassifierType@744['List<E>'] {
-    arguments = ArrayList@745[1] { TypeProjectionImpl@746 }
-    classifier = JavaClassImpl@738['List']
-    memberScope = SubstitutingScope@747
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@749['List<E>'] {
-    arguments = ArrayList@750[1] { TypeProjectionImpl@751 }
-    classifier = JavaClassImpl@733['List']
-    memberScope = SubstitutingScope@752
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@748
-}
-
-LazyJavaClassifierType@753['ListIterator<E>'] {
-    arguments = ArrayList@754[1] { TypeProjectionImpl@755 }
-    classifier = JavaClassImpl@756['ListIterator']
-    memberScope = SubstitutingScope@757
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@758
-}
-
-LazyJavaClassifierType@759['ListIterator<E>'] {
-    arguments = ArrayList@760[1] { TypeProjectionImpl@761 }
-    classifier = JavaClassImpl@762['ListIterator']
-    memberScope = SubstitutingScope@763
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@758
-}
-
-LazyJavaClassifierType@764['ListIterator<E>'] {
-    arguments = ArrayList@765[1] { TypeProjectionImpl@766 }
-    classifier = JavaClassImpl@767['ListIterator']
-    memberScope = SubstitutingScope@768
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@758
-}
-
-LazyJavaClassifierType@769['ListIterator<E>'] {
-    arguments = ArrayList@770[1] { TypeProjectionImpl@771 }
-    classifier = JavaClassImpl@772['ListIterator']
-    memberScope = SubstitutingScope@773
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@758
-}
-
-LazyJavaClassifierType@774['ListIterator<E>'] {
-    arguments = ArrayList@775[1] { TypeProjectionImpl@776 }
-    classifier = JavaClassImpl@756['ListIterator']
-    memberScope = SubstitutingScope@777
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@779['ListIterator<E>'] {
-    arguments = ArrayList@780[1] { TypeProjectionImpl@781 }
-    classifier = JavaClassImpl@772['ListIterator']
-    memberScope = SubstitutingScope@782
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@783['ListIterator<E>'] {
-    arguments = ArrayList@784[1] { TypeProjectionImpl@785 }
-    classifier = JavaClassImpl@762['ListIterator']
-    memberScope = SubstitutingScope@786
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@787['ListIterator<E>'] {
-    arguments = ArrayList@788[1] { TypeProjectionImpl@789 }
-    classifier = JavaClassImpl@767['ListIterator']
-    memberScope = SubstitutingScope@790
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@778
-}
-
-LazyJavaClassifierType@791['Object'] {
-    arguments = ArrayList@792[empty]
-    classifier = JavaClassImpl@793['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@796['Object'] {
-    arguments = ArrayList@797[empty]
-    classifier = JavaClassImpl@798['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@799['Object'] {
-    arguments = ArrayList@800[empty]
-    classifier = JavaClassImpl@801['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@802['Object'] {
-    arguments = ArrayList@803[empty]
-    classifier = JavaClassImpl@804['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@805['Object'] {
-    arguments = ArrayList@806[empty]
-    classifier = JavaClassImpl@807['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@808['Object'] {
-    arguments = ArrayList@809[empty]
-    classifier = JavaClassImpl@810['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@811['Object'] {
-    arguments = ArrayList@812[empty]
-    classifier = JavaClassImpl@813['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@814['Object'] {
-    arguments = ArrayList@815[empty]
-    classifier = JavaClassImpl@816['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@817['Object'] {
-    arguments = ArrayList@818[empty]
-    classifier = JavaClassImpl@819['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@820['Object'] {
-    arguments = ArrayList@821[empty]
-    classifier = JavaClassImpl@822['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@823['Object'] {
-    arguments = ArrayList@824[empty]
-    classifier = JavaClassImpl@825['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@826['Object'] {
-    arguments = ArrayList@827[empty]
-    classifier = JavaClassImpl@828['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@829['Object'] {
-    arguments = ArrayList@830[empty]
-    classifier = JavaClassImpl@831['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@832['Object'] {
-    arguments = ArrayList@833[empty]
-    classifier = JavaClassImpl@822['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@834['Object'] {
-    arguments = ArrayList@835[empty]
-    classifier = JavaClassImpl@801['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@836['Object'] {
-    arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@819['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@838['Object'] {
-    arguments = ArrayList@839[empty]
-    classifier = JavaClassImpl@807['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@840['Object'] {
-    arguments = ArrayList@841[empty]
-    classifier = JavaClassImpl@804['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@842['Object'] {
-    arguments = ArrayList@843[empty]
-    classifier = JavaClassImpl@816['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@844['Object'] {
-    arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@828['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@846['Object'] {
-    arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@813['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@848['Object'] {
-    arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@798['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@850['Object'] {
-    arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@810['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@852['Object'] {
-    arguments = ArrayList@853[empty]
-    classifier = JavaClassImpl@793['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@854['Object'] {
-    arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@825['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@856['Object'] {
-    arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@831['Object']
-    memberScope = DeserializedClassMemberScope@794
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@858['Object'] {
-    classifier = JavaClassImpl@859['Object']
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@860['Object'] {
-    classifier = JavaClassImpl@861['Object']
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@862['Object'] {
-    classifier = JavaClassImpl@863['Object']
-    typeConstructor = DeserializedClassTypeConstructor@795
-}
-
-LazyJavaClassifierType@864['ObjectInputStream'] {
-    arguments = ArrayList@865[empty]
-    classifier = JavaClassImpl@866['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@867
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@290['ObjectInputStream']
-}
-
-LazyJavaClassifierType@868['ObjectInputStream'] {
-    arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@866['ObjectInputStream']
-    memberScope = LazyJavaClassMemberScope@867
-    nullable = 'true': Boolean@381
-    typeConstructor = LazyJavaClassTypeConstructor@290['ObjectInputStream']
-}
-
-LazyJavaClassifierType@870['ObjectOutputStream'] {
-    arguments = ArrayList@871[empty]
-    classifier = JavaClassImpl@872['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@873
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@874['ObjectOutputStream'] {
-    arguments = ArrayList@875[empty]
-    classifier = JavaClassImpl@872['ObjectOutputStream']
-    memberScope = LazyJavaClassMemberScope@873
-    nullable = 'true': Boolean@381
-    typeConstructor = LazyJavaClassTypeConstructor@292['ObjectOutputStream']
-}
-
-LazyJavaClassifierType@329['RandomAccess'] {
-    arguments = ArrayList@876[empty]
-    classifier = JavaClassImpl@877['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@295
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@303['RandomAccess']
-}
-
-LazyJavaClassifierType@878['Serializable'] {
-    arguments = ArrayList@879[empty]
-    classifier = JavaClassImpl@880['Serializable']
-    memberScope = LazyJavaClassMemberScope@306
-    nullable = 'false': Boolean@341
-    typeConstructor = LazyJavaClassTypeConstructor@314['Serializable']
-}
-
-LazyJavaClassifierType@881['String'] {
-    arguments = ArrayList@882[empty]
-    classifier = JavaClassImpl@883['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@886['String'] {
-    arguments = ArrayList@887[empty]
-    classifier = JavaClassImpl@888['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@889['String'] {
-    arguments = ArrayList@890[empty]
-    classifier = JavaClassImpl@891['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@892['String'] {
-    arguments = ArrayList@893[empty]
-    classifier = JavaClassImpl@888['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@894['String'] {
-    arguments = ArrayList@895[empty]
-    classifier = JavaClassImpl@891['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@896['String'] {
-    arguments = ArrayList@897[empty]
-    classifier = JavaClassImpl@883['String']
-    memberScope = DeserializedClassMemberScope@884
-    nullable = 'true': Boolean@381
-    typeConstructor = DeserializedClassTypeConstructor@885
-}
-
-LazyJavaClassifierType@898['T'] {
-    arguments = ArrayList@899[empty]
-    classifier = JavaTypeParameterImpl@900['T']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-}
-
-LazyJavaClassifierType@902['T'] {
-    arguments = ArrayList@903[empty]
-    classifier = JavaTypeParameterImpl@904['T']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
-}
-
-LazyJavaClassifierType@906['T'] {
-    arguments = ArrayList@907[empty]
-    classifier = JavaTypeParameterImpl@908['T']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-}
-
-LazyJavaClassifierType@909['T'] {
-    arguments = ArrayList@910[empty]
-    classifier = JavaTypeParameterImpl@911['T']
-    nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
-}
-
-LazyJavaClassifierType@912['T'] {
-    arguments = ArrayList@913[empty]
-    classifier = JavaTypeParameterImpl@908['T']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-}
-
-LazyJavaClassifierType@914['T'] {
-    arguments = ArrayList@915[empty]
-    classifier = JavaTypeParameterImpl@900['T']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-}
-
-LazyJavaClassifierType@916['T'] {
-    arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@904['T']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
-}
-
-LazyJavaClassifierType@918['T'] {
-    arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@911['T']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
-}
-
-LazyJavaPackageFragmentProvider@920 {
-    packageFragments('<root>': FqName@921) = LazyJavaPackageFragment@922['<root>']
-    packageFragments('A': FqName@923) = null
-    packageFragments('ArrayList': FqName@924) = null
-    packageFragments('B': FqName@925) = null
-    packageFragments('Int': FqName@926) = null
-    packageFragments('MyListOfPairs': FqName@927) = null
-    packageFragments('Pair': FqName@928) = null
-    packageFragments('T': FqName@929) = null
-    packageFragments('java': FqName@930) = LazyJavaPackageFragment@931['java']
-    packageFragments('java.io': FqName@932) = LazyJavaPackageFragment@933['io']
-    packageFragments('java.lang': FqName@934) = LazyJavaPackageFragment@935['lang']
-    packageFragments('java.lang.A': FqName@936) = null
-    packageFragments('java.lang.ArrayList': FqName@937) = null
-    packageFragments('java.lang.B': FqName@938) = null
-    packageFragments('java.lang.Int': FqName@939) = null
-    packageFragments('java.lang.Pair': FqName@940) = null
-    packageFragments('java.lang.T': FqName@941) = null
-    packageFragments('java.util': FqName@942) = LazyJavaPackageFragment@943['util']
-    packageFragments('java.util.ArrayList': FqName@944) = null
-    packageFragments('kotlin': FqName@945) = null
-    packageFragments('kotlin.A': FqName@946) = null
-    packageFragments('kotlin.ArrayList': FqName@947) = null
-    packageFragments('kotlin.B': FqName@948) = null
-    packageFragments('kotlin.Int': FqName@949) = null
-    packageFragments('kotlin.Pair': FqName@950) = null
-    packageFragments('kotlin.T': FqName@951) = null
-    packageFragments('kotlin.io': FqName@952) = null
-    packageFragments('kotlin.jvm': FqName@953) = null
-    topLevelClasses(JavaClassImpl@339['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@344['AbstractList']) = LazyJavaClassDescriptor@84['AbstractList']
-    topLevelClasses(JavaClassImpl@954['ArrayList']) = LazyJavaClassDescriptor@161['ArrayList']
-    topLevelClasses(JavaClassImpl@866['ObjectInputStream']) = LazyJavaClassDescriptor@289['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@872['ObjectOutputStream']) = LazyJavaClassDescriptor@291['ObjectOutputStream']
-    topLevelClasses(JavaClassImpl@877['RandomAccess']) = LazyJavaClassDescriptor@293['RandomAccess']
-    topLevelClasses(JavaClassImpl@880['Serializable']) = LazyJavaClassDescriptor@304['Serializable']
-}
-
-LazyJavaPackageFragment@922['<root>'] {
-    classes('ArrayList': Name@955) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Int': Name@957) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('MyListOfPairs': Name@958) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('java': Name@959) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    deserializedPackageScope = Empty@960 // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('MyListOfPairs': Name@958) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('java': Name@961) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    memberIndex = computeMemberIndex$1@962 // through LazyPackageFragmentScopeForJavaPackage@956
-}
-
-LazyJavaPackageFragment@931['java'] {
-    classes('lang': Name@963) = null // through LazyPackageFragmentScopeForJavaPackage@964
-    classes('util': Name@965) = null // through LazyPackageFragmentScopeForJavaPackage@964
-    deserializedPackageScope = Empty@960 // through LazyPackageFragmentScopeForJavaPackage@964
-    functions('lang': Name@966) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@964
-    functions('util': Name@967) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@964
-    memberIndex = computeMemberIndex$1@968 // through LazyPackageFragmentScopeForJavaPackage@964
-}
-
-LazyJavaPackageFragment@935['lang'] {
-    classes('MyListOfPairs': Name@958) = null // through LazyPackageFragmentScopeForJavaPackage@969
-    deserializedPackageScope = Empty@960 // through LazyPackageFragmentScopeForJavaPackage@969
-    functions('MyListOfPairs': Name@958) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@969
-    memberIndex = computeMemberIndex$1@970 // through LazyPackageFragmentScopeForJavaPackage@969
-}
-
-LazyJavaPackageFragment@943['util'] {
-    classes('ArrayList': Name@971) = LazyJavaClassDescriptor@161['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@972
-    deserializedPackageScope = Empty@960 // through LazyPackageFragmentScopeForJavaPackage@972
-    functions('ArrayList': Name@973) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@972
-    memberIndex = computeMemberIndex$1@974 // through LazyPackageFragmentScopeForJavaPackage@972
-}
-
-LazyJavaTypeParameterDescriptor@316['E'] {
-    defaultType = JetTypeImpl@975['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@469
-    upperBounds = LinkedHashSet@976[1] { NullableType@977 }
-    upperBoundsAsType = NullableType@977
-}
-
-LazyJavaTypeParameterDescriptor@325['E'] {
-    defaultType = JetTypeImpl@978['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-    upperBounds = LinkedHashSet@979[1] { NullableType@980 }
-    upperBoundsAsType = NullableType@980
-}
-
-LazyJavaTypeParameterDescriptor@320['E'] {
-    defaultType = JetTypeImpl@981['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-    upperBounds = LinkedHashSet@982[1] { NullableType@983 }
-    upperBoundsAsType = NullableType@983
-}
-
-LazyJavaTypeParameterDescriptor@984['T'] {
-    defaultType = JetTypeImpl@985['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-    upperBounds = LinkedHashSet@986[1] { NullableType@987 }
-    upperBoundsAsType = NullableType@987
-}
-
-LazyJavaTypeParameterDescriptor@988['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
-    upperBounds = LinkedHashSet@989[1] { NullableType@990 }
-    upperBoundsAsType = NullableType@990
-}
-
-LazyJavaTypeParameterResolver@991 {
-    resolve(JavaTypeParameterImpl@992['E']) = LazyJavaTypeParameterDescriptor@320['E']
-}
-
-LazyJavaTypeParameterResolver@993 {
-    resolve(JavaTypeParameterImpl@994['E']) = LazyJavaTypeParameterDescriptor@325['E']
-}
-
-LazyJavaTypeParameterResolver@995 {
-    resolve(JavaTypeParameterImpl@996['E']) = LazyJavaTypeParameterDescriptor@316['E']
-}
-
-LazyJavaTypeParameterResolver@997 {
-    resolve(JavaTypeParameterImpl@559['E']) = null
-}
-
-LazyJavaTypeParameterResolver@998 {
-    resolve(JavaTypeParameterImpl@538['E']) = null
-}
-
-LazyJavaTypeParameterResolver@999 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1000 {
-    resolve(JavaTypeParameterImpl@580['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@553['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@592['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1003 {
-    resolve(JavaTypeParameterImpl@475['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@478['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1005 {
-    resolve(JavaTypeParameterImpl@487['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1006 {
-    resolve(JavaTypeParameterImpl@541['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1007 {
-    resolve(JavaTypeParameterImpl@490['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1008 {
-    resolve(JavaTypeParameterImpl@547['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1009 {
-    resolve(JavaTypeParameterImpl@523['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1010 {
-    resolve(JavaTypeParameterImpl@544['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1011 {
-    resolve(JavaTypeParameterImpl@505['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1012 {
-    resolve(JavaTypeParameterImpl@520['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1013 {
-    resolve(JavaTypeParameterImpl@514['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1014 {
-    resolve(JavaTypeParameterImpl@472['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1015 {
-    resolve(JavaTypeParameterImpl@568['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1016 {
-    resolve(JavaTypeParameterImpl@601['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1017 {
-    resolve(JavaTypeParameterImpl@574['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1018 {
-    resolve(JavaTypeParameterImpl@535['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1019 {
-    resolve(JavaTypeParameterImpl@529['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1020 {
-    resolve(JavaTypeParameterImpl@562['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1021 {
-    resolve(JavaTypeParameterImpl@586['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1022 {
-    resolve(JavaTypeParameterImpl@1023['T']) = LazyJavaTypeParameterDescriptor@988['T']
-}
-
-LazyJavaTypeParameterResolver@1024 {
-    resolve(JavaTypeParameterImpl@1025['T']) = LazyJavaTypeParameterDescriptor@984['T']
-}
-
-ResolutionTaskHolder@1026 {
-    <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
-
-ResolutionTaskHolder@1029 {
-    <name not found> = ArrayList@1030[3] { ResolutionCandidate@1031, ResolutionCandidate@1032, ResolutionCandidate@1033 }
-}
-
-null {
-    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1028 }
-    <name not found> = ArrayList@1035[3] { ResolutionCandidate@1031, ResolutionCandidate@1032, ResolutionCandidate@1033 }
-    <name not found> = EmptyList@3[empty]
-    <name not found> = EmptyList@3[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
deleted file mode 100644
index c60c4f70bb3..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
+++ /dev/null
@@ -1,29 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('T1': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.T1': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.T1': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-    packageFragments('kt2069': FqName@13) = null
-    packageFragments('kt2069.T': FqName@14) = null
-    packageFragments('kt2069.T1': FqName@15) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2744.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt2744.lazy.log
deleted file mode 100644
index 3cf806f3496..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/kt2744.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('List': FqName@3) = null
-    packageFragments('S': FqName@4) = null
-    packageFragments('X': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.List': FqName@10) = null
-    packageFragments('java.lang.S': FqName@11) = null
-    packageFragments('java.lang.X': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.List': FqName@14) = null
-    packageFragments('kotlin.S': FqName@15) = null
-    packageFragments('kotlin.X': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('List': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('S': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('S': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt304.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt304.lazy.log
deleted file mode 100644
index d00efed34f3..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/kt304.lazy.log
+++ /dev/null
@@ -1,19 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Bar': FqName@3) = null
-    packageFragments('Foo': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Bar': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Bar': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt3159.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt3159.lazy.log
deleted file mode 100644
index 2ac3895aa22..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/kt3159.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = StringValue@1
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('CharSequence': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('Sub': FqName@7) = null
-    packageFragments('Super': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.CharSequence': FqName@13) = null
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.Super': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.CharSequence': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.Super': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('CharSequence': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
deleted file mode 100644
index 03c93581de9..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
+++ /dev/null
@@ -1,31 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-null {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
deleted file mode 100644
index 9f01fd0ab87..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
+++ /dev/null
@@ -1,116 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.Int': FqName@20) = null
-    packageFragments('p.T': FqName@21) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@70[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
deleted file mode 100644
index f07d036af36..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = DeferredType@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('Test': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
deleted file mode 100644
index 39f78fcd81e..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
+++ /dev/null
@@ -1,142 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = MutableClassDescriptor$1@5
-    <name not found> = MutableClassDescriptor$1@6
-}
-
-DescriptorResolver@7 {
-    <name not found> = MutableClassDescriptor$1@5
-}
-
-DescriptorResolver@8 {
-    <name not found> = MutableClassDescriptor$1@6
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Int': FqName@12) = null
-    packageFragments('T': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.T': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Int': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('p': FqName@25) = null
-    packageFragments('p.Int': FqName@26) = null
-    packageFragments('p.T': FqName@27) = null
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@17['lang'] {
-    classes('A': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('f': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('run': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('A': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('run': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[2] { ResolutionCandidate@73, ResolutionCandidate@74 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
-
-null {
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@84[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
-    <name not found> = ArrayList@85[2] { ResolutionCandidate@73, ResolutionCandidate@74 }
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-    <name not found> = EmptyList@32[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
deleted file mode 100644
index 29a7c1f26c4..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
+++ /dev/null
@@ -1,126 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = MutableClassDescriptor$1@1
-    <name not found> = MutableClassDescriptor$1@2
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('T': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.T': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.T': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('p': FqName@19) = null
-    packageFragments('p.Int': FqName@20) = null
-    packageFragments('p.T': FqName@21) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
-}
-
-ResolutionTaskHolder@55 {
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-}
-
-ResolutionTaskHolder@58 {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
-
-null {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@48 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@54 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@75[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@60 }
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@63, ResolutionCandidate@64 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@67, ResolutionCandidate@68 }
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-    <name not found> = EmptyList@26[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
deleted file mode 100644
index 8c95091b32f..00000000000
--- a/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
+++ /dev/null
@@ -1,48 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['Any']
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-    packageFragments('x': FqName@16) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
deleted file mode 100644
index a263a97ee2e..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
deleted file mode 100644
index b6918b8fcd7..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('Nothing': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Nothing': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.suppress': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Nothing': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('kotlin.suppress': FqName@24) = null
-    packageFragments('suppress': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Nothing': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('suppress': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
deleted file mode 100644
index 6a05c3669ea..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
+++ /dev/null
@@ -1,40 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.String': FqName@13) = null
-    packageFragments('java.lang.suppress': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-    packageFragments('kotlin.suppress': FqName@19) = null
-    packageFragments('suppress': FqName@20) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('suppress': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
deleted file mode 100644
index 39b473b756a..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
deleted file mode 100644
index 39b473b756a..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
deleted file mode 100644
index 39b473b756a..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-null {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
deleted file mode 100644
index b6918b8fcd7..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('Nothing': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Nothing': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.suppress': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Nothing': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('kotlin.suppress': FqName@24) = null
-    packageFragments('suppress': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Nothing': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('suppress': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
deleted file mode 100644
index 21f4f1c59a1..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.suppress': FqName@23) = null
-    packageFragments('suppress': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
deleted file mode 100644
index 096e4ef70b7..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
+++ /dev/null
@@ -1,57 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@8
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('C': FqName@12) = null
-    packageFragments('String': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.suppress': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('kotlin.suppress': FqName@24) = null
-    packageFragments('suppress': FqName@25) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@43 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
deleted file mode 100644
index 53193dfd9c3..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
deleted file mode 100644
index 95bdcf46fbc..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.suppress': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kotlin.suppress': FqName@21) = null
-    packageFragments('suppress': FqName@22) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('suppress': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
deleted file mode 100644
index 4efea778524..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Any': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.suppress': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kotlin.suppress': FqName@22) = null
-    packageFragments('suppress': FqName@23) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('suppress': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-null {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@39 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
deleted file mode 100644
index a263a97ee2e..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
deleted file mode 100644
index 53193dfd9c3..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
deleted file mode 100644
index a31ab1ca19a..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
+++ /dev/null
@@ -1,55 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['suppress']
-    valueArguments(ValueParameterDescriptorImpl@5['names']) = ArrayValue@6
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('C': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.String': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kotlin.suppress': FqName@22) = null
-    packageFragments('suppress': FqName@23) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('suppress': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
deleted file mode 100644
index 777f187a705..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('java.lang.suppress': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.String': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-    packageFragments('kotlin.suppress': FqName@21) = null
-    packageFragments('suppress': FqName@22) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('suppress': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
deleted file mode 100644
index a263a97ee2e..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
+++ /dev/null
@@ -1,46 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('String': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.String': FqName@14) = null
-    packageFragments('java.lang.suppress': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = null
-    packageFragments('kotlin.String': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-    packageFragments('kotlin.suppress': FqName@20) = null
-    packageFragments('suppress': FqName@21) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
deleted file mode 100644
index 21f4f1c59a1..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.suppress': FqName@23) = null
-    packageFragments('suppress': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
deleted file mode 100644
index b6918b8fcd7..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('Nothing': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Nothing': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.suppress': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Nothing': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('kotlin.suppress': FqName@24) = null
-    packageFragments('suppress': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Nothing': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('suppress': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
deleted file mode 100644
index 7c9129049c0..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Any': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.suppress': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.Any': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.io': FqName@20) = null
-    packageFragments('kotlin.jvm': FqName@21) = null
-    packageFragments('kotlin.suppress': FqName@22) = null
-    packageFragments('suppress': FqName@23) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Nothing': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('suppress': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
deleted file mode 100644
index 21f4f1c59a1..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.suppress': FqName@23) = null
-    packageFragments('suppress': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
deleted file mode 100644
index 3e29ef5c8e9..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Any': FqName@8) = null
-    packageFragments('C': FqName@9) = null
-    packageFragments('Nothing': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.Nothing': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.suppress': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.Nothing': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    packageFragments('kotlin.suppress': FqName@26) = null
-    packageFragments('suppress': FqName@27) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Any': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Nothing': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('suppress': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
-}
-
-null {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
deleted file mode 100644
index 21f4f1c59a1..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.suppress': FqName@23) = null
-    packageFragments('suppress': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
deleted file mode 100644
index 040e2d466e4..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = NullableType@1
-}
-
-LazyAnnotationDescriptor@2 {
-    resolutionResults = OverloadResolutionResultsImpl@3
-    type = JetTypeImpl@4['suppress']
-    valueArguments(ValueParameterDescriptorImpl@5['names']) = ArrayValue@6
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('C': FqName@10) = null
-    packageFragments('Nothing': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Nothing': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.suppress': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = null
-    packageFragments('kotlin.Nothing': FqName@21) = null
-    packageFragments('kotlin.String': FqName@22) = null
-    packageFragments('kotlin.io': FqName@23) = null
-    packageFragments('kotlin.jvm': FqName@24) = null
-    packageFragments('kotlin.suppress': FqName@25) = null
-    packageFragments('suppress': FqName@26) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Nothing': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('suppress': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-}
-
-null {
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@42 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
deleted file mode 100644
index b6918b8fcd7..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
+++ /dev/null
@@ -1,49 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyAnnotationDescriptor@1 {
-    resolutionResults = OverloadResolutionResultsImpl@2
-    type = JetTypeImpl@3['suppress']
-    valueArguments(ValueParameterDescriptorImpl@4['names']) = ArrayValue@5
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('C': FqName@9) = null
-    packageFragments('Nothing': FqName@10) = null
-    packageFragments('String': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Nothing': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.suppress': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Nothing': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-    packageFragments('kotlin.suppress': FqName@24) = null
-    packageFragments('suppress': FqName@25) = null
-}
-
-LazyJavaPackageFragment@8['<root>'] {
-    classes('Nothing': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('suppress': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
deleted file mode 100644
index 21f4f1c59a1..00000000000
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['suppress']
-    valueArguments(ValueParameterDescriptorImpl@3['names']) = ArrayValue@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('C': FqName@8) = null
-    packageFragments('Nothing': FqName@9) = null
-    packageFragments('String': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Nothing': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('java.lang.suppress': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Nothing': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-    packageFragments('kotlin.suppress': FqName@23) = null
-    packageFragments('suppress': FqName@24) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('suppress': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
deleted file mode 100644
index 6349658ae8d..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
+++ /dev/null
@@ -1,62 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-    <name not found> = JetTypeImpl@1['Unit']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('A': FqName@5) = null
-    packageFragments('Unit': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Unit': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Unit': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@20[empty]
-    <name not found> = EmptyList@20[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
deleted file mode 100644
index 4976bef7d9d..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
+++ /dev/null
@@ -1,254 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('C': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('G': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('T': FqName@8) = null
-    packageFragments('UR': FqName@9) = null
-    packageFragments('Unit': FqName@10) = null
-    packageFragments('example': FqName@11) = null
-    packageFragments('example.A': FqName@12) = null
-    packageFragments('example.C': FqName@13) = null
-    packageFragments('example.CG': FqName@14) = null
-    packageFragments('example.E': FqName@15) = null
-    packageFragments('example.ERROR': FqName@16) = null
-    packageFragments('example.G': FqName@17) = null
-    packageFragments('example.Int': FqName@18) = null
-    packageFragments('example.String': FqName@19) = null
-    packageFragments('example.T': FqName@20) = null
-    packageFragments('example.UR': FqName@21) = null
-    packageFragments('example.Unit': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.C': FqName@27) = null
-    packageFragments('java.lang.E': FqName@28) = null
-    packageFragments('java.lang.G': FqName@29) = null
-    packageFragments('java.lang.Int': FqName@30) = null
-    packageFragments('java.lang.String': FqName@31) = null
-    packageFragments('java.lang.T': FqName@32) = null
-    packageFragments('java.lang.UR': FqName@33) = null
-    packageFragments('java.lang.Unit': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = null
-    packageFragments('kotlin.C': FqName@36) = null
-    packageFragments('kotlin.E': FqName@37) = null
-    packageFragments('kotlin.G': FqName@38) = null
-    packageFragments('kotlin.Int': FqName@39) = null
-    packageFragments('kotlin.String': FqName@40) = null
-    packageFragments('kotlin.T': FqName@41) = null
-    packageFragments('kotlin.UR': FqName@42) = null
-    packageFragments('kotlin.Unit': FqName@43) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('E': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('UR': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('foo': Name@55) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-ResolutionTaskHolder@60 {
-    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@122 }
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
-
-null {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@80 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@92 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@122 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@62 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@83 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@104 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@74 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@59 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@86 }
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-    <name not found> = EmptyList@50[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.lazy.log
deleted file mode 100644
index 6b39e2070db..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/ambigousLabelOnThis.lazy.log
+++ /dev/null
@@ -1,23 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Dup': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Unit': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Unit': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
deleted file mode 100644
index 1dc24edcf33..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
+++ /dev/null
@@ -1,27 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('ATrait': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.A': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.A': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-ResolutionTaskHolder@20 {
-    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
-}
-
-null {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@22 }
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
deleted file mode 100644
index 5ddf9c4b059..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.String': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
deleted file mode 100644
index a6a92f82c8a..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A1': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = null
-    packageFragments('kotlin.io': FqName@9) = null
-    packageFragments('kotlin.jvm': FqName@10) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('identityEquals': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('identityEquals': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('identityEquals': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('identityEquals': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@22 {
-    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
-
-null {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@24 }
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-    <name not found> = EmptyList@14[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
deleted file mode 100644
index 9f18bbbab68..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Nothing': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Nothing': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Nothing': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Nothing': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-ResolutionTaskHolder@24 {
-    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
-}
-
-null {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@26 }
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
deleted file mode 100644
index 20d0e2a0ce1..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Any': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Any': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('any': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('any': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('any': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('any': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
deleted file mode 100644
index 45cfda09392..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,58 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Any': FqName@4) = null
-    packageFragments('B': FqName@5) = null
-    packageFragments('Char': FqName@6) = null
-    packageFragments('Double': FqName@7) = null
-    packageFragments('Int': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Char': FqName@16) = null
-    packageFragments('java.lang.Double': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.B': FqName@22) = null
-    packageFragments('kotlin.Char': FqName@23) = null
-    packageFragments('kotlin.Double': FqName@24) = null
-    packageFragments('kotlin.Int': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = null
-    packageFragments('kotlin.jvm': FqName@27) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Char': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Double': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-}
-
-null {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@53[8] { ResolutionCandidate@44, ResolutionCandidate@45, ResolutionCandidate@46, ... }
-    <name not found> = ArrayList@54[8] { ResolutionCandidate@49, ResolutionCandidate@50, ResolutionCandidate@51, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.lazy.log
deleted file mode 100644
index 003ea392578..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInInnerClasses.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['A']
-    <name not found> = JetTypeImpl@2['B']
-    <name not found> = JetTypeImpl@3['B']
-}
-
-LazyJavaPackageFragmentProvider@4 {
-    packageFragments('<root>': FqName@5) = LazyJavaPackageFragment@6['<root>']
-    packageFragments('A': FqName@7) = null
-    packageFragments('B': FqName@8) = null
-    packageFragments('Int': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.B': FqName@19) = null
-    packageFragments('kotlin.Int': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = null
-    packageFragments('kotlin.jvm': FqName@22) = null
-}
-
-LazyJavaPackageFragment@6['<root>'] {
-    classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.lazy.log
deleted file mode 100644
index 61997f2c271..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Base': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Base': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-    packageFragments('test': FqName@18) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.lazy.log
deleted file mode 100644
index 08e42c8ed59..00000000000
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInToplevelFunction.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Unit': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Unit': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Unit': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Unit': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
deleted file mode 100644
index 436fef2f00c..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
+++ /dev/null
@@ -1,33 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Abstract': FqName@3) = null
-    packageFragments('AbstractDerived': FqName@4) = null
-    packageFragments('Required': FqName@5) = null
-    packageFragments('Trait': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Abstract': FqName@11) = null
-    packageFragments('java.lang.Required': FqName@12) = null
-    packageFragments('java.lang.Trait': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Abstract': FqName@15) = null
-    packageFragments('kotlin.Required': FqName@16) = null
-    packageFragments('kotlin.Trait': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
deleted file mode 100644
index 8192b1f54b8..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-ClosureExpressionsTypingVisitor$1@0 {
-    <name not found> = JetTypeImpl@1['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@2 {
-    <name not found> = JetTypeImpl@3['<no name provided>']
-}
-
-DescriptorResolver@4 {
-    <name not found> = JetTypeImpl@5['A']
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@6 {
-    packageFragments('<root>': FqName@7) = LazyJavaPackageFragment@8['<root>']
-    packageFragments('A': FqName@9) = null
-    packageFragments('Required': FqName@10) = null
-    packageFragments('a': FqName@11) = null
-    packageFragments('b': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.A': FqName@17) = null
-    packageFragments('java.lang.Required': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.Required': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
deleted file mode 100644
index 92355f70b3c..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
+++ /dev/null
@@ -1,45 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('Generic': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('Y': FqName@8) = null
-    packageFragments('Z': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.A': FqName@14) = null
-    packageFragments('java.lang.B': FqName@15) = null
-    packageFragments('java.lang.Generic': FqName@16) = null
-    packageFragments('java.lang.Int': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.A': FqName@20) = null
-    packageFragments('kotlin.B': FqName@21) = null
-    packageFragments('kotlin.Generic': FqName@22) = null
-    packageFragments('kotlin.Int': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-null {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
deleted file mode 100644
index f3b621bce48..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
+++ /dev/null
@@ -1,70 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Base']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Base': FqName@5) = null
-    packageFragments('Derived': FqName@6) = null
-    packageFragments('DerivedImpl': FqName@7) = null
-    packageFragments('ObjectImpl': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.Base': FqName@13) = null
-    packageFragments('java.lang.Derived': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.Base': FqName@16) = null
-    packageFragments('kotlin.Derived': FqName@17) = null
-    packageFragments('kotlin.io': FqName@18) = null
-    packageFragments('kotlin.jvm': FqName@19) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('f1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('f1': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('f1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f1': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-}
-
-null {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.lazy.log
deleted file mode 100644
index a2e73c76bdb..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/manyRequirementsDisallowed.lazy.log
+++ /dev/null
@@ -1,22 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.A': FqName@10) = null
-    packageFragments('java.lang.B': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.A': FqName@13) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
deleted file mode 100644
index 121b73cbd59..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
+++ /dev/null
@@ -1,47 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('D': FqName@6) = null
-    packageFragments('Required': FqName@7) = null
-    packageFragments('W': FqName@8) = null
-    packageFragments('X': FqName@9) = null
-    packageFragments('Y': FqName@10) = null
-    packageFragments('Z': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.A': FqName@16) = null
-    packageFragments('java.lang.B': FqName@17) = null
-    packageFragments('java.lang.C': FqName@18) = null
-    packageFragments('java.lang.D': FqName@19) = null
-    packageFragments('java.lang.Required': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = null
-    packageFragments('kotlin.A': FqName@22) = null
-    packageFragments('kotlin.B': FqName@23) = null
-    packageFragments('kotlin.C': FqName@24) = null
-    packageFragments('kotlin.D': FqName@25) = null
-    packageFragments('kotlin.Required': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = null
-    packageFragments('kotlin.jvm': FqName@28) = null
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@40 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
deleted file mode 100644
index a69673e1525..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('RequiredBase': FqName@5) = null
-    packageFragments('RequiredDerived': FqName@6) = null
-    packageFragments('Trait': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.RequiredBase': FqName@12) = null
-    packageFragments('java.lang.RequiredDerived': FqName@13) = null
-    packageFragments('java.lang.Trait': FqName@14) = null
-    packageFragments('kotlin': FqName@15) = null
-    packageFragments('kotlin.RequiredBase': FqName@16) = null
-    packageFragments('kotlin.RequiredDerived': FqName@17) = null
-    packageFragments('kotlin.Trait': FqName@18) = null
-    packageFragments('kotlin.io': FqName@19) = null
-    packageFragments('kotlin.jvm': FqName@20) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@32 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
deleted file mode 100644
index 2eb976e6745..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
+++ /dev/null
@@ -1,41 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('First': FqName@3) = null
-    packageFragments('Required': FqName@4) = null
-    packageFragments('Second': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('Y': FqName@7) = null
-    packageFragments('Z': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.First': FqName@13) = null
-    packageFragments('java.lang.Required': FqName@14) = null
-    packageFragments('java.lang.Second': FqName@15) = null
-    packageFragments('java.lang.String': FqName@16) = null
-    packageFragments('kotlin': FqName@17) = null
-    packageFragments('kotlin.First': FqName@18) = null
-    packageFragments('kotlin.Required': FqName@19) = null
-    packageFragments('kotlin.Second': FqName@20) = null
-    packageFragments('kotlin.String': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-null {
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
deleted file mode 100644
index 7267b8aa1f6..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('AnyTrait': FqName@4) = null
-    packageFragments('Bar': FqName@5) = null
-    packageFragments('Foo': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Any': FqName@11) = null
-    packageFragments('java.lang.AnyTrait': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.AnyTrait': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
deleted file mode 100644
index 9b88a76b14c..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
+++ /dev/null
@@ -1,37 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Foo': FqName@3) = null
-    packageFragments('Foo1': FqName@4) = null
-    packageFragments('Foo12': FqName@5) = null
-    packageFragments('Foo2': FqName@6) = null
-    packageFragments('bar': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Foo': FqName@12) = null
-    packageFragments('java.lang.bar': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Foo': FqName@15) = null
-    packageFragments('kotlin.bar': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.lazy.log
deleted file mode 100644
index 0a57293a9fc..00000000000
--- a/compiler/testData/diagnostics/tests/traitWithRequired/uninheritableTraitDifferentGenericArguments.lazy.log
+++ /dev/null
@@ -1,36 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('B': FqName@4) = null
-    packageFragments('C': FqName@5) = null
-    packageFragments('Generic': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.B': FqName@14) = null
-    packageFragments('java.lang.Generic': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.A': FqName@19) = null
-    packageFragments('kotlin.B': FqName@20) = null
-    packageFragments('kotlin.Generic': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
-}
diff --git a/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.lazy.log b/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.lazy.log
deleted file mode 100644
index aa2c933144a..00000000000
--- a/compiler/testData/diagnostics/tests/typedefs/TypedefsUnsupported.lazy.log
+++ /dev/null
@@ -1,15 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('java': FqName@3) = LazyJavaPackageFragment@4['java']
-    packageFragments('java.lang': FqName@5) = LazyJavaPackageFragment@6['lang']
-    packageFragments('kotlin': FqName@7) = null
-    packageFragments('kotlin.io': FqName@8) = null
-    packageFragments('kotlin.jvm': FqName@9) = null
-}
-
-LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
-}
diff --git a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log b/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
deleted file mode 100644
index 46353246c60..00000000000
--- a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
+++ /dev/null
@@ -1,50 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Unit': FqName@9) = null
-    packageFragments('kotlin': FqName@10) = null
-    packageFragments('kotlin.Unit': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = null
-    packageFragments('kotlin.jvm': FqName@13) = null
-    packageFragments('x': FqName@14) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Unit': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
-
-null {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
-    <name not found> = EmptyList@19[empty]
-    <name not found> = EmptyList@19[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
deleted file mode 100644
index 843613d8ec9..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
+++ /dev/null
@@ -1,54 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['String']
-    <name not found> = JetTypeImpl@1['String']
-}
-
-LazyJavaPackageFragmentProvider@2 {
-    packageFragments('<root>': FqName@3) = LazyJavaPackageFragment@4['<root>']
-    packageFragments('Int': FqName@5) = null
-    packageFragments('String': FqName@6) = null
-    packageFragments('java': FqName@7) = LazyJavaPackageFragment@8['java']
-    packageFragments('java.lang': FqName@9) = LazyJavaPackageFragment@10['lang']
-    packageFragments('java.lang.Int': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Int': FqName@14) = null
-    packageFragments('kotlin.String': FqName@15) = null
-    packageFragments('kotlin.io': FqName@16) = null
-    packageFragments('kotlin.jvm': FqName@17) = null
-}
-
-LazyJavaPackageFragment@4['<root>'] {
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-null {
-    <name not found> = ArrayList@35[2] { ResolutionCandidate@33, ResolutionCandidate@34 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
deleted file mode 100644
index 259966cbbee..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
+++ /dev/null
@@ -1,52 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('D': FqName@4) = null
-    packageFragments('String': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.D': FqName@11) = null
-    packageFragments('java.lang.String': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.D': FqName@15) = null
-    packageFragments('kotlin.String': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-}
-
-ResolutionTaskHolder@34 {
-    <name not found> = ArrayList@35[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@44[2] { ResolutionCandidate@36, ResolutionCandidate@37 }
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
deleted file mode 100644
index b6df6c527a6..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
+++ /dev/null
@@ -1,209 +0,0 @@
-LazyJavaClassDescriptor@0['C'] {
-    defaultType = JetTypeImpl@1['C']
-    enumEntryIndex = LinkedHashMap@2 // through LazyJavaClassMemberScope@3
-    functions('from': Name@4) = ArrayList@5[5] { JavaMethodDescriptor@6['from'], JavaMethodDescriptor@7['from'], JavaMethodDescriptor@8['from'], ... } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
-    nestedClasses('from': Name@4) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['C']
-}
-
-LazyJavaClassTypeConstructor@12['C'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
-}
-
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
-}
-
-LazyJavaClassifierType@19['String'] {
-    arguments = ArrayList@20[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@27['String'] {
-    arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@30['String'] {
-    arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@33['String'] {
-    arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@39['String'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@29['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@42['String'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@32['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@44['String'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@21['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@46['String'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@48['String'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@35['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaClassifierType@50['String'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@26['String']
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@23
-}
-
-LazyJavaPackageFragmentProvider@52 {
-    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('Array': FqName@55) = null
-    packageFragments('C': FqName@56) = null
-    packageFragments('String': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.Array': FqName@62) = null
-    packageFragments('java.lang.C': FqName@63) = null
-    packageFragments('java.lang.String': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Array': FqName@66) = null
-    packageFragments('kotlin.C': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['C']) = LazyJavaClassDescriptor@0['C']
-}
-
-LazyJavaPackageFragment@54['<root>'] {
-    classes('Array': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@74) = LazyJavaClassDescriptor@0['C'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = ArrayList@122[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@144[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
-    <name not found> = ArrayList@145[5] { ResolutionCandidate@133, ResolutionCandidate@134, ResolutionCandidate@135, ... }
-    <name not found> = ArrayList@146[5] { ResolutionCandidate@123, ResolutionCandidate@124, ResolutionCandidate@125, ... }
-    <name not found> = ArrayList@147[5] { ResolutionCandidate@128, ResolutionCandidate@129, ResolutionCandidate@130, ... }
-    <name not found> = ArrayList@148[5] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120, ... }
-    <name not found> = ArrayList@149[5] { ResolutionCandidate@113, ResolutionCandidate@114, ResolutionCandidate@115, ... }
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
deleted file mode 100644
index 685d0513022..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
+++ /dev/null
@@ -1,85 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('IntArray': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo0': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('IntArray': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo0': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('IntArray': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo0': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('IntArray': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo0': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@49[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@50[2] { ResolutionCandidate@46, ResolutionCandidate@47 }
-    <name not found> = ArrayList@51[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = ArrayList@52[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
deleted file mode 100644
index 9740a393868..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('String': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.String': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.String': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('IntArray': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('foo1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('IntArray': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('IntArray': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('IntArray': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-null {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@46[2] { ResolutionCandidate@42, ResolutionCandidate@43 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
deleted file mode 100644
index 7c1465a9aa8..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaClassDescriptor@0['JavaClass'] {
-    constructors = ArrayList@1[2] { JavaConstructorDescriptor@2['<init>'], JavaConstructorDescriptor@3['<init>'] } // through LazyJavaClassMemberScope@4
-    defaultType = JetTypeImpl@5['JavaClass']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@6['JavaClass']
-}
-
-LazyJavaClassTypeConstructor@6['JavaClass'] {
-    parameters = ArrayList@7[empty]
-}
-
-LazyJavaClassifierType@8['String'] {
-    arguments = ArrayList@9[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'false': Boolean@11
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'true': Boolean@15
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('kotlin': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = null
-    packageFragments('kotlin.jvm': FqName@25) = null
-    topLevelClasses(JavaClassImpl@26['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('JavaClass': Name@27) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('JavaClass': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('JavaClass': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('JavaClass': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = ArrayList@43[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@46[2] { ResolutionCandidate@40, ResolutionCandidate@41 }
-    <name not found> = ArrayList@47[2] { ResolutionCandidate@44, ResolutionCandidate@45 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
deleted file mode 100644
index 5d410a933cf..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-LazyJavaClassDescriptor@0['JavaClass'] {
-    constructors = ArrayList@1[1] { JavaConstructorDescriptor@2['<init>'] } // through LazyJavaClassMemberScope@3
-    defaultType = JetTypeImpl@4['JavaClass']
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@3
-    functionTypeForSamInterface = null
-    functions('from': Name@6) = ArrayList@7[2] { JavaMethodDescriptor@8['from'], JavaMethodDescriptor@9['from'] } // through LazyJavaClassMemberScope@3
-    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@3
-    nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
-    nestedClasses('from': Name@6) = null // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['JavaClass']
-}
-
-LazyJavaClassTypeConstructor@13['JavaClass'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
-}
-
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@24
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('Array': FqName@36) = null
-    packageFragments('String': FqName@37) = null
-    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    packageFragments('java.lang.Array': FqName@42) = null
-    packageFragments('java.lang.String': FqName@43) = null
-    packageFragments('kotlin': FqName@44) = null
-    packageFragments('kotlin.Array': FqName@45) = null
-    packageFragments('kotlin.String': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = null
-    topLevelClasses(JavaClassImpl@49['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('Array': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('JavaClass': Name@52) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('String': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('JavaClass': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@39['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@41['lang'] {
-    classes('JavaClass': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('JavaClass': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@69 {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
-}
-
-null {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@71 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@68 }
-    <name not found> = ArrayList@87[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@88[2] { ResolutionCandidate@78, ResolutionCandidate@79 }
-    <name not found> = ArrayList@89[2] { ResolutionCandidate@82, ResolutionCandidate@83 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
deleted file mode 100644
index f4ead9acf7b..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
+++ /dev/null
@@ -1,35 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('IntArray': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.IntArray': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.IntArray': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('IntArray': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-}
-
-null {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@28 }
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
deleted file mode 100644
index 5f969de0c8a..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
+++ /dev/null
@@ -1,44 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('IntArray': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('java.lang.IntArray': FqName@11) = null
-    packageFragments('kotlin': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.IntArray': FqName@14) = null
-    packageFragments('kotlin.io': FqName@15) = null
-    packageFragments('kotlin.jvm': FqName@16) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('IntArray': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('t': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('t': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
deleted file mode 100644
index 8e5799195d2..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Array<1>']
-    <name not found> = JetTypeImpl@2['Array<1>']
-    <name not found> = JetTypeImpl@3['IntArray']
-    <name not found> = JetTypeImpl@3['IntArray']
-    <name not found> = JetTypeImpl@4['LongArray']
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('Int': FqName@8) = null
-    packageFragments('Long': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('java': FqName@11) = LazyJavaPackageFragment@12['java']
-    packageFragments('java.lang': FqName@13) = LazyJavaPackageFragment@14['lang']
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.Long': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('kotlin': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.Long': FqName@20) = null
-    packageFragments('kotlin.T': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = null
-    packageFragments('kotlin.jvm': FqName@23) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('Long': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('array': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-}
-
-LazyJavaPackageFragment@14['lang'] {
-    classes('array': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('array': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
-
-null {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@43 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@71[2] { ResolutionCandidate@55, ResolutionCandidate@56 }
-    <name not found> = ArrayList@72[2] { ResolutionCandidate@59, ResolutionCandidate@60 }
-    <name not found> = ArrayList@73[3] { ResolutionCandidate@63, ResolutionCandidate@64, ResolutionCandidate@65 }
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-    <name not found> = EmptyList@30[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
deleted file mode 100644
index 9bc806018dd..00000000000
--- a/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
+++ /dev/null
@@ -1,76 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-ResolutionTaskHolder@38 {
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
-
-null {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-    <name not found> = EmptyList@21[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
deleted file mode 100644
index 2a0b73a8c0b..00000000000
--- a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
+++ /dev/null
@@ -1,43 +0,0 @@
-LazyAnnotationDescriptor@0 {
-    resolutionResults = OverloadResolutionResultsImpl@1
-    type = JetTypeImpl@2['ann']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('Int': FqName@6) = null
-    packageFragments('ann': FqName@7) = null
-    packageFragments('java': FqName@8) = LazyJavaPackageFragment@9['java']
-    packageFragments('java.lang': FqName@10) = LazyJavaPackageFragment@11['lang']
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('java.lang.ann': FqName@13) = null
-    packageFragments('kotlin': FqName@14) = null
-    packageFragments('kotlin.Int': FqName@15) = null
-    packageFragments('kotlin.ann': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
-}
-
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-}
-
-null {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@29 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
deleted file mode 100644
index 840e8320750..00000000000
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
+++ /dev/null
@@ -1,293 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = NullableType@2
-    <name not found> = NullableType@3
-}
-
-LazyJavaClassDescriptor@4['J'] {
-    enumEntryIndex = LinkedHashMap@5 // through LazyJavaClassMemberScope@6
-    functions('foo': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['foo'] } // through LazyJavaStaticClassScope@10
-    functions('foo': Name@7) = EmptyList@11[empty] // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@6
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@6
-    nestedClasses('foo': Name@7) = null // through LazyJavaClassMemberScope@6
-    properties('foo': Name@7) = EmptyList@11[empty] // through LazyJavaClassMemberScope@6
-    properties('foo': Name@7) = EmptyList@11[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@15['J']
-}
-
-LazyJavaClassTypeConstructor@15['J'] {
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
-}
-
-LazyJavaClassifierType@18['E'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['E']
-    nullable = 'false': Boolean@21
-    typeConstructor = TypeConstructorImpl$1@22
-}
-
-LazyJavaClassifierType@23['E'] {
-    arguments = ArrayList@24[empty]
-    classifier = JavaClassImpl@20['E']
-    nullable = 'true': Boolean@25
-    typeConstructor = TypeConstructorImpl$1@22
-}
-
-LazyJavaClassifierType@26['Object'] {
-    classifier = JavaClassImpl@27['Object']
-    typeConstructor = DeserializedClassTypeConstructor@28
-}
-
-LazyJavaPackageFragmentProvider@29 {
-    packageFragments('<root>': FqName@30) = LazyJavaPackageFragment@31['<root>']
-    packageFragments('E': FqName@32) = null
-    packageFragments('J': FqName@33) = null
-    packageFragments('Nothing': FqName@34) = null
-    packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
-    packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
-    packageFragments('java.lang.E': FqName@39) = null
-    packageFragments('java.lang.J': FqName@40) = null
-    packageFragments('java.lang.Nothing': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.E': FqName@43) = null
-    packageFragments('kotlin.J': FqName@44) = null
-    packageFragments('kotlin.Nothing': FqName@45) = null
-    packageFragments('kotlin.io': FqName@46) = null
-    packageFragments('kotlin.jvm': FqName@47) = null
-    topLevelClasses(JavaClassImpl@48['J']) = LazyJavaClassDescriptor@4['J']
-}
-
-LazyJavaPackageFragment@31['<root>'] {
-    classes('J': Name@49) = LazyJavaClassDescriptor@4['J'] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Nothing': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('nullableNothing': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('nullableNothing': Name@52) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@36['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@57) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@38['lang'] {
-    classes('nullableNothing': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('nullableNothing': Name@52) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-ResolutionTaskHolder@61 {
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@63 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
deleted file mode 100644
index 9977dca30fe..00000000000
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('E': FqName@4) = null
-    packageFragments('Int': FqName@5) = null
-    packageFragments('java': FqName@6) = LazyJavaPackageFragment@7['java']
-    packageFragments('java.lang': FqName@8) = LazyJavaPackageFragment@9['lang']
-    packageFragments('java.lang.Any': FqName@10) = null
-    packageFragments('java.lang.E': FqName@11) = null
-    packageFragments('java.lang.Int': FqName@12) = null
-    packageFragments('kotlin': FqName@13) = null
-    packageFragments('kotlin.Any': FqName@14) = null
-    packageFragments('kotlin.E': FqName@15) = null
-    packageFragments('kotlin.Int': FqName@16) = null
-    packageFragments('kotlin.io': FqName@17) = null
-    packageFragments('kotlin.jvm': FqName@18) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@40 {
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@43 {
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-}
-
-ResolutionTaskHolder@46 {
-    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
-}
-
-ResolutionTaskHolder@49 {
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
-}
-
-ResolutionTaskHolder@52 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-null {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@55[1] { ResolutionCandidate@34 }
-    <name not found> = ArrayList@56[1] { ResolutionCandidate@36 }
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@51 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@42 }
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@39 }
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@48 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
deleted file mode 100644
index bb2617c8260..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@30 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
deleted file mode 100644
index 1d3986d70ce..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
+++ /dev/null
@@ -1,39 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-ResolutionTaskHolder@28 {
-    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
-}
-
-null {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@30 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
deleted file mode 100644
index 9b69688d59e..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
+++ /dev/null
@@ -1,70 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('Unit': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Int': FqName@9) = null
-    packageFragments('java.lang.Unit': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Int': FqName@12) = null
-    packageFragments('kotlin.Unit': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('r': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('r': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
-}
-
-LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('r': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('r': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-ResolutionTaskHolder@30 {
-    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = EmptyList@22[empty]
-}
-
-ResolutionTaskHolder@36 {
-    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
-}
-
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-}
-
-null {
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@32 }
-    <name not found> = ArrayList@43[1] { ResolutionCandidate@38 }
-    <name not found> = ArrayList@44[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@41 }
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-    <name not found> = EmptyList@22[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
deleted file mode 100644
index 6e4ad18fa72..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
+++ /dev/null
@@ -1,66 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('r': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('r': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('r': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('r': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
-}
-
-ResolutionTaskHolder@26 {
-    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@32 {
-    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
-}
-
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-}
-
-null {
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@28 }
-    <name not found> = ArrayList@39[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@41[1] { ResolutionCandidate@34 }
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
deleted file mode 100644
index bb081375732..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Any': FqName@3) = null
-    packageFragments('Int': FqName@4) = null
-    packageFragments('java': FqName@5) = LazyJavaPackageFragment@6['java']
-    packageFragments('java.lang': FqName@7) = LazyJavaPackageFragment@8['lang']
-    packageFragments('java.lang.Any': FqName@9) = null
-    packageFragments('java.lang.Int': FqName@10) = null
-    packageFragments('kotlin': FqName@11) = null
-    packageFragments('kotlin.Any': FqName@12) = null
-    packageFragments('kotlin.Int': FqName@13) = null
-    packageFragments('kotlin.io': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
-LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-}
-
-null {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
deleted file mode 100644
index ef5bd35001f..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
deleted file mode 100644
index ef5bd35001f..00000000000
--- a/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
+++ /dev/null
@@ -1,30 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('Int': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.Int': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = null
-    packageFragments('kotlin.Int': FqName@10) = null
-    packageFragments('kotlin.io': FqName@11) = null
-    packageFragments('kotlin.jvm': FqName@12) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
-}
-
-ResolutionTaskHolder@21 {
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-}
-
-null {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
-}
diff --git a/compiler/testData/diagnostics/tests/when/When.lazy.log b/compiler/testData/diagnostics/tests/when/When.lazy.log
deleted file mode 100644
index 9c12e55fa5a..00000000000
--- a/compiler/testData/diagnostics/tests/when/When.lazy.log
+++ /dev/null
@@ -1,237 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('Any': FqName@4) = null
-    packageFragments('Boolean': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('String': FqName@7) = null
-    packageFragments('_type_test': FqName@8) = null
-    packageFragments('a': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Any': FqName@14) = null
-    packageFragments('java.lang.Boolean': FqName@15) = null
-    packageFragments('java.lang.Int': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.a': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = null
-    packageFragments('kotlin.Any': FqName@20) = null
-    packageFragments('kotlin.Boolean': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.a': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Any': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Boolean': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('a': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('a': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@28
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('a': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-ResolutionTaskHolder@44 {
-    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = ArrayList@75[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-null {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@46 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@105[7] { ResolutionCandidate@81, ResolutionCandidate@82, ResolutionCandidate@83, ... }
-    <name not found> = ArrayList@106[7] { ResolutionCandidate@76, ResolutionCandidate@77, ResolutionCandidate@78, ... }
-    <name not found> = ArrayList@107[8] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
deleted file mode 100644
index fa4a43f4175..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/ClassObjectAnnotatedWithItsClass.lazy.log
+++ /dev/null
@@ -1,485 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@8['internal']
-    defaultType = JetTypeImpl@9['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@10['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@11['kotlin']
-    defaultType = JetTypeImpl@12['inline']
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@17['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@18
-    upperBounds = LinkedHashSet@19[1] { DeserializedType@20['kotlin.Any'] }
-}
-
-DeserializedType@21['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
-}
-
-DeserializedType@22['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@18
-}
-
-DeserializedType@23['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
-}
-
-DeserializedType@24['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@25['Class']
-    memberScope = SubstitutingScope@26
-}
-
-DeserializedType@27['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@25['Class']
-    memberScope = SubstitutingScope@28
-}
-
-DeserializedType@20['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@29
-    memberScope = DeserializedClassMemberScope@30
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@29
-    memberScope = DeserializedClassMemberScope@30
-}
-
-LazyAnnotationDescriptor@31 {
-    resolutionResults = OverloadResolutionResultsImpl@32
-    type = JetTypeImpl@33['AnnClass']
-    valueArguments(ValueParameterDescriptorImpl@34['a']) = JavaClassValue@35
-}
-
-LazyJavaClassDescriptor@36['AnnotatedElement'] {
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@42['Class'] {
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@44
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@44
-    nestedClasses('invoke': Name@37) = null // through LazyJavaClassMemberScope@44
-    typeConstructor = LazyJavaClassTypeConstructor@25['Class']
-}
-
-LazyJavaClassDescriptor@47['GenericDeclaration'] {
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@51['Serializable'] {
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@52
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@52
-    typeConstructor = LazyJavaClassTypeConstructor@54['Serializable']
-}
-
-LazyJavaClassDescriptor@55['Type'] {
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@56
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@56
-    typeConstructor = LazyJavaClassTypeConstructor@58['Type']
-}
-
-LazyJavaClassTypeConstructor@41['AnnotatedElement'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@25['Class'] {
-    parameters = ArrayList@62[1] { LazyJavaTypeParameterDescriptor@63['T'] }
-    supertypes = ArrayList@64[4] { LazyJavaClassifierType@65['Serializable'], LazyJavaClassifierType@66['GenericDeclaration'], LazyJavaClassifierType@67['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@50['GenericDeclaration'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@54['Serializable'] {
-    parameters = ArrayList@70[empty]
-    supertypes = ArrayList@71[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassTypeConstructor@58['Type'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@74['AnnotatedElement'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaClassImpl@76['AnnotatedElement']
-    memberScope = LazyJavaClassMemberScope@39
-    typeConstructor = LazyJavaClassTypeConstructor@41['AnnotatedElement']
-}
-
-LazyJavaClassifierType@66['GenericDeclaration'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@78['GenericDeclaration']
-    memberScope = LazyJavaClassMemberScope@48
-    typeConstructor = LazyJavaClassTypeConstructor@50['GenericDeclaration']
-}
-
-LazyJavaClassifierType@79['Object'] {
-    classifier = JavaClassImpl@80['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@83['Object'] {
-    classifier = JavaClassImpl@84['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@85['Object'] {
-    classifier = JavaClassImpl@86['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@87['Object'] {
-    classifier = JavaClassImpl@88['Object']
-    typeConstructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaClassifierType@65['Serializable'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@90['Serializable']
-    memberScope = LazyJavaClassMemberScope@52
-    typeConstructor = LazyJavaClassTypeConstructor@54['Serializable']
-}
-
-LazyJavaClassifierType@67['Type'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['Type']
-    memberScope = LazyJavaClassMemberScope@56
-    typeConstructor = LazyJavaClassTypeConstructor@58['Type']
-}
-
-LazyJavaPackageFragmentProvider@93 {
-    packageFragments('<root>': FqName@94) = LazyJavaPackageFragment@95['<root>']
-    packageFragments('AnnClass': FqName@96) = null
-    packageFragments('Class': FqName@97) = null
-    packageFragments('MyClass': FqName@98) = null
-    packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
-    packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
-    packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
-    packageFragments('java.lang.AnnClass': FqName@105) = null
-    packageFragments('java.lang.Class': FqName@106) = null
-    packageFragments('java.lang.MyClass': FqName@107) = null
-    packageFragments('java.lang.reflect': FqName@108) = LazyJavaPackageFragment@109['reflect']
-    packageFragments('kotlin': FqName@110) = LazyJavaPackageFragment@11['kotlin']
-    packageFragments('kotlin.AnnClass': FqName@111) = null
-    packageFragments('kotlin.Class': FqName@112) = null
-    packageFragments('kotlin.MyClass': FqName@113) = null
-    packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
-    packageFragments('kotlin.io.AnnClass': FqName@116) = null
-    packageFragments('kotlin.io.Class': FqName@117) = null
-    packageFragments('kotlin.io.MyClass': FqName@118) = null
-    packageFragments('kotlin.jvm': FqName@119) = LazyJavaPackageFragment@120['jvm']
-    packageFragments('kotlin.jvm.AnnClass': FqName@121) = null
-    packageFragments('kotlin.jvm.Class': FqName@122) = null
-    packageFragments('kotlin.jvm.MyClass': FqName@123) = null
-    packageFragments('kotlin.jvm.internal': FqName@124) = LazyJavaPackageFragment@8['internal']
-    packageFragments('test': FqName@125) = null
-    packageFragments('test.AnnClass': FqName@126) = null
-    packageFragments('test.Class': FqName@127) = null
-    packageFragments('test.MyClass': FqName@128) = null
-    topLevelClasses(JavaClassImpl@76['AnnotatedElement']) = LazyJavaClassDescriptor@36['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@129['Class']) = LazyJavaClassDescriptor@42['Class']
-    topLevelClasses(JavaClassImpl@78['GenericDeclaration']) = LazyJavaClassDescriptor@47['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@90['Serializable']) = LazyJavaClassDescriptor@51['Serializable']
-    topLevelClasses(JavaClassImpl@92['Type']) = LazyJavaClassDescriptor@55['Type']
-}
-
-LazyJavaPackageFragment@8['internal'] {
-    classes('Intrinsic': Name@130) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaPackageFragment@115['io'] {
-    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = DeserializedPackageMemberScope@135 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('invoke': Name@37) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
-    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
-    membersProtos = LinkedHashMap@137 // through DeserializedPackageMemberScope@135
-    properties('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
-}
-
-LazyJavaPackageFragment@100['java'] {
-    classes('lang': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('lang': Name@141) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@139
-}
-
-LazyJavaPackageFragment@120['jvm'] {
-    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@143
-}
-
-LazyJavaPackageFragment@11['kotlin'] {
-    classes('Any': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('inline': Name@147) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('io': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('jvm': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = DeserializedPackageMemberScope@150 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('invoke': Name@37) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('io': Name@151) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
-    functions('io': Name@151) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('javaClass': Name@134) = ArrayList@152[1] { DeserializedSimpleFunctionDescriptor@153['javaClass'] } // through DeserializedPackageMemberScope@150
-    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
-    functions('jvm': Name@154) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
-    membersProtos = LinkedHashMap@156 // through DeserializedPackageMemberScope@150
-    properties('io': Name@151) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
-    properties('javaClass': Name@134) = ArrayList@157[1] { DeserializedPropertyDescriptor@158['javaClass'] } // through DeserializedPackageMemberScope@150
-    properties('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
-}
-
-LazyJavaPackageFragment@104['lang'] {
-    classes('Class': Name@132) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
-}
-
-LazyJavaTypeParameterDescriptor@63['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@161
-    upperBounds = LinkedHashSet@162[1] { NullableType@163 }
-    upperBoundsAsType = NullableType@163
-}
-
-LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@165['T']) = LazyJavaTypeParameterDescriptor@63['T']
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
-
-TypeDeserializer@180 {
-    classDescriptors('34': Integer@181) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@182) = DeserializedClassDescriptor@183['Any']
-}
-
-TypeDeserializer@184 {
-    classDescriptors('34': Integer@181) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@182) = DeserializedClassDescriptor@183['Any']
-}
-
-null {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-    <name not found> = EmptyList@38[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
deleted file mode 100644
index e101bae0472..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
+++ /dev/null
@@ -1,134 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformName']
-}
-
-DeserializedClassDescriptor@2['platformName'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-DeserializedType@5['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@6
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@11
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@15
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@19
-}
-
-LazyAnnotationDescriptor@20 {
-    resolutionResults = OverloadResolutionResultsImpl@21
-    type = JetTypeImpl@22['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@23
-}
-
-LazyJavaPackageFragmentProvider@24 {
-    packageFragments('<root>': FqName@25) = LazyJavaPackageFragment@26['<root>']
-    packageFragments('Any': FqName@27) = null
-    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    packageFragments('java.lang.Any': FqName@32) = null
-    packageFragments('java.lang.platformName': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@35['kotlin']
-    packageFragments('kotlin.Any': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
-    packageFragments('kotlin.io.Any': FqName@39) = null
-    packageFragments('kotlin.io.platformName': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = LazyJavaPackageFragment@42['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@43) = null
-    packageFragments('kotlin.jvm.platformName': FqName@44) = null
-    packageFragments('kotlin.platform': FqName@45) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.Any': FqName@46) = null
-    packageFragments('kotlin.platform.platformName': FqName@47) = null
-    packageFragments('kotlin.platformName': FqName@48) = null
-    packageFragments('platformName': FqName@49) = null
-}
-
-LazyJavaPackageFragment@26['<root>'] {
-    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('platformName': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('kotlin': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@38['io'] {
-    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@42['jvm'] {
-    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@35['kotlin'] {
-    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('String': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('io': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('jvm': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('platform': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@69 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('io': Name@70) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-    functions('io': Name@70) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('jvm': Name@71) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-    functions('jvm': Name@71) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-    functions('platform': Name@72) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@74 // through DeserializedPackageMemberScope@69
-    properties('io': Name@70) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-    properties('jvm': Name@71) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-    properties('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('platformName': Name@53) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-TypeDeserializer@88 {
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@90['String']
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@84 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
deleted file mode 100644
index 5d30b7446ac..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
+++ /dev/null
@@ -1,322 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformName']
-}
-
-DescriptorResolver@3 {
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-}
-
-DeserializedClassDescriptor@2['platformName'] {
-    containingDeclaration = LazyJavaPackageFragment@7['platform']
-    primaryConstructor = ConstructorDescriptorImpl@8['<init>']
-}
-
-DeserializedType@9['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@10
-}
-
-LazyAnnotationDescriptor@11 {
-    resolutionResults = OverloadResolutionResultsImpl@12
-    type = JetTypeImpl@13['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@15
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@19
-}
-
-LazyAnnotationDescriptor@20 {
-    resolutionResults = OverloadResolutionResultsImpl@21
-    type = JetTypeImpl@22['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@23
-}
-
-LazyAnnotationDescriptor@24 {
-    resolutionResults = OverloadResolutionResultsImpl@25
-    type = JetTypeImpl@26['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@27
-}
-
-LazyAnnotationDescriptor@28 {
-    resolutionResults = OverloadResolutionResultsImpl@29
-    type = JetTypeImpl@30['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@31
-}
-
-LazyAnnotationDescriptor@32 {
-    resolutionResults = OverloadResolutionResultsImpl@33
-    type = JetTypeImpl@34['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@35
-}
-
-LazyAnnotationDescriptor@36 {
-    resolutionResults = OverloadResolutionResultsImpl@37
-    type = JetTypeImpl@38['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@39
-}
-
-LazyAnnotationDescriptor@40 {
-    resolutionResults = OverloadResolutionResultsImpl@41
-    type = JetTypeImpl@42['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@43
-}
-
-LazyAnnotationDescriptor@44 {
-    resolutionResults = OverloadResolutionResultsImpl@45
-    type = JetTypeImpl@46['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@47
-}
-
-LazyAnnotationDescriptor@48 {
-    resolutionResults = OverloadResolutionResultsImpl@49
-    type = JetTypeImpl@50['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@51
-}
-
-LazyAnnotationDescriptor@52 {
-    resolutionResults = OverloadResolutionResultsImpl@53
-    type = JetTypeImpl@54['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@55
-}
-
-LazyAnnotationDescriptor@56 {
-    resolutionResults = OverloadResolutionResultsImpl@57
-    type = JetTypeImpl@58['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@59
-}
-
-LazyAnnotationDescriptor@60 {
-    resolutionResults = OverloadResolutionResultsImpl@61
-    type = JetTypeImpl@62['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@63
-}
-
-LazyAnnotationDescriptor@64 {
-    resolutionResults = OverloadResolutionResultsImpl@65
-    type = JetTypeImpl@66['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@67
-}
-
-LazyAnnotationDescriptor@68 {
-    resolutionResults = OverloadResolutionResultsImpl@69
-    type = JetTypeImpl@70['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@71
-}
-
-LazyAnnotationDescriptor@72 {
-    resolutionResults = OverloadResolutionResultsImpl@73
-    type = JetTypeImpl@74['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@75
-}
-
-LazyAnnotationDescriptor@76 {
-    resolutionResults = OverloadResolutionResultsImpl@77
-    type = JetTypeImpl@78['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@79
-}
-
-LazyAnnotationDescriptor@80 {
-    resolutionResults = OverloadResolutionResultsImpl@81
-    type = JetTypeImpl@82['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@83
-}
-
-LazyAnnotationDescriptor@84 {
-    resolutionResults = OverloadResolutionResultsImpl@85
-    type = JetTypeImpl@86['platformName']
-    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@87
-}
-
-LazyJavaPackageFragmentProvider@88 {
-    packageFragments('<root>': FqName@89) = LazyJavaPackageFragment@90['<root>']
-    packageFragments('Any': FqName@91) = null
-    packageFragments('C': FqName@92) = null
-    packageFragments('Int': FqName@93) = null
-    packageFragments('java': FqName@94) = LazyJavaPackageFragment@95['java']
-    packageFragments('java.lang': FqName@96) = LazyJavaPackageFragment@97['lang']
-    packageFragments('java.lang.Any': FqName@98) = null
-    packageFragments('java.lang.Int': FqName@99) = null
-    packageFragments('java.lang.platformName': FqName@100) = null
-    packageFragments('kotlin': FqName@101) = LazyJavaPackageFragment@102['kotlin']
-    packageFragments('kotlin.Any': FqName@103) = null
-    packageFragments('kotlin.Int': FqName@104) = null
-    packageFragments('kotlin.io': FqName@105) = LazyJavaPackageFragment@106['io']
-    packageFragments('kotlin.io.Any': FqName@107) = null
-    packageFragments('kotlin.io.Int': FqName@108) = null
-    packageFragments('kotlin.io.platformName': FqName@109) = null
-    packageFragments('kotlin.jvm': FqName@110) = LazyJavaPackageFragment@111['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@112) = null
-    packageFragments('kotlin.jvm.Int': FqName@113) = null
-    packageFragments('kotlin.jvm.platformName': FqName@114) = null
-    packageFragments('kotlin.platform': FqName@115) = LazyJavaPackageFragment@7['platform']
-    packageFragments('kotlin.platform.Any': FqName@116) = null
-    packageFragments('kotlin.platform.Int': FqName@117) = null
-    packageFragments('kotlin.platform.platformName': FqName@118) = null
-    packageFragments('kotlin.platformName': FqName@119) = null
-    packageFragments('platformName': FqName@120) = null
-    packageFragments('px': FqName@121) = null
-    packageFragments('valx': FqName@122) = null
-    packageFragments('vardef': FqName@123) = null
-    packageFragments('varx': FqName@124) = null
-}
-
-LazyJavaPackageFragment@90['<root>'] {
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('kotlin': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('platformName': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('kotlin': Name@131) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@126
-}
-
-LazyJavaPackageFragment@106['io'] {
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@134
-}
-
-LazyJavaPackageFragment@95['java'] {
-    classes('lang': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('lang': Name@137) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@136
-}
-
-LazyJavaPackageFragment@111['jvm'] {
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@139
-}
-
-LazyJavaPackageFragment@102['kotlin'] {
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('String': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('io': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('jvm': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('platform': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    deserializedPackageScope = DeserializedPackageMemberScope@145 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('io': Name@146) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-    functions('io': Name@146) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('jvm': Name@147) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-    functions('jvm': Name@147) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-    functions('platform': Name@148) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@140
-    membersProtos = LinkedHashMap@150 // through DeserializedPackageMemberScope@145
-    properties('io': Name@146) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-    properties('jvm': Name@147) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-    properties('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
-}
-
-LazyJavaPackageFragment@7['platform'] {
-    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('platformName': Name@129) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@151
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-TypeDeserializer@209 {
-    classDescriptors('4': Integer@210) = DeserializedClassDescriptor@211['String']
-}
-
-null {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@199 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
deleted file mode 100644
index 43bfdd7a9f3..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
+++ /dev/null
@@ -1,788 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-    storage(VirtualFileKotlinClass@8) = Storage@9
-}
-
-DescriptorResolver@10 {
-    <name not found> = IntValue@11
-    <name not found> = JetTypeImpl@12['Class<1>']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = MutableClassDescriptor$1@15
-    <name not found> = null
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@16['internal']
-    defaultType = JetTypeImpl@17['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@18['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@19['kotlin']
-    defaultType = JetTypeImpl@20['inline']
-}
-
-DeserializedTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-    upperBounds = LinkedHashSet@23[1] { DeserializedType@24['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@25['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@26
-    upperBounds = LinkedHashSet@27[1] { DeserializedType@28['kotlin.Any'] }
-}
-
-DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@33['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@34['Class']
-    memberScope = SubstitutingScope@35
-}
-
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@24['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@38['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@40
-}
-
-DeserializedType@41['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@42
-}
-
-DeserializedType@43['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@44
-}
-
-DeserializedType@45['kotlin.IntArray'] {
-    constructor = DeserializedClassTypeConstructor@46
-}
-
-LazyAnnotationDescriptor@47 {
-    resolutionResults = OverloadResolutionResultsImpl@48
-    type = JetTypeImpl@49['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
-}
-
-LazyAnnotationDescriptor@52 {
-    resolutionResults = OverloadResolutionResultsImpl@53
-    type = JetTypeImpl@54['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
-}
-
-LazyAnnotationDescriptor@56 {
-    resolutionResults = OverloadResolutionResultsImpl@57
-    type = JetTypeImpl@58['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
-}
-
-LazyAnnotationDescriptor@60 {
-    resolutionResults = OverloadResolutionResultsImpl@61
-    type = JetTypeImpl@62['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
-}
-
-LazyAnnotationDescriptor@64 {
-    resolutionResults = OverloadResolutionResultsImpl@65
-    type = JetTypeImpl@66['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
-}
-
-LazyAnnotationDescriptor@68 {
-    resolutionResults = OverloadResolutionResultsImpl@69
-    type = JetTypeImpl@70['AnnAnn']
-    valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@72
-}
-
-LazyAnnotationDescriptor@73 {
-    resolutionResults = OverloadResolutionResultsImpl@74
-    type = JetTypeImpl@75['AnnAnn']
-    valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@76
-}
-
-LazyAnnotationDescriptor@77 {
-    resolutionResults = OverloadResolutionResultsImpl@78
-    type = JetTypeImpl@79['AnnJC']
-    valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@81
-}
-
-LazyAnnotationDescriptor@82 {
-    resolutionResults = OverloadResolutionResultsImpl@83
-    type = JetTypeImpl@84['AnnJC']
-    valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@85
-}
-
-LazyJavaClassDescriptor@86['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@88['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
-}
-
-LazyJavaClassDescriptor@89['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@91['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
-}
-
-LazyJavaClassDescriptor@93['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@94['Type']
-}
-
-LazyJavaClassTypeConstructor@87['AnnotatedElement'] {
-    supertypes = ArrayList@95[1] { JetTypeImpl@96['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Class'] {
-    parameters = ArrayList@97[1] { LazyJavaTypeParameterDescriptor@98['T'] }
-    supertypes = ArrayList@99[4] { LazyJavaClassifierType@100['Serializable'], LazyJavaClassifierType@101['GenericDeclaration'], LazyJavaClassifierType@102['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@90['GenericDeclaration'] {
-    supertypes = ArrayList@103[1] { JetTypeImpl@96['Any'] }
-}
-
-LazyJavaClassTypeConstructor@92['Serializable'] {
-    parameters = ArrayList@104[empty]
-    supertypes = ArrayList@105[1] { JetTypeImpl@96['Any'] }
-}
-
-LazyJavaClassTypeConstructor@94['Type'] {
-    supertypes = ArrayList@106[1] { JetTypeImpl@96['Any'] }
-}
-
-LazyJavaClassifierType@107['AnnotatedElement'] {
-    classifier = JavaClassImpl@108['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
-}
-
-LazyJavaClassifierType@101['GenericDeclaration'] {
-    classifier = JavaClassImpl@109['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
-}
-
-LazyJavaClassifierType@110['Object'] {
-    classifier = JavaClassImpl@111['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@112['Object'] {
-    classifier = JavaClassImpl@113['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@114['Object'] {
-    classifier = JavaClassImpl@115['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@116['Object'] {
-    classifier = JavaClassImpl@117['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@118['Object'] {
-    classifier = JavaClassImpl@119['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@100['Serializable'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
-}
-
-LazyJavaClassifierType@102['Type'] {
-    classifier = JavaClassImpl@122['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@94['Type']
-}
-
-LazyJavaPackageFragmentProvider@123 {
-    packageFragments('<root>': FqName@124) = LazyJavaPackageFragment@125['<root>']
-    packageFragments('Ann': FqName@126) = null
-    packageFragments('AnnAnn': FqName@127) = null
-    packageFragments('AnnJC': FqName@128) = null
-    packageFragments('Array': FqName@129) = null
-    packageFragments('Class': FqName@130) = null
-    packageFragments('Int': FqName@131) = null
-    packageFragments('IntArray': FqName@132) = null
-    packageFragments('Test': FqName@133) = null
-    packageFragments('TestAnn': FqName@134) = null
-    packageFragments('TestJC': FqName@135) = null
-    packageFragments('i': FqName@136) = null
-    packageFragments('i2': FqName@137) = null
-    packageFragments('i3': FqName@138) = null
-    packageFragments('iAnn': FqName@139) = null
-    packageFragments('iJC': FqName@140) = null
-    packageFragments('java': FqName@141) = LazyJavaPackageFragment@142['java']
-    packageFragments('java.io': FqName@143) = LazyJavaPackageFragment@144['io']
-    packageFragments('java.lang': FqName@145) = LazyJavaPackageFragment@146['lang']
-    packageFragments('java.lang.Ann': FqName@147) = null
-    packageFragments('java.lang.AnnAnn': FqName@148) = null
-    packageFragments('java.lang.AnnJC': FqName@149) = null
-    packageFragments('java.lang.Array': FqName@150) = null
-    packageFragments('java.lang.Class': FqName@151) = null
-    packageFragments('java.lang.Int': FqName@152) = null
-    packageFragments('java.lang.IntArray': FqName@153) = null
-    packageFragments('java.lang.Test': FqName@154) = null
-    packageFragments('java.lang.reflect': FqName@155) = LazyJavaPackageFragment@156['reflect']
-    packageFragments('kotlin': FqName@157) = LazyJavaPackageFragment@19['kotlin']
-    packageFragments('kotlin.Ann': FqName@158) = null
-    packageFragments('kotlin.AnnAnn': FqName@159) = null
-    packageFragments('kotlin.AnnJC': FqName@160) = null
-    packageFragments('kotlin.Array': FqName@161) = null
-    packageFragments('kotlin.Class': FqName@162) = null
-    packageFragments('kotlin.Int': FqName@163) = null
-    packageFragments('kotlin.IntArray': FqName@164) = null
-    packageFragments('kotlin.Test': FqName@165) = null
-    packageFragments('kotlin.io': FqName@166) = LazyJavaPackageFragment@167['io']
-    packageFragments('kotlin.io.Ann': FqName@168) = null
-    packageFragments('kotlin.io.AnnAnn': FqName@169) = null
-    packageFragments('kotlin.io.AnnJC': FqName@170) = null
-    packageFragments('kotlin.io.Array': FqName@171) = null
-    packageFragments('kotlin.io.Class': FqName@172) = null
-    packageFragments('kotlin.io.Int': FqName@173) = null
-    packageFragments('kotlin.io.IntArray': FqName@174) = null
-    packageFragments('kotlin.io.Test': FqName@175) = null
-    packageFragments('kotlin.jvm': FqName@176) = LazyJavaPackageFragment@177['jvm']
-    packageFragments('kotlin.jvm.Ann': FqName@178) = null
-    packageFragments('kotlin.jvm.AnnAnn': FqName@179) = null
-    packageFragments('kotlin.jvm.AnnJC': FqName@180) = null
-    packageFragments('kotlin.jvm.Array': FqName@181) = null
-    packageFragments('kotlin.jvm.Class': FqName@182) = null
-    packageFragments('kotlin.jvm.Int': FqName@183) = null
-    packageFragments('kotlin.jvm.IntArray': FqName@184) = null
-    packageFragments('kotlin.jvm.Test': FqName@185) = null
-    packageFragments('kotlin.jvm.internal': FqName@186) = LazyJavaPackageFragment@16['internal']
-    topLevelClasses(JavaClassImpl@108['AnnotatedElement']) = LazyJavaClassDescriptor@86['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@187['Class']) = LazyJavaClassDescriptor@88['Class']
-    topLevelClasses(JavaClassImpl@109['GenericDeclaration']) = LazyJavaClassDescriptor@89['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@121['Serializable']) = LazyJavaClassDescriptor@91['Serializable']
-    topLevelClasses(JavaClassImpl@122['Type']) = LazyJavaClassDescriptor@93['Type']
-}
-
-LazyJavaPackageFragment@125['<root>'] {
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@189
-}
-
-LazyJavaPackageFragment@16['internal'] {
-    classes('Intrinsic': Name@206) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@207
-}
-
-LazyJavaPackageFragment@167['io'] {
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    deserializedPackageScope = DeserializedPackageMemberScope@209 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
-    membersProtos = LinkedHashMap@211 // through DeserializedPackageMemberScope@209
-    properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-}
-
-LazyJavaPackageFragment@142['java'] {
-    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('lang': Name@214) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-LazyJavaPackageFragment@177['jvm'] {
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@216
-}
-
-LazyJavaPackageFragment@19['kotlin'] {
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Any': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('inline': Name@220) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('io': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('jvm': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = DeserializedPackageMemberScope@223 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('array': Name@194) = ArrayList@224[1] { DeserializedSimpleFunctionDescriptor@225['array'] } // through DeserializedPackageMemberScope@223
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('intArray': Name@201) = ArrayList@226[1] { DeserializedSimpleFunctionDescriptor@227['intArray'] } // through DeserializedPackageMemberScope@223
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('io': Name@228) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    functions('io': Name@228) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('javaClass': Name@202) = ArrayList@229[1] { DeserializedSimpleFunctionDescriptor@230['javaClass'] } // through DeserializedPackageMemberScope@223
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('jvm': Name@231) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    functions('jvm': Name@231) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = LinkedHashMap@233 // through DeserializedPackageMemberScope@223
-    properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('io': Name@228) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-    properties('javaClass': Name@202) = ArrayList@234[1] { DeserializedPropertyDescriptor@235['javaClass'] } // through DeserializedPackageMemberScope@223
-    properties('jvm': Name@231) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
-}
-
-LazyJavaPackageFragment@146['lang'] {
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Class': Name@191) = LazyJavaClassDescriptor@88['Class'] // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@236
-}
-
-LazyJavaTypeParameterDescriptor@98['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@238
-    upperBounds = LinkedHashSet@239[1] { NullableType@240 }
-    upperBoundsAsType = NullableType@240
-}
-
-LazyJavaTypeParameterResolver@241 {
-    resolve(JavaTypeParameterImpl@242['T']) = LazyJavaTypeParameterDescriptor@98['T']
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-TypeDeserializer@354 {
-    classDescriptors('27': Integer@355) = DeserializedClassDescriptor@356['Int']
-    classDescriptors('28': Integer@357) = DeserializedClassDescriptor@358['IntArray']
-}
-
-TypeDeserializer@359 {
-    classDescriptors('34': Integer@360) = LazyJavaClassDescriptor@88['Class']
-    classDescriptors('9': Integer@361) = DeserializedClassDescriptor@362['Any']
-}
-
-TypeDeserializer@363 {
-    classDescriptors('8': Integer@364) = DeserializedClassDescriptor@365['Array']
-    classDescriptors('9': Integer@361) = DeserializedClassDescriptor@362['Any']
-}
-
-null {
-    <name not found> = ArrayList@366[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@369[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@372[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@281 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@326 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
deleted file mode 100644
index cd6caec61ce..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
+++ /dev/null
@@ -1,214 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@8['internal']
-    defaultType = JetTypeImpl@9['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@10['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@11['kotlin']
-    defaultType = JetTypeImpl@12['inline']
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-}
-
-DeserializedType@17['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
-}
-
-DeserializedType@18['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@19['Class']
-    memberScope = SubstitutingScope@20
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@21
-    memberScope = DeserializedClassMemberScope@22
-}
-
-LazyAnnotationDescriptor@23 {
-    resolutionResults = OverloadResolutionResultsImpl@24
-    type = JetTypeImpl@25['AnnC']
-    valueArguments(ValueParameterDescriptorImpl@26['c']) = JavaClassValue@27
-}
-
-LazyAnnotationDescriptor@28 {
-    resolutionResults = OverloadResolutionResultsImpl@29
-    type = JetTypeImpl@30['AnnC']
-    valueArguments(ValueParameterDescriptorImpl@26['c']) = null
-}
-
-LazyJavaClassDescriptor@31['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@19['Class']
-}
-
-LazyJavaClassTypeConstructor@19['Class'] {
-    parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
-}
-
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('A': FqName@37) = null
-    packageFragments('AnnC': FqName@38) = null
-    packageFragments('Class': FqName@39) = null
-    packageFragments('Test': FqName@40) = null
-    packageFragments('Test2': FqName@41) = null
-    packageFragments('c': FqName@42) = null
-    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    packageFragments('java.lang.A': FqName@47) = null
-    packageFragments('java.lang.AnnC': FqName@48) = null
-    packageFragments('java.lang.Class': FqName@49) = null
-    packageFragments('kotlin': FqName@50) = LazyJavaPackageFragment@11['kotlin']
-    packageFragments('kotlin.A': FqName@51) = null
-    packageFragments('kotlin.AnnC': FqName@52) = null
-    packageFragments('kotlin.Class': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
-    packageFragments('kotlin.io.A': FqName@56) = null
-    packageFragments('kotlin.io.AnnC': FqName@57) = null
-    packageFragments('kotlin.io.Class': FqName@58) = null
-    packageFragments('kotlin.jvm': FqName@59) = LazyJavaPackageFragment@60['jvm']
-    packageFragments('kotlin.jvm.A': FqName@61) = null
-    packageFragments('kotlin.jvm.AnnC': FqName@62) = null
-    packageFragments('kotlin.jvm.Class': FqName@63) = null
-    packageFragments('kotlin.jvm.internal': FqName@64) = LazyJavaPackageFragment@8['internal']
-    topLevelClasses(JavaClassImpl@65['Class']) = LazyJavaClassDescriptor@31['Class']
-}
-
-LazyJavaPackageFragment@36['<root>'] {
-    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@8['internal'] {
-    classes('Intrinsic': Name@73) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@55['io'] {
-    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
-    membersProtos = LinkedHashMap@78 // through DeserializedPackageMemberScope@76
-    properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
-    properties('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
-}
-
-LazyJavaPackageFragment@44['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@60['jvm'] {
-    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@11['kotlin'] {
-    classes('Any': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('inline': Name@87) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('io': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('jvm': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@90 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('io': Name@91) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
-    functions('io': Name@91) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('javaClass': Name@69) = ArrayList@92[1] { DeserializedSimpleFunctionDescriptor@93['javaClass'] } // through DeserializedPackageMemberScope@90
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('jvm': Name@94) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
-    functions('jvm': Name@94) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = LinkedHashMap@96 // through DeserializedPackageMemberScope@90
-    properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
-    properties('io': Name@91) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
-    properties('javaClass': Name@69) = ArrayList@97[1] { DeserializedPropertyDescriptor@98['javaClass'] } // through DeserializedPackageMemberScope@90
-    properties('jvm': Name@94) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
-}
-
-LazyJavaPackageFragment@46['lang'] {
-    classes('Class': Name@66) = LazyJavaClassDescriptor@31['Class'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaTypeParameterDescriptor@33['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@102[1] { NullableType@103 }
-    upperBoundsAsType = NullableType@103
-}
-
-LazyJavaTypeParameterResolver@104 {
-    resolve(JavaTypeParameterImpl@105['T']) = LazyJavaTypeParameterDescriptor@33['T']
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = EmptyList@71[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
-}
-
-TypeDeserializer@121 {
-    classDescriptors('34': Integer@122) = LazyJavaClassDescriptor@31['Class']
-    classDescriptors('9': Integer@123) = DeserializedClassDescriptor@124['Any']
-}
-
-null {
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@117 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@120 }
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-    <name not found> = EmptyList@71[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
deleted file mode 100644
index ad36f1ab633..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
+++ /dev/null
@@ -1,426 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-}
-
-DescriptorResolver@8 {
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@12['Int']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = null
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@14['internal']
-    defaultType = JetTypeImpl@15['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@16['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-    defaultType = JetTypeImpl@18['inline']
-}
-
-DeserializedTypeParameterDescriptor@19['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedType@23['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@20
-}
-
-DeserializedType@24['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@20
-}
-
-DeserializedType@25['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@20
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@26
-    memberScope = DeserializedClassMemberScope@27
-}
-
-DeserializedType@28['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@29
-    memberScope = SubstitutingScope@30
-}
-
-DeserializedType@31['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@29
-    memberScope = SubstitutingScope@32
-}
-
-DeserializedType@33['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@34
-}
-
-DeserializedType@35['kotlin.IntArray'] {
-    constructor = DeserializedClassTypeConstructor@36
-}
-
-LazyAnnotationDescriptor@37 {
-    resolutionResults = OverloadResolutionResultsImpl@38
-    type = JetTypeImpl@39['Ann']
-    valueArguments(ValueParameterDescriptorImpl@40['i']) = IntValue@41
-}
-
-LazyAnnotationDescriptor@42 {
-    resolutionResults = OverloadResolutionResultsImpl@43
-    type = JetTypeImpl@44['Ann']
-    valueArguments(ValueParameterDescriptorImpl@40['i']) = IntValue@45
-}
-
-LazyAnnotationDescriptor@46 {
-    resolutionResults = OverloadResolutionResultsImpl@47
-    type = JetTypeImpl@48['Ann']
-    valueArguments(ValueParameterDescriptorImpl@40['i']) = null
-}
-
-LazyAnnotationDescriptor@49 {
-    resolutionResults = OverloadResolutionResultsImpl@50
-    type = JetTypeImpl@51['Ann']
-    valueArguments(ValueParameterDescriptorImpl@40['i']) = null
-}
-
-LazyAnnotationDescriptor@52 {
-    resolutionResults = OverloadResolutionResultsImpl@53
-    type = JetTypeImpl@54['AnnIA']
-    valueArguments(ValueParameterDescriptorImpl@55['ia']) = null
-}
-
-LazyAnnotationDescriptor@56 {
-    resolutionResults = OverloadResolutionResultsImpl@57
-    type = JetTypeImpl@58['AnnSA']
-    valueArguments(ValueParameterDescriptorImpl@59['sa']) = null
-}
-
-LazyJavaPackageFragmentProvider@60 {
-    packageFragments('<root>': FqName@61) = LazyJavaPackageFragment@62['<root>']
-    packageFragments('Ann': FqName@63) = null
-    packageFragments('Ann2': FqName@64) = null
-    packageFragments('AnnIA': FqName@65) = null
-    packageFragments('AnnSA': FqName@66) = null
-    packageFragments('Array': FqName@67) = null
-    packageFragments('Int': FqName@68) = null
-    packageFragments('IntArray': FqName@69) = null
-    packageFragments('MyClass': FqName@70) = null
-    packageFragments('String': FqName@71) = null
-    packageFragments('Test': FqName@72) = null
-    packageFragments('i': FqName@73) = null
-    packageFragments('i2': FqName@74) = null
-    packageFragments('ia': FqName@75) = null
-    packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
-    packageFragments('java.lang': FqName@78) = LazyJavaPackageFragment@79['lang']
-    packageFragments('java.lang.Ann': FqName@80) = null
-    packageFragments('java.lang.AnnIA': FqName@81) = null
-    packageFragments('java.lang.AnnSA': FqName@82) = null
-    packageFragments('java.lang.Array': FqName@83) = null
-    packageFragments('java.lang.Int': FqName@84) = null
-    packageFragments('java.lang.IntArray': FqName@85) = null
-    packageFragments('java.lang.String': FqName@86) = null
-    packageFragments('kotlin': FqName@87) = LazyJavaPackageFragment@17['kotlin']
-    packageFragments('kotlin.Ann': FqName@88) = null
-    packageFragments('kotlin.AnnIA': FqName@89) = null
-    packageFragments('kotlin.AnnSA': FqName@90) = null
-    packageFragments('kotlin.Array': FqName@91) = null
-    packageFragments('kotlin.Int': FqName@92) = null
-    packageFragments('kotlin.IntArray': FqName@93) = null
-    packageFragments('kotlin.String': FqName@94) = null
-    packageFragments('kotlin.io': FqName@95) = LazyJavaPackageFragment@96['io']
-    packageFragments('kotlin.io.Ann': FqName@97) = null
-    packageFragments('kotlin.io.AnnIA': FqName@98) = null
-    packageFragments('kotlin.io.AnnSA': FqName@99) = null
-    packageFragments('kotlin.io.Array': FqName@100) = null
-    packageFragments('kotlin.io.Int': FqName@101) = null
-    packageFragments('kotlin.io.IntArray': FqName@102) = null
-    packageFragments('kotlin.io.String': FqName@103) = null
-    packageFragments('kotlin.jvm': FqName@104) = LazyJavaPackageFragment@105['jvm']
-    packageFragments('kotlin.jvm.Ann': FqName@106) = null
-    packageFragments('kotlin.jvm.AnnIA': FqName@107) = null
-    packageFragments('kotlin.jvm.AnnSA': FqName@108) = null
-    packageFragments('kotlin.jvm.Array': FqName@109) = null
-    packageFragments('kotlin.jvm.Int': FqName@110) = null
-    packageFragments('kotlin.jvm.IntArray': FqName@111) = null
-    packageFragments('kotlin.jvm.String': FqName@112) = null
-    packageFragments('kotlin.jvm.internal': FqName@113) = LazyJavaPackageFragment@14['internal']
-    packageFragments('sa': FqName@114) = null
-}
-
-LazyJavaPackageFragment@62['<root>'] {
-    classes('Array': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('IntArray': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('MyClass': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('array': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('i': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('i2': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('ia': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('intArray': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('sa': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@128 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('array': Name@121) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('foo': Name@122) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('intArray': Name@126) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@14['internal'] {
-    classes('Intrinsic': Name@131) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-LazyJavaPackageFragment@96['io'] {
-    classes('Array': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('IntArray': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('MyClass': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('array': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('i': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('i2': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('ia': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('intArray': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('sa': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = DeserializedPackageMemberScope@134 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('array': Name@121) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    functions('array': Name@121) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@122) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    functions('foo': Name@122) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('intArray': Name@126) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    functions('intArray': Name@126) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
-    membersProtos = LinkedHashMap@136 // through DeserializedPackageMemberScope@134
-    properties('MyClass': Name@119) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('array': Name@121) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('foo': Name@122) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('i': Name@123) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('i2': Name@124) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('ia': Name@125) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('intArray': Name@126) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-    properties('sa': Name@127) = EmptyList@129[empty] // through DeserializedPackageMemberScope@134
-}
-
-LazyJavaPackageFragment@77['java'] {
-    classes('lang': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = Empty@128 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('lang': Name@139) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@138
-}
-
-LazyJavaPackageFragment@105['jvm'] {
-    classes('Array': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('IntArray': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('MyClass': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('array': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('i': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('i2': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('ia': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('intArray': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('sa': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = Empty@128 // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('array': Name@121) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('foo': Name@122) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('intArray': Name@126) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@141
-}
-
-LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('Array': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('IntArray': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('MyClass': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('array': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('i': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('i2': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('ia': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('inline': Name@145) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('intArray': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('io': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('jvm': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    classes('sa': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    deserializedPackageScope = DeserializedPackageMemberScope@148 // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('array': Name@121) = ArrayList@149[1] { DeserializedSimpleFunctionDescriptor@150['array'] } // through DeserializedPackageMemberScope@148
-    functions('array': Name@121) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('foo': Name@122) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    functions('foo': Name@122) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('intArray': Name@126) = ArrayList@151[1] { DeserializedSimpleFunctionDescriptor@152['intArray'] } // through DeserializedPackageMemberScope@148
-    functions('intArray': Name@126) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('io': Name@153) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    functions('io': Name@153) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('jvm': Name@154) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    functions('jvm': Name@154) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@144
-    membersProtos = LinkedHashMap@156 // through DeserializedPackageMemberScope@148
-    properties('MyClass': Name@119) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('array': Name@121) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('foo': Name@122) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('i': Name@123) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('i2': Name@124) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('ia': Name@125) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('intArray': Name@126) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('io': Name@153) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('jvm': Name@154) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-    properties('sa': Name@127) = EmptyList@129[empty] // through DeserializedPackageMemberScope@148
-}
-
-LazyJavaPackageFragment@79['lang'] {
-    classes('MyClass': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('array': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('i': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('i2': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('ia': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('intArray': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('sa': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@128 // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('MyClass': Name@119) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('array': Name@121) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('foo': Name@122) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('intArray': Name@126) = EmptyList@129[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@157
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@180 {
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@183 {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
-    <name not found> = EmptyList@129[empty]
-}
-
-ResolutionTaskHolder@186 {
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@194 }
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-}
-
-ResolutionTaskHolder@198 {
-    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
-}
-
-ResolutionTaskHolder@201 {
-    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
-}
-
-ResolutionTaskHolder@204 {
-    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
-}
-
-TypeDeserializer@207 {
-    classDescriptors('27': Integer@208) = DeserializedClassDescriptor@209['Int']
-    classDescriptors('28': Integer@210) = DeserializedClassDescriptor@211['IntArray']
-}
-
-TypeDeserializer@212 {
-    classDescriptors('8': Integer@213) = DeserializedClassDescriptor@214['Array']
-    classDescriptors('9': Integer@215) = DeserializedClassDescriptor@216['Any']
-}
-
-null {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@185 }
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@191 }
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@164 }
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@200 }
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@203 }
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@182 }
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@194 }
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@188 }
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@179 }
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@206 }
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@197 }
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-    <name not found> = EmptyList@129[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
deleted file mode 100644
index 546423f15c8..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
+++ /dev/null
@@ -1,776 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-    storage(VirtualFileKotlinClass@8) = Storage@9
-}
-
-DescriptorResolver@10 {
-    <name not found> = IntValue@11
-    <name not found> = JetTypeImpl@12['Class<1>']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@14['Int']
-    <name not found> = MutableClassDescriptor$1@15
-    <name not found> = null
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@16['internal']
-    defaultType = JetTypeImpl@17['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@18['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@19['kotlin']
-    defaultType = JetTypeImpl@20['inline']
-}
-
-DeserializedTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-    upperBounds = LinkedHashSet@23[1] { DeserializedType@24['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@25['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@26
-    upperBounds = LinkedHashSet@27[1] { DeserializedType@28['kotlin.Any'] }
-}
-
-DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@33['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@34['Class']
-    memberScope = SubstitutingScope@35
-}
-
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@24['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@38['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@40
-}
-
-DeserializedType@41['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@42
-}
-
-DeserializedType@43['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@44
-}
-
-DeserializedType@45['kotlin.IntArray'] {
-    constructor = DeserializedClassTypeConstructor@46
-}
-
-LazyAnnotationDescriptor@47 {
-    resolutionResults = OverloadResolutionResultsImpl@48
-    type = JetTypeImpl@49['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
-}
-
-LazyAnnotationDescriptor@52 {
-    resolutionResults = OverloadResolutionResultsImpl@53
-    type = JetTypeImpl@54['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
-}
-
-LazyAnnotationDescriptor@56 {
-    resolutionResults = OverloadResolutionResultsImpl@57
-    type = JetTypeImpl@58['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
-}
-
-LazyAnnotationDescriptor@60 {
-    resolutionResults = OverloadResolutionResultsImpl@61
-    type = JetTypeImpl@62['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
-}
-
-LazyAnnotationDescriptor@64 {
-    resolutionResults = OverloadResolutionResultsImpl@65
-    type = JetTypeImpl@66['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
-}
-
-LazyAnnotationDescriptor@68 {
-    resolutionResults = OverloadResolutionResultsImpl@69
-    type = JetTypeImpl@70['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@71
-}
-
-LazyAnnotationDescriptor@72 {
-    resolutionResults = OverloadResolutionResultsImpl@73
-    type = JetTypeImpl@74['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@75
-}
-
-LazyAnnotationDescriptor@76 {
-    resolutionResults = OverloadResolutionResultsImpl@77
-    type = JetTypeImpl@78['Ann']
-    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@79
-}
-
-LazyAnnotationDescriptor@80 {
-    resolutionResults = OverloadResolutionResultsImpl@81
-    type = JetTypeImpl@82['AnnAnn']
-    valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@84
-}
-
-LazyAnnotationDescriptor@85 {
-    resolutionResults = OverloadResolutionResultsImpl@86
-    type = JetTypeImpl@87['AnnAnn']
-    valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@88
-}
-
-LazyAnnotationDescriptor@89 {
-    resolutionResults = OverloadResolutionResultsImpl@90
-    type = JetTypeImpl@91['AnnJC']
-    valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@93
-}
-
-LazyAnnotationDescriptor@94 {
-    resolutionResults = OverloadResolutionResultsImpl@95
-    type = JetTypeImpl@96['AnnJC']
-    valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@97
-}
-
-LazyJavaClassDescriptor@98['AnnotatedElement'] {
-    typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
-}
-
-LazyJavaClassDescriptor@100['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
-}
-
-LazyJavaClassDescriptor@101['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
-}
-
-LazyJavaClassDescriptor@103['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
-}
-
-LazyJavaClassDescriptor@105['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@106['Type']
-}
-
-LazyJavaClassTypeConstructor@99['AnnotatedElement'] {
-    supertypes = ArrayList@107[1] { JetTypeImpl@108['Any'] }
-}
-
-LazyJavaClassTypeConstructor@34['Class'] {
-    parameters = ArrayList@109[1] { LazyJavaTypeParameterDescriptor@110['T'] }
-    supertypes = ArrayList@111[4] { LazyJavaClassifierType@112['Serializable'], LazyJavaClassifierType@113['GenericDeclaration'], LazyJavaClassifierType@114['Type'], ... }
-}
-
-LazyJavaClassTypeConstructor@102['GenericDeclaration'] {
-    supertypes = ArrayList@115[1] { JetTypeImpl@108['Any'] }
-}
-
-LazyJavaClassTypeConstructor@104['Serializable'] {
-    parameters = ArrayList@116[empty]
-    supertypes = ArrayList@117[1] { JetTypeImpl@108['Any'] }
-}
-
-LazyJavaClassTypeConstructor@106['Type'] {
-    supertypes = ArrayList@118[1] { JetTypeImpl@108['Any'] }
-}
-
-LazyJavaClassifierType@119['AnnotatedElement'] {
-    classifier = JavaClassImpl@120['AnnotatedElement']
-    typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
-}
-
-LazyJavaClassifierType@113['GenericDeclaration'] {
-    classifier = JavaClassImpl@121['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
-}
-
-LazyJavaClassifierType@122['Object'] {
-    classifier = JavaClassImpl@123['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@124['Object'] {
-    classifier = JavaClassImpl@125['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@126['Object'] {
-    classifier = JavaClassImpl@127['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@128['Object'] {
-    classifier = JavaClassImpl@129['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@130['Object'] {
-    classifier = JavaClassImpl@131['Object']
-    typeConstructor = DeserializedClassTypeConstructor@36
-}
-
-LazyJavaClassifierType@112['Serializable'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@133['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
-}
-
-LazyJavaClassifierType@114['Type'] {
-    classifier = JavaClassImpl@134['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@106['Type']
-}
-
-LazyJavaPackageFragmentProvider@135 {
-    packageFragments('<root>': FqName@136) = LazyJavaPackageFragment@137['<root>']
-    packageFragments('Ann': FqName@138) = null
-    packageFragments('AnnAnn': FqName@139) = null
-    packageFragments('AnnJC': FqName@140) = null
-    packageFragments('Class': FqName@141) = null
-    packageFragments('Int': FqName@142) = null
-    packageFragments('Test': FqName@143) = null
-    packageFragments('TestAnn': FqName@144) = null
-    packageFragments('TestJC': FqName@145) = null
-    packageFragments('i': FqName@146) = null
-    packageFragments('i2': FqName@147) = null
-    packageFragments('i3': FqName@148) = null
-    packageFragments('iAnn': FqName@149) = null
-    packageFragments('iJC': FqName@150) = null
-    packageFragments('java': FqName@151) = LazyJavaPackageFragment@152['java']
-    packageFragments('java.io': FqName@153) = LazyJavaPackageFragment@154['io']
-    packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
-    packageFragments('java.lang.Ann': FqName@157) = null
-    packageFragments('java.lang.AnnAnn': FqName@158) = null
-    packageFragments('java.lang.AnnJC': FqName@159) = null
-    packageFragments('java.lang.Class': FqName@160) = null
-    packageFragments('java.lang.Int': FqName@161) = null
-    packageFragments('java.lang.Test': FqName@162) = null
-    packageFragments('java.lang.reflect': FqName@163) = LazyJavaPackageFragment@164['reflect']
-    packageFragments('kotlin': FqName@165) = LazyJavaPackageFragment@19['kotlin']
-    packageFragments('kotlin.Ann': FqName@166) = null
-    packageFragments('kotlin.AnnAnn': FqName@167) = null
-    packageFragments('kotlin.AnnJC': FqName@168) = null
-    packageFragments('kotlin.Class': FqName@169) = null
-    packageFragments('kotlin.Int': FqName@170) = null
-    packageFragments('kotlin.Test': FqName@171) = null
-    packageFragments('kotlin.io': FqName@172) = LazyJavaPackageFragment@173['io']
-    packageFragments('kotlin.io.Ann': FqName@174) = null
-    packageFragments('kotlin.io.AnnAnn': FqName@175) = null
-    packageFragments('kotlin.io.AnnJC': FqName@176) = null
-    packageFragments('kotlin.io.Class': FqName@177) = null
-    packageFragments('kotlin.io.Int': FqName@178) = null
-    packageFragments('kotlin.io.Test': FqName@179) = null
-    packageFragments('kotlin.jvm': FqName@180) = LazyJavaPackageFragment@181['jvm']
-    packageFragments('kotlin.jvm.Ann': FqName@182) = null
-    packageFragments('kotlin.jvm.AnnAnn': FqName@183) = null
-    packageFragments('kotlin.jvm.AnnJC': FqName@184) = null
-    packageFragments('kotlin.jvm.Class': FqName@185) = null
-    packageFragments('kotlin.jvm.Int': FqName@186) = null
-    packageFragments('kotlin.jvm.Test': FqName@187) = null
-    packageFragments('kotlin.jvm.internal': FqName@188) = LazyJavaPackageFragment@16['internal']
-    topLevelClasses(JavaClassImpl@120['AnnotatedElement']) = LazyJavaClassDescriptor@98['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@189['Class']) = LazyJavaClassDescriptor@100['Class']
-    topLevelClasses(JavaClassImpl@121['GenericDeclaration']) = LazyJavaClassDescriptor@101['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@133['Serializable']) = LazyJavaClassDescriptor@103['Serializable']
-    topLevelClasses(JavaClassImpl@134['Type']) = LazyJavaClassDescriptor@105['Type']
-}
-
-LazyJavaPackageFragment@137['<root>'] {
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@191
-}
-
-LazyJavaPackageFragment@16['internal'] {
-    classes('Intrinsic': Name@206) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@207
-}
-
-LazyJavaPackageFragment@173['io'] {
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    deserializedPackageScope = DeserializedPackageMemberScope@209 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
-    membersProtos = LinkedHashMap@211 // through DeserializedPackageMemberScope@209
-    properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-    properties('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
-}
-
-LazyJavaPackageFragment@152['java'] {
-    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('lang': Name@214) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-LazyJavaPackageFragment@181['jvm'] {
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@216
-}
-
-LazyJavaPackageFragment@19['kotlin'] {
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Any': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Array': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('IntArray': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('inline': Name@222) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('io': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('jvm': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = DeserializedPackageMemberScope@225 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('array': Name@194) = ArrayList@226[1] { DeserializedSimpleFunctionDescriptor@227['array'] } // through DeserializedPackageMemberScope@225
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('intArray': Name@201) = ArrayList@228[1] { DeserializedSimpleFunctionDescriptor@229['intArray'] } // through DeserializedPackageMemberScope@225
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('io': Name@230) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    functions('io': Name@230) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('javaClass': Name@202) = ArrayList@231[1] { DeserializedSimpleFunctionDescriptor@232['javaClass'] } // through DeserializedPackageMemberScope@225
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('jvm': Name@233) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    functions('jvm': Name@233) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    memberIndex = computeMemberIndex$1@234 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = LinkedHashMap@235 // through DeserializedPackageMemberScope@225
-    properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('io': Name@230) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-    properties('javaClass': Name@202) = ArrayList@236[1] { DeserializedPropertyDescriptor@237['javaClass'] } // through DeserializedPackageMemberScope@225
-    properties('jvm': Name@233) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
-}
-
-LazyJavaPackageFragment@156['lang'] {
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('Class': Name@192) = LazyJavaClassDescriptor@100['Class'] // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    memberIndex = computeMemberIndex$1@239 // through LazyPackageFragmentScopeForJavaPackage@238
-}
-
-LazyJavaTypeParameterDescriptor@110['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@240
-    upperBounds = LinkedHashSet@241[1] { NullableType@242 }
-    upperBoundsAsType = NullableType@242
-}
-
-LazyJavaTypeParameterResolver@243 {
-    resolve(JavaTypeParameterImpl@244['T']) = LazyJavaTypeParameterDescriptor@110['T']
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = ArrayList@249[1] { ResolutionCandidate@250 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = ArrayList@261[1] { ResolutionCandidate@262 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@265 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@269 {
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@272 {
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@274 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@275 {
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@277 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@278 {
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@280 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@283 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@289 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@295 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@301 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@304 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = ArrayList@306[1] { ResolutionCandidate@307 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@308 {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@311 {
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@313 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@314 {
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@316 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@317 {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@319 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@320 {
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@323 {
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@326 {
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@329 {
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
-    <name not found> = EmptyList@204[empty]
-}
-
-ResolutionTaskHolder@332 {
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
-}
-
-ResolutionTaskHolder@335 {
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@337 }
-}
-
-ResolutionTaskHolder@338 {
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@340 }
-}
-
-ResolutionTaskHolder@341 {
-    <name not found> = ArrayList@342[1] { ResolutionCandidate@343 }
-}
-
-ResolutionTaskHolder@344 {
-    <name not found> = ArrayList@345[1] { ResolutionCandidate@346 }
-}
-
-ResolutionTaskHolder@347 {
-    <name not found> = ArrayList@348[1] { ResolutionCandidate@349 }
-}
-
-ResolutionTaskHolder@350 {
-    <name not found> = ArrayList@351[1] { ResolutionCandidate@352 }
-}
-
-ResolutionTaskHolder@353 {
-    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = ArrayList@357[1] { ResolutionCandidate@358 }
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
-}
-
-TypeDeserializer@362 {
-    classDescriptors('27': Integer@363) = DeserializedClassDescriptor@364['Int']
-    classDescriptors('28': Integer@365) = DeserializedClassDescriptor@366['IntArray']
-}
-
-TypeDeserializer@367 {
-    classDescriptors('34': Integer@368) = LazyJavaClassDescriptor@100['Class']
-    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
-}
-
-TypeDeserializer@371 {
-    classDescriptors('8': Integer@372) = DeserializedClassDescriptor@373['Array']
-    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
-}
-
-null {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@265 }
-    <name not found> = ArrayList@375[1] { ResolutionCandidate@283 }
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@253 }
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@298 }
-    <name not found> = ArrayList@378[1] { ResolutionCandidate@352 }
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@322 }
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@334 }
-    <name not found> = ArrayList@381[1] { ResolutionCandidate@331 }
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@343 }
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@304 }
-    <name not found> = ArrayList@384[1] { ResolutionCandidate@295 }
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@301 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@337 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@325 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@274 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@340 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@313 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@256 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@349 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@328 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@289 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@346 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@310 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@307 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@316 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@280 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@355 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@259 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@268 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@292 }
-    <name not found> = ArrayList@405[1] { ResolutionCandidate@262 }
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@250 }
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@286 }
-    <name not found> = ArrayList@408[1] { ResolutionCandidate@277 }
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@361 }
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@319 }
-    <name not found> = ArrayList@411[1] { ResolutionCandidate@271 }
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@358 }
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-    <name not found> = EmptyList@204[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
deleted file mode 100644
index 57a32bc884a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
+++ /dev/null
@@ -1,157 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformStatic']
-}
-
-ClosureExpressionsTypingVisitor$1@3 {
-    <name not found> = JetTypeImpl@4['<no name provided>']
-}
-
-ClosureExpressionsTypingVisitor$1@5 {
-    <name not found> = JetTypeImpl@6['<no name provided>']
-}
-
-DeserializedClassDescriptor@2['platformStatic'] {
-    containingDeclaration = LazyJavaPackageFragment@7['platform']
-    primaryConstructor = ConstructorDescriptorImpl@8['<init>']
-}
-
-LazyAnnotationDescriptor@9 {
-    resolutionResults = OverloadResolutionResultsImpl@10
-    type = JetTypeImpl@11['platformStatic']
-}
-
-LazyAnnotationDescriptor@12 {
-    resolutionResults = OverloadResolutionResultsImpl@13
-    type = JetTypeImpl@14['platformStatic']
-}
-
-LazyAnnotationDescriptor@15 {
-    resolutionResults = OverloadResolutionResultsImpl@16
-    type = JetTypeImpl@17['platformStatic']
-}
-
-LazyAnnotationDescriptor@18 {
-    resolutionResults = OverloadResolutionResultsImpl@19
-    type = JetTypeImpl@20['platformStatic']
-}
-
-LazyAnnotationDescriptor@21 {
-    resolutionResults = OverloadResolutionResultsImpl@22
-    type = JetTypeImpl@23['platformStatic']
-}
-
-LazyAnnotationDescriptor@24 {
-    resolutionResults = OverloadResolutionResultsImpl@25
-    type = JetTypeImpl@26['platformStatic']
-}
-
-LazyAnnotationDescriptor@27 {
-    resolutionResults = OverloadResolutionResultsImpl@28
-    type = JetTypeImpl@29['platformStatic']
-}
-
-LazyAnnotationDescriptor@30 {
-    resolutionResults = OverloadResolutionResultsImpl@31
-    type = JetTypeImpl@32['platformStatic']
-}
-
-LazyJavaPackageFragmentProvider@33 {
-    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    packageFragments('A': FqName@36) = null
-    packageFragments('B': FqName@37) = null
-    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    packageFragments('java.lang.platformStatic': FqName@42) = null
-    packageFragments('kotlin': FqName@43) = LazyJavaPackageFragment@44['kotlin']
-    packageFragments('kotlin.io': FqName@45) = LazyJavaPackageFragment@46['io']
-    packageFragments('kotlin.io.platformStatic': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
-    packageFragments('kotlin.jvm.platformStatic': FqName@50) = null
-    packageFragments('kotlin.platform': FqName@51) = LazyJavaPackageFragment@7['platform']
-    packageFragments('kotlin.platform.platformStatic': FqName@52) = null
-    packageFragments('kotlin.platformStatic': FqName@53) = null
-    packageFragments('platformStatic': FqName@54) = null
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('platformStatic': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('kotlin': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@39['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@44['kotlin'] {
-    classes('io': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('platform': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('io': Name@71) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('jvm': Name@72) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-    functions('platform': Name@73) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-    properties('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@7['platform'] {
-    classes('platformStatic': Name@76) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('platformStatic': Name@78) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-null {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@105[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@88 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
deleted file mode 100644
index f45ebe602ec..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformStatic']
-}
-
-DeserializedClassDescriptor@2['platformStatic'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['platformStatic']
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Array': FqName@11) = null
-    packageFragments('String': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Array': FqName@17) = null
-    packageFragments('java.lang.String': FqName@18) = null
-    packageFragments('java.lang.platformStatic': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@21['kotlin']
-    packageFragments('kotlin.Array': FqName@22) = null
-    packageFragments('kotlin.String': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    packageFragments('kotlin.io.Array': FqName@26) = null
-    packageFragments('kotlin.io.String': FqName@27) = null
-    packageFragments('kotlin.io.platformStatic': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    packageFragments('kotlin.jvm.Array': FqName@31) = null
-    packageFragments('kotlin.jvm.String': FqName@32) = null
-    packageFragments('kotlin.jvm.platformStatic': FqName@33) = null
-    packageFragments('kotlin.platform': FqName@34) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.platformStatic': FqName@35) = null
-    packageFragments('kotlin.platformStatic': FqName@36) = null
-    packageFragments('platformStatic': FqName@37) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('platformStatic': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@25['io'] {
-    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@30['jvm'] {
-    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@21['kotlin'] {
-    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('platform': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@59) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('platform': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
-    properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('platformStatic': Name@63) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('platformStatic': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
deleted file mode 100644
index 8197c21db89..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
+++ /dev/null
@@ -1,255 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformStatic']
-}
-
-DescriptorResolver@3 {
-    <name not found> = IntValue@4
-    <name not found> = IntValue@5
-    <name not found> = IntValue@6
-    <name not found> = IntValue@7
-    <name not found> = IntValue@8
-    <name not found> = IntValue@9
-    <name not found> = IntValue@10
-    <name not found> = IntValue@11
-    <name not found> = IntValue@12
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@13['Int']
-    <name not found> = JetTypeImpl@13['Int']
-}
-
-DeserializedClassDescriptor@2['platformStatic'] {
-    containingDeclaration = LazyJavaPackageFragment@14['platform']
-    primaryConstructor = ConstructorDescriptorImpl@15['<init>']
-}
-
-LazyAnnotationDescriptor@16 {
-    resolutionResults = OverloadResolutionResultsImpl@17
-    type = JetTypeImpl@18['platformStatic']
-}
-
-LazyAnnotationDescriptor@19 {
-    resolutionResults = OverloadResolutionResultsImpl@20
-    type = JetTypeImpl@21['platformStatic']
-}
-
-LazyAnnotationDescriptor@22 {
-    resolutionResults = OverloadResolutionResultsImpl@23
-    type = JetTypeImpl@24['platformStatic']
-}
-
-LazyAnnotationDescriptor@25 {
-    resolutionResults = OverloadResolutionResultsImpl@26
-    type = JetTypeImpl@27['platformStatic']
-}
-
-LazyAnnotationDescriptor@28 {
-    resolutionResults = OverloadResolutionResultsImpl@29
-    type = JetTypeImpl@30['platformStatic']
-}
-
-LazyAnnotationDescriptor@31 {
-    resolutionResults = OverloadResolutionResultsImpl@32
-    type = JetTypeImpl@33['platformStatic']
-}
-
-LazyAnnotationDescriptor@34 {
-    resolutionResults = OverloadResolutionResultsImpl@35
-    type = JetTypeImpl@36['platformStatic']
-}
-
-LazyAnnotationDescriptor@37 {
-    resolutionResults = OverloadResolutionResultsImpl@38
-    type = JetTypeImpl@39['platformStatic']
-}
-
-LazyAnnotationDescriptor@40 {
-    resolutionResults = OverloadResolutionResultsImpl@41
-    type = JetTypeImpl@42['platformStatic']
-}
-
-LazyAnnotationDescriptor@43 {
-    resolutionResults = OverloadResolutionResultsImpl@44
-    type = JetTypeImpl@45['platformStatic']
-}
-
-LazyJavaPackageFragmentProvider@46 {
-    packageFragments('<root>': FqName@47) = LazyJavaPackageFragment@48['<root>']
-    packageFragments('A': FqName@49) = null
-    packageFragments('B': FqName@50) = null
-    packageFragments('Int': FqName@51) = null
-    packageFragments('java': FqName@52) = LazyJavaPackageFragment@53['java']
-    packageFragments('java.lang': FqName@54) = LazyJavaPackageFragment@55['lang']
-    packageFragments('java.lang.B': FqName@56) = null
-    packageFragments('java.lang.Int': FqName@57) = null
-    packageFragments('java.lang.platformStatic': FqName@58) = null
-    packageFragments('kotlin': FqName@59) = LazyJavaPackageFragment@60['kotlin']
-    packageFragments('kotlin.B': FqName@61) = null
-    packageFragments('kotlin.Int': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    packageFragments('kotlin.io.B': FqName@65) = null
-    packageFragments('kotlin.io.Int': FqName@66) = null
-    packageFragments('kotlin.io.platformStatic': FqName@67) = null
-    packageFragments('kotlin.jvm': FqName@68) = LazyJavaPackageFragment@69['jvm']
-    packageFragments('kotlin.jvm.B': FqName@70) = null
-    packageFragments('kotlin.jvm.Int': FqName@71) = null
-    packageFragments('kotlin.jvm.platformStatic': FqName@72) = null
-    packageFragments('kotlin.platform': FqName@73) = LazyJavaPackageFragment@14['platform']
-    packageFragments('kotlin.platform.platformStatic': FqName@74) = null
-    packageFragments('kotlin.platformStatic': FqName@75) = null
-    packageFragments('platformStatic': FqName@76) = null
-}
-
-LazyJavaPackageFragment@48['<root>'] {
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('kotlin': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('p1': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('platformStatic': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('kotlin': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@64['io'] {
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p1': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = DeserializedPackageMemberScope@88 // through LazyPackageFragmentScopeForJavaPackage@87
-    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@88
-    properties('p': Name@80) = EmptyList@85[empty] // through DeserializedPackageMemberScope@88
-    properties('p1': Name@81) = EmptyList@85[empty] // through DeserializedPackageMemberScope@88
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@69['jvm'] {
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p1': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@60['kotlin'] {
-    classes('Int': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('io': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('jvm': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p1': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('platform': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = DeserializedPackageMemberScope@99 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('io': Name@100) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    functions('io': Name@100) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('jvm': Name@101) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    functions('jvm': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('platform': Name@102) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    functions('platform': Name@102) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@95
-    membersProtos = LinkedHashMap@104 // through DeserializedPackageMemberScope@99
-    properties('io': Name@100) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    properties('jvm': Name@101) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    properties('p': Name@80) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    properties('p1': Name@81) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-    properties('platform': Name@102) = EmptyList@85[empty] // through DeserializedPackageMemberScope@99
-}
-
-LazyJavaPackageFragment@55['lang'] {
-    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('p1': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@14['platform'] {
-    classes('platformStatic': Name@106) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('platformStatic': Name@108) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@85[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-null {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@115 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-    <name not found> = EmptyList@85[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
deleted file mode 100644
index 34feed9f9f4..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
+++ /dev/null
@@ -1,785 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['deprecated']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['inline']
-}
-
-DescriptorLoadersStorage@7 {
-    storage(VirtualFileKotlinClass@8) = Storage@9
-    storage(VirtualFileKotlinClass@10) = Storage@11
-}
-
-DescriptorResolver@12 {
-    <name not found> = JetTypeImpl@13['Int']
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@14['internal']
-    defaultType = JetTypeImpl@15['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@16['<init>']
-}
-
-DeserializedClassDescriptor@4['deprecated'] {
-    classObjectDescriptor = null
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-    defaultType = JetTypeImpl@18['deprecated']
-    primaryConstructor = ConstructorDescriptorImpl@19['<init>']
-}
-
-DeserializedClassDescriptor@6['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-    defaultType = JetTypeImpl@20['inline']
-}
-
-DeserializedTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-    upperBounds = LinkedHashSet@23[1] { DeserializedType@24['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@25['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@26
-    upperBounds = LinkedHashSet@27[1] { DeserializedType@28['kotlin.Any'] }
-}
-
-DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@33['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@34['Class']
-    memberScope = SubstitutingScope@35
-}
-
-DeserializedType@24['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@36
-    memberScope = DeserializedClassMemberScope@37
-}
-
-DeserializedType@38['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@40
-}
-
-DeserializedType@41['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@39
-    memberScope = SubstitutingScope@42
-}
-
-DeserializedType@43['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@44
-}
-
-DeserializedType@45['kotlin.deprecated'] {
-    constructor = DeserializedClassTypeConstructor@46
-}
-
-LazyAnnotationDescriptor@47 {
-    resolutionResults = OverloadResolutionResultsImpl@48
-    type = JetTypeImpl@49['IAnn']
-}
-
-LazyAnnotationDescriptor@50 {
-    resolutionResults = OverloadResolutionResultsImpl@51
-    type = JetTypeImpl@52['IAnn']
-}
-
-LazyAnnotationDescriptor@53 {
-    resolutionResults = OverloadResolutionResultsImpl@54
-    type = JetTypeImpl@55['ann1']
-    valueArguments(ValueParameterDescriptorImpl@56['p']) = AnnotationValue@57
-}
-
-LazyAnnotationDescriptor@58 {
-    resolutionResults = OverloadResolutionResultsImpl@59
-    type = JetTypeImpl@60['ann1']
-    valueArguments(ValueParameterDescriptorImpl@56['p']) = null
-}
-
-LazyAnnotationDescriptor@61 {
-    resolutionResults = OverloadResolutionResultsImpl@62
-    type = JetTypeImpl@63['ann2']
-    valueArguments(ValueParameterDescriptorImpl@64['p']) = AnnotationValue@65
-}
-
-LazyAnnotationDescriptor@66 {
-    resolutionResults = OverloadResolutionResultsImpl@67
-    type = JetTypeImpl@68['ann3']
-    valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@70
-    valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
-}
-
-LazyAnnotationDescriptor@72 {
-    resolutionResults = OverloadResolutionResultsImpl@73
-    type = JetTypeImpl@74['ann3']
-    valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@75
-    valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
-}
-
-LazyAnnotationDescriptor@76 {
-    resolutionResults = OverloadResolutionResultsImpl@77
-    type = JetTypeImpl@78['annArray']
-    valueArguments(ValueParameterDescriptorImpl@79['p']) = ArrayValue@80
-}
-
-LazyAnnotationDescriptor@81 {
-    resolutionResults = OverloadResolutionResultsImpl@82
-    type = JetTypeImpl@83['annJavaClass']
-    valueArguments(ValueParameterDescriptorImpl@84['p']) = JavaClassValue@85
-}
-
-LazyAnnotationDescriptor@86 {
-    resolutionResults = OverloadResolutionResultsImpl@87
-    type = JetTypeImpl@88['deprecated']
-    valueArguments(ValueParameterDescriptorImpl@89['value']) = StringValue@90
-}
-
-LazyJavaClassDescriptor@91['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
-}
-
-LazyJavaClassTypeConstructor@34['Class'] {
-    parameters = ArrayList@92[1] { LazyJavaTypeParameterDescriptor@93['T'] }
-}
-
-LazyJavaPackageFragmentProvider@94 {
-    packageFragments('<root>': FqName@95) = LazyJavaPackageFragment@96['<root>']
-    packageFragments('A': FqName@97) = null
-    packageFragments('Array': FqName@98) = null
-    packageFragments('Class': FqName@99) = null
-    packageFragments('String': FqName@100) = null
-    packageFragments('a': FqName@101) = null
-    packageFragments('a.b': FqName@102) = null
-    packageFragments('a.b.c': FqName@103) = null
-    packageFragments('a.b.c.A': FqName@104) = null
-    packageFragments('a.b.c.Array': FqName@105) = null
-    packageFragments('a.b.c.Class': FqName@106) = null
-    packageFragments('a.b.c.String': FqName@107) = null
-    packageFragments('a.b.c.a': FqName@108) = null
-    packageFragments('a.b.c.ann1': FqName@109) = null
-    packageFragments('a.b.c.ann2': FqName@110) = null
-    packageFragments('a.b.c.ann3': FqName@111) = null
-    packageFragments('a.b.c.annArray': FqName@112) = null
-    packageFragments('a.b.c.annJavaClass': FqName@113) = null
-    packageFragments('a.b.c.deprecated': FqName@114) = null
-    packageFragments('a.b.c.kotlin': FqName@115) = null
-    packageFragments('ann1': FqName@116) = null
-    packageFragments('ann2': FqName@117) = null
-    packageFragments('ann3': FqName@118) = null
-    packageFragments('annArray': FqName@119) = null
-    packageFragments('annJavaClass': FqName@120) = null
-    packageFragments('deprecated': FqName@121) = null
-    packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
-    packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
-    packageFragments('java.lang.A': FqName@126) = null
-    packageFragments('java.lang.Array': FqName@127) = null
-    packageFragments('java.lang.Class': FqName@128) = null
-    packageFragments('java.lang.String': FqName@129) = null
-    packageFragments('java.lang.ann1': FqName@130) = null
-    packageFragments('java.lang.ann2': FqName@131) = null
-    packageFragments('java.lang.ann3': FqName@132) = null
-    packageFragments('java.lang.annArray': FqName@133) = null
-    packageFragments('java.lang.annJavaClass': FqName@134) = null
-    packageFragments('java.lang.deprecated': FqName@135) = null
-    packageFragments('kotlin': FqName@136) = LazyJavaPackageFragment@17['kotlin']
-    packageFragments('kotlin.A': FqName@137) = null
-    packageFragments('kotlin.Array': FqName@138) = null
-    packageFragments('kotlin.Class': FqName@139) = null
-    packageFragments('kotlin.String': FqName@140) = null
-    packageFragments('kotlin.ann1': FqName@141) = null
-    packageFragments('kotlin.ann2': FqName@142) = null
-    packageFragments('kotlin.ann3': FqName@143) = null
-    packageFragments('kotlin.annArray': FqName@144) = null
-    packageFragments('kotlin.annJavaClass': FqName@145) = null
-    packageFragments('kotlin.deprecated': FqName@146) = null
-    packageFragments('kotlin.io': FqName@147) = LazyJavaPackageFragment@148['io']
-    packageFragments('kotlin.io.A': FqName@149) = null
-    packageFragments('kotlin.io.Array': FqName@150) = null
-    packageFragments('kotlin.io.Class': FqName@151) = null
-    packageFragments('kotlin.io.String': FqName@152) = null
-    packageFragments('kotlin.io.ann1': FqName@153) = null
-    packageFragments('kotlin.io.ann2': FqName@154) = null
-    packageFragments('kotlin.io.ann3': FqName@155) = null
-    packageFragments('kotlin.io.annArray': FqName@156) = null
-    packageFragments('kotlin.io.annJavaClass': FqName@157) = null
-    packageFragments('kotlin.io.deprecated': FqName@158) = null
-    packageFragments('kotlin.jvm': FqName@159) = LazyJavaPackageFragment@160['jvm']
-    packageFragments('kotlin.jvm.A': FqName@161) = null
-    packageFragments('kotlin.jvm.Array': FqName@162) = null
-    packageFragments('kotlin.jvm.Class': FqName@163) = null
-    packageFragments('kotlin.jvm.String': FqName@164) = null
-    packageFragments('kotlin.jvm.ann1': FqName@165) = null
-    packageFragments('kotlin.jvm.ann2': FqName@166) = null
-    packageFragments('kotlin.jvm.ann3': FqName@167) = null
-    packageFragments('kotlin.jvm.annArray': FqName@168) = null
-    packageFragments('kotlin.jvm.annJavaClass': FqName@169) = null
-    packageFragments('kotlin.jvm.deprecated': FqName@170) = null
-    packageFragments('kotlin.jvm.internal': FqName@171) = LazyJavaPackageFragment@14['internal']
-    topLevelClasses(JavaClassImpl@172['Class']) = LazyJavaClassDescriptor@91['Class']
-}
-
-LazyJavaPackageFragment@14['internal'] {
-    classes('Intrinsic': Name@173) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@174
-}
-
-LazyJavaPackageFragment@148['io'] {
-    classes('Array': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Class': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('String': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('deprecated': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = DeserializedPackageMemberScope@182 // through LazyPackageFragmentScopeForJavaPackage@176
-    membersProtos = LinkedHashMap@183 // through DeserializedPackageMemberScope@182
-    properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
-    properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
-    properties('kotlin': Name@187) = EmptyList@185[empty] // through DeserializedPackageMemberScope@182
-}
-
-LazyJavaPackageFragment@123['java'] {
-    classes('lang': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('lang': Name@191) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@189
-}
-
-LazyJavaPackageFragment@160['jvm'] {
-    classes('Array': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('Class': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('String': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('deprecated': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@193
-}
-
-LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('Array': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('Class': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('String': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('array': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('deprecated': Name@180) = DeserializedClassDescriptor@4['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('inline': Name@197) = DeserializedClassDescriptor@6['inline'] // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('io': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('javaClass': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('jvm': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    deserializedPackageScope = DeserializedPackageMemberScope@201 // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('array': Name@196) = ArrayList@202[1] { DeserializedSimpleFunctionDescriptor@203['array'] } // through DeserializedPackageMemberScope@201
-    functions('array': Name@196) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('deprecated': Name@204) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    functions('deprecated': Name@204) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('io': Name@205) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    functions('io': Name@205) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('javaClass': Name@199) = ArrayList@206[1] { DeserializedSimpleFunctionDescriptor@207['javaClass'] } // through DeserializedPackageMemberScope@201
-    functions('javaClass': Name@199) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('jvm': Name@208) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    functions('jvm': Name@208) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@195
-    membersProtos = LinkedHashMap@210 // through DeserializedPackageMemberScope@201
-    properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('array': Name@196) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('deprecated': Name@204) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('io': Name@205) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('javaClass': Name@199) = ArrayList@211[1] { DeserializedPropertyDescriptor@212['javaClass'] } // through DeserializedPackageMemberScope@201
-    properties('jvm': Name@208) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-    properties('kotlin': Name@187) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
-}
-
-LazyJavaPackageFragment@125['lang'] {
-    classes('Class': Name@177) = LazyJavaClassDescriptor@91['Class'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@213
-}
-
-LazyJavaTypeParameterDescriptor@93['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@214
-    upperBounds = LinkedHashSet@215[1] { NullableType@216 }
-    upperBoundsAsType = NullableType@216
-}
-
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['T']) = LazyJavaTypeParameterDescriptor@93['T']
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@292 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@293 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@302 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@305 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
-
-TypeDeserializer@307 {
-    classDescriptors('1': Integer@308) = DeserializedClassDescriptor@4['deprecated']
-    classDescriptors('3': Integer@309) = DeserializedClassDescriptor@310['String']
-}
-
-TypeDeserializer@311 {
-    classDescriptors('34': Integer@312) = LazyJavaClassDescriptor@91['Class']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
-}
-
-TypeDeserializer@315 {
-    classDescriptors('8': Integer@316) = DeserializedClassDescriptor@317['Array']
-    classDescriptors('9': Integer@313) = DeserializedClassDescriptor@314['Any']
-}
-
-null {
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@245 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@333[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@336[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@339[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-    <name not found> = EmptyList@185[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
deleted file mode 100644
index 9b3c51f1843..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
+++ /dev/null
@@ -1,230 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-}
-
-DeserializedType@9['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@10
-}
-
-DeserializedType@11['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('A': FqName@16) = null
-    packageFragments('B': FqName@17) = null
-    packageFragments('C': FqName@18) = null
-    packageFragments('D': FqName@19) = null
-    packageFragments('java': FqName@20) = LazyJavaPackageFragment@21['java']
-    packageFragments('java.lang': FqName@22) = LazyJavaPackageFragment@23['lang']
-    packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    packageFragments('kotlin.jvm': FqName@27) = LazyJavaPackageFragment@28['jvm']
-    packageFragments('kotlin.reflect': FqName@29) = LazyJavaPackageFragment@6['reflect']
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
-}
-
-LazyJavaPackageFragment@26['io'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = DeserializedPackageMemberScope@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-    membersProtos = LinkedHashMap@41 // through DeserializedPackageMemberScope@39
-    properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-    properties('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@39
-}
-
-LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@28['jvm'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Any': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Function0': Name@50) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('io': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('jvm': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('io': Name@54) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('io': Name@54) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('jvm': Name@55) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    functions('jvm': Name@55) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
-    properties('A': Name@30) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    properties('B': Name@32) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    properties('C': Name@33) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    properties('D': Name@34) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    properties('io': Name@54) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-    properties('jvm': Name@55) = EmptyList@36[empty] // through DeserializedPackageMemberScope@53
-}
-
-LazyJavaPackageFragment@23['lang'] {
-    classes('A': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('B': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('C': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('D': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('B': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('C': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('D': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@60) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
-
-TypeDeserializer@73 {
-    classDescriptors('2': Integer@74) = DeserializedClassDescriptor@75['Any']
-}
-
-TypeDeserializer@76 {
-    classDescriptors('4': Integer@77) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@79[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-    <name not found> = EmptyList@36[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
deleted file mode 100644
index f1f8e96e46c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
+++ /dev/null
@@ -1,135 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Unit']
-}
-
-DescriptorResolver@3 {
-    <name not found> = JetTypeImpl@4['Int']
-    <name not found> = JetTypeImpl@5['Int']
-}
-
-DeserializedClassDescriptor@2['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@6['kotlin']
-}
-
-LazyJavaPackageFragmentProvider@7 {
-    packageFragments('<root>': FqName@8) = LazyJavaPackageFragment@9['<root>']
-    packageFragments('Any': FqName@10) = null
-    packageFragments('Int': FqName@11) = null
-    packageFragments('Unit': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Any': FqName@17) = null
-    packageFragments('java.lang.Int': FqName@18) = null
-    packageFragments('java.lang.Unit': FqName@19) = null
-    packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@6['kotlin']
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.Unit': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    packageFragments('kotlin.io.Any': FqName@26) = null
-    packageFragments('kotlin.io.Int': FqName@27) = null
-    packageFragments('kotlin.io.Unit': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@31) = null
-    packageFragments('kotlin.jvm.Int': FqName@32) = null
-    packageFragments('kotlin.jvm.Unit': FqName@33) = null
-}
-
-LazyJavaPackageFragment@9['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@25['io'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = DeserializedPackageMemberScope@43 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
-    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-    membersProtos = LinkedHashMap@45 // through DeserializedPackageMemberScope@43
-    properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@43
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@30['jvm'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Unit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@6['kotlin'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Unit': Name@37) = DeserializedClassDescriptor@2['Unit'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('io': Name@56) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-    functions('io': Name@56) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-    functions('jvm': Name@57) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = LinkedHashMap@59 // through DeserializedPackageMemberScope@55
-    properties('foo': Name@38) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-    properties('io': Name@56) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-    properties('jvm': Name@57) = EmptyList@40[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@16['lang'] {
-    classes('foo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = ArrayList@73[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
-
-null {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@78[2] { ResolutionCandidate@74, ResolutionCandidate@75 }
-    <name not found> = ArrayList@79[2] { ResolutionCandidate@70, ResolutionCandidate@71 }
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-    <name not found> = EmptyList@40[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
deleted file mode 100644
index f06d87b619a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
+++ /dev/null
@@ -1,263 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Int']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-    defaultType = JetTypeImpl@8['ExtensionFunction0<2>']
-    functions('invoke': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['invoke'] } // through DeserializedClassMemberScope@12
-    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('invoke': Name@9) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['invoke'] } // through DeserializedClassMemberScope@18
-    membersProtos = LinkedHashMap@19 // through DeserializedClassMemberScope@18
-}
-
-DeserializedTypeParameterDescriptor@20['R'] {
-    defaultType = JetTypeImpl@21['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-}
-
-DeserializedTypeParameterDescriptor@25['T'] {
-    defaultType = JetTypeImpl@26['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@27
-    upperBounds = LinkedHashSet@28[1] { DeserializedType@29['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@29['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@30['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
-}
-
-DeserializedType@32['R in kotlin.ExtensionFunction0'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@33['R in kotlin.reflect.KMemberFunction0'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@24
-}
-
-DeserializedType@34['T in kotlin.ExtensionFunction0'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@27
-}
-
-DeserializedType@35['T in kotlin.reflect.KMemberFunction0'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@31
-}
-
-DeserializedType@36['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@37
-    memberScope = DeserializedClassMemberScope@38
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@37
-}
-
-DeserializedType@39['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = SubstitutingScope@41
-}
-
-EnumEntryClassDescriptors@42 {
-    findEnumEntry('invoke': Name@9) = null
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('A': FqName@46) = null
-    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
-    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
-    packageFragments('java.lang.A': FqName@51) = null
-    packageFragments('kotlin': FqName@52) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@53) = null
-    packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
-    packageFragments('kotlin.io.A': FqName@56) = null
-    packageFragments('kotlin.jvm': FqName@57) = LazyJavaPackageFragment@58['jvm']
-    packageFragments('kotlin.jvm.A': FqName@59) = null
-    packageFragments('kotlin.reflect': FqName@60) = LazyJavaPackageFragment@15['reflect']
-}
-
-LazyJavaPackageFragment@45['<root>'] {
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@55['io'] {
-    deserializedPackageScope = DeserializedPackageMemberScope@63 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@63
-    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@63
-}
-
-LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@58['jvm'] {
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = DeserializedPackageMemberScope@78 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
-    functions('io': Name@79) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
-    functions('jvm': Name@80) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@74
-    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@78
-    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
-    properties('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
-    properties('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
-}
-
-LazyJavaPackageFragment@50['lang'] {
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@15['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-NestedClassDescriptors@86 {
-    findNestedClass('invoke': Name@9) = null
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-TypeDeserializer@106 {
-    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
-}
-
-TypeDeserializer@109 {
-    classDescriptors('4': Integer@110) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
deleted file mode 100644
index dfecfc27195..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
+++ /dev/null
@@ -1,188 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('KFunction0': FqName@20) = null
-    packageFragments('SomeOtherClass': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.KFunction0': FqName@27) = null
-    packageFragments('kotlin': FqName@28) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@29) = null
-    packageFragments('kotlin.KFunction0': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = LazyJavaPackageFragment@32['io']
-    packageFragments('kotlin.io.A': FqName@33) = null
-    packageFragments('kotlin.io.KFunction0': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = LazyJavaPackageFragment@36['jvm']
-    packageFragments('kotlin.jvm.A': FqName@37) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@38) = null
-    packageFragments('kotlin.reflect': FqName@39) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@40) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('KFunction0': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('kotlin': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('kotlin': Name@47) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@32['io'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = DeserializedPackageMemberScope@50 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-    membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@50
-    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@36['jvm'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('Any': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('Function0': Name@61) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('io': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('jvm': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('reflect': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@59
-    membersProtos = LinkedHashMap@70 // through DeserializedPackageMemberScope@65
-    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@73) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('KFunction0': Name@75) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-}
-
-TypeDeserializer@89 {
-    classDescriptors('2': Integer@90) = DeserializedClassDescriptor@91['Any']
-}
-
-TypeDeserializer@92 {
-    classDescriptors('3': Integer@93) = DeserializedClassDescriptor@91['Any']
-    classDescriptors('4': Integer@94) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@79 }
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@82 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-    <name not found> = EmptyList@46[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
deleted file mode 100644
index c9784e4c723..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
+++ /dev/null
@@ -1,206 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('B': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.B': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.B': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    packageFragments('kotlin.io.A': FqName@35) = null
-    packageFragments('kotlin.io.B': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.B': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['io'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-TypeDeserializer@94 {
-    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
-}
-
-TypeDeserializer@97 {
-    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
-    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
deleted file mode 100644
index 860c26f754a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
+++ /dev/null
@@ -1,338 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('B': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.B': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.B': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    packageFragments('kotlin.io.A': FqName@35) = null
-    packageFragments('kotlin.io.B': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.B': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['io'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-TypeDeserializer@106 {
-    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
-}
-
-TypeDeserializer@109 {
-    classDescriptors('3': Integer@110) = DeserializedClassDescriptor@108['Any']
-    classDescriptors('4': Integer@111) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
deleted file mode 100644
index 199669b59bc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
+++ /dev/null
@@ -1,149 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('KFunction0': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.A': FqName@25) = null
-    packageFragments('java.lang.KFunction0': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.KFunction0': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    packageFragments('kotlin.io.A': FqName@32) = null
-    packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    packageFragments('kotlin.jvm.A': FqName@36) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('KFunction0': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('kotlin': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('kotlin': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@31['io'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@49
-    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@35['jvm'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Function0': Name@60) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('io': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('jvm': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('reflect': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('io': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('jvm': Name@66) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('reflect': Name@67) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@64
-    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@72) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('KFunction0': Name@74) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-TypeDeserializer@82 {
-    classDescriptors('2': Integer@83) = DeserializedClassDescriptor@84['Any']
-}
-
-TypeDeserializer@85 {
-    classDescriptors('3': Integer@86) = DeserializedClassDescriptor@84['Any']
-    classDescriptors('4': Integer@87) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
deleted file mode 100644
index 832c59889ec..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
+++ /dev/null
@@ -1,491 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMemberFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KMemberFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KMemberFunction0': FqName@49) = null
-    packageFragments('KMemberFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('first': FqName@53) = null
-    packageFragments('first.A': FqName@54) = null
-    packageFragments('first.Int': FqName@55) = null
-    packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
-    packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.A': FqName@60) = null
-    packageFragments('java.lang.Int': FqName@61) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@62) = null
-    packageFragments('java.lang.KMemberFunction1': FqName@63) = null
-    packageFragments('java.lang.String': FqName@64) = null
-    packageFragments('java.lang.Unit': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@69) = null
-    packageFragments('kotlin.KMemberFunction1': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.Unit': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
-    packageFragments('kotlin.io.A': FqName@75) = null
-    packageFragments('kotlin.io.Int': FqName@76) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@77) = null
-    packageFragments('kotlin.io.KMemberFunction1': FqName@78) = null
-    packageFragments('kotlin.io.String': FqName@79) = null
-    packageFragments('kotlin.io.Unit': FqName@80) = null
-    packageFragments('kotlin.jvm': FqName@81) = LazyJavaPackageFragment@82['jvm']
-    packageFragments('kotlin.jvm.A': FqName@83) = null
-    packageFragments('kotlin.jvm.Int': FqName@84) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@85) = null
-    packageFragments('kotlin.jvm.KMemberFunction1': FqName@86) = null
-    packageFragments('kotlin.jvm.String': FqName@87) = null
-    packageFragments('kotlin.jvm.Unit': FqName@88) = null
-    packageFragments('kotlin.reflect': FqName@89) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@90) = null
-    packageFragments('kotlin.reflect.Int': FqName@91) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@92) = null
-    packageFragments('kotlin.reflect.KMemberFunction1': FqName@93) = null
-    packageFragments('kotlin.reflect.String': FqName@94) = null
-    packageFragments('kotlin.reflect.Unit': FqName@95) = null
-    packageFragments('other': FqName@96) = null
-    packageFragments('other.A': FqName@97) = null
-    packageFragments('other.Int': FqName@98) = null
-    packageFragments('other.KMemberFunction0': FqName@99) = null
-    packageFragments('other.KMemberFunction1': FqName@100) = null
-    packageFragments('other.String': FqName@101) = null
-    packageFragments('other.Unit': FqName@102) = null
-    packageFragments('other.first': FqName@103) = null
-}
-
-LazyJavaPackageFragment@74['io'] {
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('lang': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-LazyJavaPackageFragment@82['jvm'] {
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction0': Name@118) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('ExtensionFunction1': Name@119) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('Unit': Name@107) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('io': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('jvm': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('reflect': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = DeserializedPackageMemberScope@123 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-    functions('io': Name@124) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-    functions('jvm': Name@125) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-    functions('reflect': Name@126) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@117
-    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@123
-    properties('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-    properties('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-    properties('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
-}
-
-LazyJavaPackageFragment@59['lang'] {
-    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@129
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('KMemberFunction0': Name@132) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('KMemberFunction1': Name@133) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
-
-TypeDeserializer@164 {
-    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
-}
-
-TypeDeserializer@167 {
-    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
-}
-
-TypeDeserializer@168 {
-    classDescriptors('2': Integer@165) = DeserializedClassDescriptor@166['Any']
-}
-
-TypeDeserializer@169 {
-    classDescriptors('3': Integer@170) = DeserializedClassDescriptor@166['Any']
-    classDescriptors('4': Integer@171) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@172 {
-    classDescriptors('3': Integer@170) = DeserializedClassDescriptor@166['Any']
-    classDescriptors('4': Integer@171) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-    <name not found> = EmptyList@113[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
deleted file mode 100644
index 93263b914bb..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
+++ /dev/null
@@ -1,523 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KExtensionFunction0']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Unit']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedClassDescriptor@6['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@20['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@21['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
-    packageFragments('A': FqName@26) = null
-    packageFragments('KExtensionFunction0': FqName@27) = null
-    packageFragments('Unit': FqName@28) = null
-    packageFragments('first': FqName@29) = null
-    packageFragments('first.A': FqName@30) = null
-    packageFragments('first.foo': FqName@31) = null
-    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
-    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
-    packageFragments('java.lang.A': FqName@36) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@37) = null
-    packageFragments('java.lang.Unit': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@40) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@41) = null
-    packageFragments('kotlin.Unit': FqName@42) = null
-    packageFragments('kotlin.io': FqName@43) = LazyJavaPackageFragment@44['io']
-    packageFragments('kotlin.io.A': FqName@45) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@46) = null
-    packageFragments('kotlin.io.Unit': FqName@47) = null
-    packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
-    packageFragments('kotlin.jvm.A': FqName@50) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@51) = null
-    packageFragments('kotlin.jvm.Unit': FqName@52) = null
-    packageFragments('kotlin.reflect': FqName@53) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@54) = null
-    packageFragments('other': FqName@55) = null
-    packageFragments('other.A': FqName@56) = null
-    packageFragments('other.KExtensionFunction0': FqName@57) = null
-    packageFragments('other.Unit': FqName@58) = null
-    packageFragments('other.first': FqName@59) = null
-}
-
-LazyJavaPackageFragment@44['io'] {
-    classes('Unit': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@61
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@66
-    properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@73) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@49['jvm'] {
-    classes('Unit': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('Unit': Name@60) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('reflect': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = DeserializedPackageMemberScope@83 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('io': Name@84) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('io': Name@84) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('jvm': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('jvm': Name@85) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    functions('reflect': Name@86) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@78
-    membersProtos = LinkedHashMap@88 // through DeserializedPackageMemberScope@83
-    properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('io': Name@84) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('jvm': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-}
-
-LazyJavaPackageFragment@35['lang'] {
-    classes('bar': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('baz': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('first': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('bar': Name@62) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('baz': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@65) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KExtensionFunction0': Name@91) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('KExtensionFunction0': Name@93) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
-
-TypeDeserializer@117 {
-    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
-}
-
-TypeDeserializer@120 {
-    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
-}
-
-TypeDeserializer@121 {
-    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@119['Any']
-    classDescriptors('4': Integer@123) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@100 }
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-    <name not found> = EmptyList@67[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
deleted file mode 100644
index faed17158b5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
+++ /dev/null
@@ -1,305 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('Int': FqName@39) = null
-    packageFragments('KFunction0': FqName@40) = null
-    packageFragments('KFunction1': FqName@41) = null
-    packageFragments('String': FqName@42) = null
-    packageFragments('Unit': FqName@43) = null
-    packageFragments('first': FqName@44) = null
-    packageFragments('first.Int': FqName@45) = null
-    packageFragments('first.bar': FqName@46) = null
-    packageFragments('first.baz': FqName@47) = null
-    packageFragments('first.foo': FqName@48) = null
-    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
-    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
-    packageFragments('java.lang.Int': FqName@53) = null
-    packageFragments('java.lang.KFunction0': FqName@54) = null
-    packageFragments('java.lang.KFunction1': FqName@55) = null
-    packageFragments('java.lang.String': FqName@56) = null
-    packageFragments('java.lang.Unit': FqName@57) = null
-    packageFragments('kotlin': FqName@58) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.Int': FqName@59) = null
-    packageFragments('kotlin.KFunction0': FqName@60) = null
-    packageFragments('kotlin.KFunction1': FqName@61) = null
-    packageFragments('kotlin.String': FqName@62) = null
-    packageFragments('kotlin.Unit': FqName@63) = null
-    packageFragments('kotlin.io': FqName@64) = LazyJavaPackageFragment@65['io']
-    packageFragments('kotlin.io.Int': FqName@66) = null
-    packageFragments('kotlin.io.KFunction0': FqName@67) = null
-    packageFragments('kotlin.io.KFunction1': FqName@68) = null
-    packageFragments('kotlin.io.String': FqName@69) = null
-    packageFragments('kotlin.io.Unit': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@73) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    packageFragments('kotlin.jvm.String': FqName@76) = null
-    packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@79) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@80) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@81) = null
-    packageFragments('kotlin.reflect.String': FqName@82) = null
-    packageFragments('kotlin.reflect.Unit': FqName@83) = null
-    packageFragments('other': FqName@84) = null
-    packageFragments('other.Int': FqName@85) = null
-    packageFragments('other.KFunction0': FqName@86) = null
-    packageFragments('other.KFunction1': FqName@87) = null
-    packageFragments('other.String': FqName@88) = null
-    packageFragments('other.Unit': FqName@89) = null
-}
-
-LazyJavaPackageFragment@65['io'] {
-    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = DeserializedPackageMemberScope@97 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@91
-    membersProtos = LinkedHashMap@100 // through DeserializedPackageMemberScope@97
-    properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-    properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-    properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@97
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@104) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-LazyJavaPackageFragment@72['jvm'] {
-    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Function0': Name@110) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Function1': Name@111) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Int': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Unit': Name@93) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('io': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('jvm': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('reflect': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = DeserializedPackageMemberScope@115 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('io': Name@116) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('io': Name@116) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('jvm': Name@117) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('jvm': Name@117) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('reflect': Name@118) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    functions('reflect': Name@118) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@109
-    membersProtos = LinkedHashMap@120 // through DeserializedPackageMemberScope@115
-    properties('bar': Name@94) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    properties('baz': Name@95) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    properties('foo': Name@96) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    properties('io': Name@116) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    properties('jvm': Name@117) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-    properties('reflect': Name@118) = EmptyList@98[empty] // through DeserializedPackageMemberScope@115
-}
-
-LazyJavaPackageFragment@52['lang'] {
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@94) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@95) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@96) = EmptyList@98[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-    <name not found> = EmptyList@98[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.lazy.log
deleted file mode 100644
index aeb18c219c8..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/empty.lazy.log
+++ /dev/null
@@ -1,34 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.A': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
-    packageFragments('kotlin.A': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
-    packageFragments('kotlin.io.A': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
-    packageFragments('kotlin.jvm.A': FqName@17) = null
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@10['kotlin'] {
-    classes('io': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('jvm': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = DeserializedPackageMemberScope@27 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('io': Name@28) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
-    functions('io': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
-    functions('jvm': Name@29) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    membersProtos = LinkedHashMap@31 // through DeserializedPackageMemberScope@27
-    properties('io': Name@28) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
-    properties('jvm': Name@29) = EmptyList@22[empty] // through DeserializedPackageMemberScope@27
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
deleted file mode 100644
index 5c6fb714135..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
+++ /dev/null
@@ -1,358 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KExtensionFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KExtensionFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KExtensionFunction0': FqName@49) = null
-    packageFragments('KExtensionFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-TypeDeserializer@154 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
deleted file mode 100644
index a68304fd1cf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
+++ /dev/null
@@ -1,358 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KExtensionFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KExtensionFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KExtensionFunction0': FqName@49) = null
-    packageFragments('KExtensionFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-TypeDeserializer@154 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
deleted file mode 100644
index 06216493895..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
+++ /dev/null
@@ -1,418 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KExtensionFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KExtensionFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('B': FqName@48) = null
-    packageFragments('Int': FqName@49) = null
-    packageFragments('KExtensionFunction0': FqName@50) = null
-    packageFragments('KExtensionFunction1': FqName@51) = null
-    packageFragments('String': FqName@52) = null
-    packageFragments('Unit': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.A': FqName@58) = null
-    packageFragments('java.lang.B': FqName@59) = null
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@61) = null
-    packageFragments('java.lang.KExtensionFunction1': FqName@62) = null
-    packageFragments('java.lang.String': FqName@63) = null
-    packageFragments('java.lang.Unit': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@66) = null
-    packageFragments('kotlin.B': FqName@67) = null
-    packageFragments('kotlin.Int': FqName@68) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@69) = null
-    packageFragments('kotlin.KExtensionFunction1': FqName@70) = null
-    packageFragments('kotlin.String': FqName@71) = null
-    packageFragments('kotlin.Unit': FqName@72) = null
-    packageFragments('kotlin.io': FqName@73) = LazyJavaPackageFragment@74['io']
-    packageFragments('kotlin.io.A': FqName@75) = null
-    packageFragments('kotlin.io.B': FqName@76) = null
-    packageFragments('kotlin.io.Int': FqName@77) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@78) = null
-    packageFragments('kotlin.io.KExtensionFunction1': FqName@79) = null
-    packageFragments('kotlin.io.String': FqName@80) = null
-    packageFragments('kotlin.io.Unit': FqName@81) = null
-    packageFragments('kotlin.jvm': FqName@82) = LazyJavaPackageFragment@83['jvm']
-    packageFragments('kotlin.jvm.A': FqName@84) = null
-    packageFragments('kotlin.jvm.B': FqName@85) = null
-    packageFragments('kotlin.jvm.Int': FqName@86) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@87) = null
-    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@88) = null
-    packageFragments('kotlin.jvm.String': FqName@89) = null
-    packageFragments('kotlin.jvm.Unit': FqName@90) = null
-    packageFragments('kotlin.reflect': FqName@91) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@92) = null
-    packageFragments('kotlin.reflect.B': FqName@93) = null
-    packageFragments('kotlin.reflect.Int': FqName@94) = null
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@95) = null
-    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@96) = null
-    packageFragments('kotlin.reflect.String': FqName@97) = null
-    packageFragments('kotlin.reflect.Unit': FqName@98) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('KExtensionFunction0': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('KExtensionFunction1': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('kotlin': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('kotlin': Name@111) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@74['io'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@116 // through DeserializedPackageMemberScope@114
-    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('lang': Name@119) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-LazyJavaPackageFragment@83['jvm'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@131) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@132) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@133) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
-    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('KExtensionFunction0': Name@139) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('KExtensionFunction1': Name@140) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@138
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@159 }
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-}
-
-TypeDeserializer@166 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@169 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@171 {
-    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@174 {
-    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@149 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@156 }
-    <name not found> = ArrayList@181[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@159 }
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-    <name not found> = EmptyList@110[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
deleted file mode 100644
index cdae9727898..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
+++ /dev/null
@@ -1,550 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KExtensionFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KExtensionFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KExtensionFunction0': FqName@49) = null
-    packageFragments('KExtensionFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@59) = null
-    packageFragments('java.lang.KExtensionFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@66) = null
-    packageFragments('kotlin.KExtensionFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KExtensionFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KExtensionFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@157 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-TypeDeserializer@166 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@169 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-}
-
-TypeDeserializer@171 {
-    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@174 {
-    classDescriptors('3': Integer@172) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('4': Integer@173) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@178[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@147 }
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@153 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
deleted file mode 100644
index ff75b39184f..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
+++ /dev/null
@@ -1,286 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['Int']
-    <name not found> = JetTypeImpl@2['String']
-}
-
-LazyJavaPackageFragmentProvider@3 {
-    packageFragments('<root>': FqName@4) = LazyJavaPackageFragment@5['<root>']
-    packageFragments('A': FqName@6) = null
-    packageFragments('Int': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('java': FqName@9) = LazyJavaPackageFragment@10['java']
-    packageFragments('java.lang': FqName@11) = LazyJavaPackageFragment@12['lang']
-    packageFragments('java.lang.A': FqName@13) = null
-    packageFragments('java.lang.Int': FqName@14) = null
-    packageFragments('java.lang.String': FqName@15) = null
-    packageFragments('kotlin': FqName@16) = LazyJavaPackageFragment@17['kotlin']
-    packageFragments('kotlin.A': FqName@18) = null
-    packageFragments('kotlin.Int': FqName@19) = null
-    packageFragments('kotlin.String': FqName@20) = null
-    packageFragments('kotlin.io': FqName@21) = LazyJavaPackageFragment@22['io']
-    packageFragments('kotlin.io.A': FqName@23) = null
-    packageFragments('kotlin.io.Int': FqName@24) = null
-    packageFragments('kotlin.io.String': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = LazyJavaPackageFragment@27['jvm']
-    packageFragments('kotlin.jvm.A': FqName@28) = null
-    packageFragments('kotlin.jvm.Int': FqName@29) = null
-    packageFragments('kotlin.jvm.String': FqName@30) = null
-}
-
-LazyJavaPackageFragment@5['<root>'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@22['io'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = DeserializedPackageMemberScope@40 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
-    membersProtos = LinkedHashMap@42 // through DeserializedPackageMemberScope@40
-    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@27['jvm'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@17['kotlin'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('io': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('jvm': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    functions('io': Name@53) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    functions('jvm': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
-    membersProtos = LinkedHashMap@56 // through DeserializedPackageMemberScope@52
-    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    properties('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-    properties('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
-}
-
-LazyJavaPackageFragment@12['lang'] {
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
-}
-
-ResolutionTaskHolder@68 {
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
-
-null {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@67 }
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@70 }
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@64 }
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-    <name not found> = EmptyList@37[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
deleted file mode 100644
index 27fbf87b48d..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
+++ /dev/null
@@ -1,378 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KExtensionFunction0']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['Unit']
-}
-
-DescriptorResolver@9 {
-    <name not found> = JetTypeImpl@10['KExtensionFunction0<2>']
-    <name not found> = JetTypeImpl@11['KMemberFunction0<2>']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@12['kotlin']
-}
-
-DeserializedClassDescriptor@4['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-}
-
-DeserializedClassDescriptor@8['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@12['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@14['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-    upperBounds = LinkedHashSet@16[1] { DeserializedType@17['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@18['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@19
-    upperBounds = LinkedHashSet@20[1] { DeserializedType@21['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@22['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-    upperBounds = LinkedHashSet@24[1] { DeserializedType@25['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@25['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@26['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@27
-    upperBounds = LinkedHashSet@28[1] { DeserializedType@29['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@29['kotlin.Any']
-}
-
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
-DeserializedType@25['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-    memberScope = DeserializedClassMemberScope@31
-}
-
-DeserializedType@32['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-}
-
-DeserializedType@33['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@30
-}
-
-DeserializedType@34['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@36['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@37 {
-    packageFragments('<root>': FqName@38) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('A': FqName@40) = null
-    packageFragments('KExtensionFunction0': FqName@41) = null
-    packageFragments('KMemberFunction0': FqName@42) = null
-    packageFragments('Unit': FqName@43) = null
-    packageFragments('f': FqName@44) = null
-    packageFragments('g': FqName@45) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.A': FqName@50) = null
-    packageFragments('java.lang.KExtensionFunction0': FqName@51) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@52) = null
-    packageFragments('java.lang.Unit': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@12['kotlin']
-    packageFragments('kotlin.A': FqName@55) = null
-    packageFragments('kotlin.KExtensionFunction0': FqName@56) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@57) = null
-    packageFragments('kotlin.Unit': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    packageFragments('kotlin.io.A': FqName@61) = null
-    packageFragments('kotlin.io.KExtensionFunction0': FqName@62) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@63) = null
-    packageFragments('kotlin.io.Unit': FqName@64) = null
-    packageFragments('kotlin.jvm': FqName@65) = LazyJavaPackageFragment@66['jvm']
-    packageFragments('kotlin.jvm.A': FqName@67) = null
-    packageFragments('kotlin.jvm.KExtensionFunction0': FqName@68) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@69) = null
-    packageFragments('kotlin.jvm.Unit': FqName@70) = null
-    packageFragments('kotlin.reflect': FqName@71) = LazyJavaPackageFragment@13['reflect']
-    packageFragments('kotlin.reflect.A': FqName@72) = null
-    packageFragments('kotlin.reflect.KExtensionFunction0': FqName@73) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@74) = null
-    packageFragments('kotlin.reflect.Unit': FqName@75) = null
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('KExtensionFunction0': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('KMemberFunction0': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('kotlin': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('kotlin': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@60['io'] {
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@66['jvm'] {
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@12['kotlin'] {
-    classes('Any': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('ExtensionFunction0': Name@98) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Unit': Name@79) = DeserializedClassDescriptor@8['Unit'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('io': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('jvm': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('reflect': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = DeserializedPackageMemberScope@102 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('io': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('jvm': Name@104) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
-    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
-    properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-}
-
-LazyJavaPackageFragment@49['lang'] {
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
-}
-
-LazyJavaPackageFragment@13['reflect'] {
-    classes('KExtensionFunction0': Name@76) = DeserializedClassDescriptor@4['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-TypeDeserializer@128 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
-}
-
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
-}
-
-TypeDeserializer@132 {
-    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@135 {
-    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@119 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@116 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
deleted file mode 100644
index 6765e0512aa..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
+++ /dev/null
@@ -1,239 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@11['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@12
-    upperBounds = LinkedHashSet@13[1] { DeserializedType@14['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@14['kotlin.Any']
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@14['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-DeserializedType@18['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('A': FqName@23) = null
-    packageFragments('KMemberFunction0': FqName@24) = null
-    packageFragments('String': FqName@25) = null
-    packageFragments('T': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.A': FqName@31) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@32) = null
-    packageFragments('java.lang.String': FqName@33) = null
-    packageFragments('java.lang.T': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@36) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@37) = null
-    packageFragments('kotlin.String': FqName@38) = null
-    packageFragments('kotlin.T': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    packageFragments('kotlin.io.A': FqName@42) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    packageFragments('kotlin.io.String': FqName@44) = null
-    packageFragments('kotlin.io.T': FqName@45) = null
-    packageFragments('kotlin.jvm': FqName@46) = LazyJavaPackageFragment@47['jvm']
-    packageFragments('kotlin.jvm.A': FqName@48) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@49) = null
-    packageFragments('kotlin.jvm.String': FqName@50) = null
-    packageFragments('kotlin.jvm.T': FqName@51) = null
-    packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@53) = null
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('KMemberFunction0': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('kotlin': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('kotlin': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@41['io'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@63
-    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@64
-    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@64
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
-}
-
-LazyJavaPackageFragment@47['jvm'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    functions('io': Name@78) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    functions('jvm': Name@79) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    functions('reflect': Name@80) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
-    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
-    properties('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    properties('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    properties('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
-
-TypeDeserializer@101 {
-    classDescriptors('2': Integer@102) = DeserializedClassDescriptor@103['Any']
-}
-
-TypeDeserializer@104 {
-    classDescriptors('3': Integer@105) = DeserializedClassDescriptor@103['Any']
-    classDescriptors('4': Integer@106) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-    <name not found> = EmptyList@61[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
deleted file mode 100644
index 58a1aae19dd..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
+++ /dev/null
@@ -1,106 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('A': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('kotlin': FqName@8) = LazyJavaPackageFragment@9['kotlin']
-    packageFragments('kotlin.io': FqName@10) = LazyJavaPackageFragment@11['io']
-    packageFragments('kotlin.jvm': FqName@12) = LazyJavaPackageFragment@13['jvm']
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('Inner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('A': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
-LazyJavaPackageFragment@11['io'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = DeserializedPackageMemberScope@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@22
-    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
-    membersProtos = LinkedHashMap@24 // through DeserializedPackageMemberScope@22
-    properties('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@22
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
-}
-
-LazyJavaPackageFragment@13['jvm'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@9['kotlin'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('io': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('jvm': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = DeserializedPackageMemberScope@34 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('io': Name@35) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-    functions('io': Name@35) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('jvm': Name@36) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-    functions('jvm': Name@36) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@31
-    membersProtos = LinkedHashMap@38 // through DeserializedPackageMemberScope@34
-    properties('Inner': Name@19) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-    properties('io': Name@35) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-    properties('jvm': Name@36) = EmptyList@18[empty] // through DeserializedPackageMemberScope@34
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('Inner': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-ResolutionTaskHolder@41 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-ResolutionTaskHolder@42 {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
-
-null {
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-    <name not found> = EmptyList@18[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
deleted file mode 100644
index c512a386da4..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromClass.lazy.log
+++ /dev/null
@@ -1,631 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@11['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@12
-    upperBounds = LinkedHashSet@13[1] { DeserializedType@14['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@14['kotlin.Any']
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@14['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-DeserializedType@18['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('A': FqName@23) = null
-    packageFragments('B': FqName@24) = null
-    packageFragments('Inner': FqName@25) = null
-    packageFragments('KMemberFunction0': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.A': FqName@31) = null
-    packageFragments('java.lang.Inner': FqName@32) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@33) = null
-    packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@35) = null
-    packageFragments('kotlin.Inner': FqName@36) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
-    packageFragments('kotlin.io.A': FqName@40) = null
-    packageFragments('kotlin.io.Inner': FqName@41) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@42) = null
-    packageFragments('kotlin.jvm': FqName@43) = LazyJavaPackageFragment@44['jvm']
-    packageFragments('kotlin.jvm.A': FqName@45) = null
-    packageFragments('kotlin.jvm.Inner': FqName@46) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
-    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('kotlin': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@39['io'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@59 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
-    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-}
-
-LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@44['jvm'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
-    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
-    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-}
-
-LazyJavaPackageFragment@30['lang'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-TypeDeserializer@129 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
-}
-
-TypeDeserializer@132 {
-    classDescriptors('3': Integer@133) = DeserializedClassDescriptor@131['Any']
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@102 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@111 }
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
deleted file mode 100644
index 948a4c172ea..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
+++ /dev/null
@@ -1,429 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@11['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@12
-    upperBounds = LinkedHashSet@13[1] { DeserializedType@14['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@14['kotlin.Any']
-}
-
-DeserializedType@14['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-DeserializedType@18['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('A': FqName@23) = null
-    packageFragments('Int': FqName@24) = null
-    packageFragments('KMemberFunction0': FqName@25) = null
-    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
-    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
-    packageFragments('java.lang.A': FqName@30) = null
-    packageFragments('java.lang.Int': FqName@31) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@34) = null
-    packageFragments('kotlin.Int': FqName@35) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
-    packageFragments('kotlin.io.A': FqName@39) = null
-    packageFragments('kotlin.io.Int': FqName@40) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@41) = null
-    packageFragments('kotlin.jvm': FqName@42) = LazyJavaPackageFragment@43['jvm']
-    packageFragments('kotlin.jvm.A': FqName@44) = null
-    packageFragments('kotlin.jvm.Int': FqName@45) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@46) = null
-    packageFragments('kotlin.reflect': FqName@47) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@48) = null
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('kotlin': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('kotlin': Name@56) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@38['io'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@59 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
-    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@43['jvm'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
-    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
-    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
-}
-
-LazyJavaPackageFragment@29['lang'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
-
-TypeDeserializer@114 {
-    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
-}
-
-TypeDeserializer@117 {
-    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
-    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@121[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@122[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@100 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-    <name not found> = EmptyList@55[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
deleted file mode 100644
index 9e5b84545ad..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromTopLevel.lazy.log
+++ /dev/null
@@ -1,264 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@11['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@12
-    upperBounds = LinkedHashSet@13[1] { DeserializedType@14['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@14['kotlin.Any']
-}
-
-DeserializedType@14['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-    memberScope = DeserializedClassMemberScope@16
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-DeserializedType@18['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@19
-}
-
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('A': FqName@23) = null
-    packageFragments('KMemberFunction0': FqName@24) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.A': FqName@29) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@32) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
-    packageFragments('kotlin.io.A': FqName@36) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@41) = null
-    packageFragments('kotlin.reflect': FqName@42) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@43) = null
-}
-
-LazyJavaPackageFragment@22['<root>'] {
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('KMemberFunction0': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('kotlin': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('kotlin': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-LazyJavaPackageFragment@35['io'] {
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@53
-    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = LinkedHashMap@55 // through DeserializedPackageMemberScope@53
-    properties('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@53
-}
-
-LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('ExtensionFunction0': Name@64) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('io': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('jvm': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('reflect': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = DeserializedPackageMemberScope@68 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('io': Name@69) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    functions('io': Name@69) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('jvm': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    functions('jvm': Name@70) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('reflect': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    functions('reflect': Name@71) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@63
-    membersProtos = LinkedHashMap@73 // through DeserializedPackageMemberScope@68
-    properties('Inner': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    properties('io': Name@69) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    properties('jvm': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-    properties('reflect': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@68
-}
-
-LazyJavaPackageFragment@28['lang'] {
-    classes('Inner': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Inner': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@76) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('KMemberFunction0': Name@78) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
-
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
-}
-
-TypeDeserializer@95 {
-    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
-    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@82 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
deleted file mode 100644
index d2dc7c03fc7..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
+++ /dev/null
@@ -1,332 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function1']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Unit']
-}
-
-DeserializedClassDescriptor@2['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-    defaultType = JetTypeImpl@8['Function1<2>']
-    functions('invoke': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['invoke'] } // through DeserializedClassMemberScope@12
-    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-}
-
-DeserializedClassDescriptor@4['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('invoke': Name@9) = ArrayList@16[1] { DeserializedSimpleFunctionDescriptor@17['invoke'] } // through DeserializedClassMemberScope@18
-    membersProtos = LinkedHashMap@19 // through DeserializedClassMemberScope@18
-}
-
-DeserializedClassDescriptor@6['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@20['P1'] {
-    defaultType = JetTypeImpl@21['P1']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-    upperBounds = LinkedHashSet@23[1] { DeserializedType@24['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@24['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@25['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@26
-    upperBounds = LinkedHashSet@27[1] { DeserializedType@28['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@28['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@29['R'] {
-    defaultType = JetTypeImpl@30['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
-}
-
-DeserializedTypeParameterDescriptor@32['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@34[1] { DeserializedType@35['kotlin.Any'] }
-}
-
-DeserializedType@36['P1 in kotlin.Function1'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@37['P1 in kotlin.reflect.KFunction1'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@38['R in kotlin.Function1'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@31
-}
-
-DeserializedType@39['R in kotlin.reflect.KFunction1'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-DeserializedType@28['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
-}
-
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
-}
-
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-    memberScope = DeserializedClassMemberScope@41
-}
-
-DeserializedType@43['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-}
-
-DeserializedType@24['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@40
-}
-
-DeserializedType@44['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@45
-    memberScope = SubstitutingScope@46
-}
-
-EnumEntryClassDescriptors@47 {
-    findEnumEntry('invoke': Name@9) = null
-}
-
-LazyJavaClassDescriptor@48['A'] {
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@50
-    functionTypeForSamInterface = null
-    functions('main': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['main'] } // through LazyJavaStaticClassScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaStaticClassScope@54
-    nestedClassIndex = LinkedHashMap@56 // through LazyJavaClassMemberScope@50
-    nestedClasses('main': Name@51) = null // through LazyJavaClassMemberScope@50
-    properties('main': Name@51) = EmptyList@57[empty] // through LazyJavaStaticClassScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@58['A']
-}
-
-LazyJavaClassTypeConstructor@58['A'] {
-    parameters = ArrayList@59[empty]
-}
-
-LazyJavaClassifierType@60['String'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaClassImpl@62['String']
-    nullable = 'false': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@64
-}
-
-LazyJavaClassifierType@65['String'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@62['String']
-    nullable = 'true': Boolean@67
-    typeConstructor = DeserializedClassTypeConstructor@64
-}
-
-LazyJavaPackageFragmentProvider@68 {
-    packageFragments('<root>': FqName@69) = LazyJavaPackageFragment@70['<root>']
-    packageFragments('A': FqName@71) = null
-    packageFragments('Array': FqName@72) = null
-    packageFragments('KFunction1': FqName@73) = null
-    packageFragments('String': FqName@74) = null
-    packageFragments('Unit': FqName@75) = null
-    packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
-    packageFragments('java.lang': FqName@78) = LazyJavaPackageFragment@79['lang']
-    packageFragments('java.lang.A': FqName@80) = null
-    packageFragments('java.lang.Array': FqName@81) = null
-    packageFragments('java.lang.KFunction1': FqName@82) = null
-    packageFragments('java.lang.String': FqName@83) = null
-    packageFragments('java.lang.Unit': FqName@84) = null
-    packageFragments('kotlin': FqName@85) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@86) = null
-    packageFragments('kotlin.Array': FqName@87) = null
-    packageFragments('kotlin.KFunction1': FqName@88) = null
-    packageFragments('kotlin.String': FqName@89) = null
-    packageFragments('kotlin.Unit': FqName@90) = null
-    packageFragments('kotlin.io': FqName@91) = LazyJavaPackageFragment@92['io']
-    packageFragments('kotlin.io.A': FqName@93) = null
-    packageFragments('kotlin.io.Array': FqName@94) = null
-    packageFragments('kotlin.io.KFunction1': FqName@95) = null
-    packageFragments('kotlin.io.String': FqName@96) = null
-    packageFragments('kotlin.io.Unit': FqName@97) = null
-    packageFragments('kotlin.jvm': FqName@98) = LazyJavaPackageFragment@99['jvm']
-    packageFragments('kotlin.jvm.A': FqName@100) = null
-    packageFragments('kotlin.jvm.Array': FqName@101) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@102) = null
-    packageFragments('kotlin.jvm.String': FqName@103) = null
-    packageFragments('kotlin.jvm.Unit': FqName@104) = null
-    packageFragments('kotlin.reflect': FqName@105) = LazyJavaPackageFragment@15['reflect']
-    packageFragments('kotlin.reflect.A': FqName@106) = null
-    packageFragments('kotlin.reflect.Array': FqName@107) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@108) = null
-    packageFragments('kotlin.reflect.String': FqName@109) = null
-    packageFragments('kotlin.reflect.Unit': FqName@110) = null
-    packageFragments('test': FqName@111) = LazyJavaPackageFragment@112['test']
-    packageFragments('test.A': FqName@113) = null
-    topLevelClasses(JavaClassImpl@114['A']) = LazyJavaClassDescriptor@48['A']
-}
-
-LazyJavaPackageFragment@70['<root>'] {
-    classes('A': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('KFunction1': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('kotlin': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('test': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('kotlin': Name@125) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('test': Name@126) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@92['io'] {
-    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
-    membersProtos = LinkedHashMap@131 // through DeserializedPackageMemberScope@129
-}
-
-LazyJavaPackageFragment@77['java'] {
-    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('lang': Name@134) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
-}
-
-LazyJavaPackageFragment@99['jvm'] {
-    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Function1': Name@140) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Unit': Name@120) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('io': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('jvm': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('reflect': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = DeserializedPackageMemberScope@144 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('io': Name@145) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('jvm': Name@146) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('reflect': Name@147) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('reflect': Name@147) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@139
-    membersProtos = LinkedHashMap@149 // through DeserializedPackageMemberScope@144
-    properties('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    properties('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    properties('reflect': Name@147) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-}
-
-LazyJavaPackageFragment@79['lang'] {
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
-}
-
-LazyJavaPackageFragment@15['reflect'] {
-    classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('KFunction1': Name@153) = DeserializedClassDescriptor@4['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@152
-}
-
-LazyJavaPackageFragment@112['test'] {
-    classes('A': Name@155) = LazyJavaClassDescriptor@48['A'] // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('A': Name@157) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
-}
-
-NestedClassDescriptors@159 {
-    findNestedClass('invoke': Name@9) = null
-}
-
-ResolutionTaskHolder@160 {
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@163 {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@166 {
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-TypeDeserializer@184 {
-    classDescriptors('2': Integer@185) = DeserializedClassDescriptor@186['Any']
-}
-
-TypeDeserializer@187 {
-    classDescriptors('2': Integer@185) = DeserializedClassDescriptor@186['Any']
-}
-
-TypeDeserializer@188 {
-    classDescriptors('3': Integer@189) = DeserializedClassDescriptor@186['Any']
-    classDescriptors('4': Integer@190) = DeserializedClassDescriptor@2['Function1']
-}
-
-null {
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@162 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@168 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@180 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@165 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@177 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.lazy.log
deleted file mode 100644
index 218b1b56698..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/lhsNotAClass.lazy.log
+++ /dev/null
@@ -1,65 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = ErrorTypeImpl@1
-    <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
-    <name not found> = ErrorTypeImpl@4
-}
-
-LazyJavaPackageFragmentProvider@5 {
-    packageFragments('<root>': FqName@6) = LazyJavaPackageFragment@7['<root>']
-    packageFragments('A': FqName@8) = null
-    packageFragments('Any': FqName@9) = null
-    packageFragments('T': FqName@10) = null
-    packageFragments('U': FqName@11) = null
-    packageFragments('java': FqName@12) = LazyJavaPackageFragment@13['java']
-    packageFragments('java.lang': FqName@14) = LazyJavaPackageFragment@15['lang']
-    packageFragments('java.lang.Any': FqName@16) = null
-    packageFragments('java.lang.T': FqName@17) = null
-    packageFragments('java.lang.U': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = LazyJavaPackageFragment@20['kotlin']
-    packageFragments('kotlin.Any': FqName@21) = null
-    packageFragments('kotlin.T': FqName@22) = null
-    packageFragments('kotlin.U': FqName@23) = null
-    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    packageFragments('kotlin.io.Any': FqName@26) = null
-    packageFragments('kotlin.io.T': FqName@27) = null
-    packageFragments('kotlin.io.U': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@31) = null
-    packageFragments('kotlin.jvm.T': FqName@32) = null
-    packageFragments('kotlin.jvm.U': FqName@33) = null
-}
-
-LazyJavaPackageFragment@7['<root>'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@25['io'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@36
-}
-
-LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@30['jvm'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@20['kotlin'] {
-    classes('Any': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('io': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('jvm': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = DeserializedPackageMemberScope@47 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('io': Name@48) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
-    functions('io': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('jvm': Name@49) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
-    functions('jvm': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
-    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@47
-    properties('io': Name@48) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
-    properties('jvm': Name@49) = EmptyList@41[empty] // through DeserializedPackageMemberScope@47
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
deleted file mode 100644
index 199669b59bc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
+++ /dev/null
@@ -1,149 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('KFunction0': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.A': FqName@25) = null
-    packageFragments('java.lang.KFunction0': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.KFunction0': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    packageFragments('kotlin.io.A': FqName@32) = null
-    packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    packageFragments('kotlin.jvm.A': FqName@36) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('KFunction0': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('kotlin': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('kotlin': Name@46) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@31['io'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-    membersProtos = LinkedHashMap@51 // through DeserializedPackageMemberScope@49
-    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@49
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@35['jvm'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Any': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Function0': Name@60) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('io': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('jvm': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('reflect': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('io': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('jvm': Name@66) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    functions('reflect': Name@67) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@58
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@64
-    properties('A': Name@40) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('io': Name@65) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('jvm': Name@66) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-    properties('reflect': Name@67) = EmptyList@45[empty] // through DeserializedPackageMemberScope@64
-}
-
-LazyJavaPackageFragment@24['lang'] {
-    classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('A': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@72) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('KFunction0': Name@74) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-TypeDeserializer@82 {
-    classDescriptors('2': Integer@83) = DeserializedClassDescriptor@84['Any']
-}
-
-TypeDeserializer@85 {
-    classDescriptors('3': Integer@86) = DeserializedClassDescriptor@84['Any']
-    classDescriptors('4': Integer@87) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
deleted file mode 100644
index a84adf378d6..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
+++ /dev/null
@@ -1,236 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    packageFragments('kotlin.io.A': FqName@35) = null
-    packageFragments('kotlin.io.Int': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.Int': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['io'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-TypeDeserializer@94 {
-    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
-}
-
-TypeDeserializer@97 {
-    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
-    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
deleted file mode 100644
index dadffec4822..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
+++ /dev/null
@@ -1,174 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['KFunction0<1>']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@13
-    memberScope = DeserializedClassMemberScope@14
-}
-
-DeserializedType@15['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@13
-}
-
-DeserializedType@16['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-LazyJavaPackageFragmentProvider@18 {
-    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
-    packageFragments('A': FqName@21) = null
-    packageFragments('KFunction0': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.A': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.KFunction0': FqName@31) = null
-    packageFragments('kotlin.io': FqName@32) = LazyJavaPackageFragment@33['io']
-    packageFragments('kotlin.io.A': FqName@34) = null
-    packageFragments('kotlin.io.KFunction0': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = LazyJavaPackageFragment@37['jvm']
-    packageFragments('kotlin.jvm.A': FqName@38) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@39) = null
-    packageFragments('kotlin.reflect': FqName@40) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@41) = null
-}
-
-LazyJavaPackageFragment@20['<root>'] {
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('KFunction0': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('kotlin': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('kotlin': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@43
-}
-
-LazyJavaPackageFragment@33['io'] {
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
-    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-    membersProtos = LinkedHashMap@54 // through DeserializedPackageMemberScope@52
-    properties('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
-    properties('x': Name@46) = EmptyList@48[empty] // through DeserializedPackageMemberScope@52
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@57) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-LazyJavaPackageFragment@37['jvm'] {
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Any': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Function0': Name@63) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('io': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('jvm': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('reflect': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('io': Name@68) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    functions('io': Name@68) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('jvm': Name@69) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    functions('jvm': Name@69) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('reflect': Name@70) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    functions('reflect': Name@70) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@61
-    membersProtos = LinkedHashMap@72 // through DeserializedPackageMemberScope@67
-    properties('A': Name@42) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    properties('io': Name@68) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    properties('jvm': Name@69) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    properties('reflect': Name@70) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-    properties('x': Name@46) = EmptyList@48[empty] // through DeserializedPackageMemberScope@67
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('A': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KFunction0': Name@75) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('KFunction0': Name@77) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@48[empty]
-}
-
-TypeDeserializer@85 {
-    classDescriptors('2': Integer@86) = DeserializedClassDescriptor@87['Any']
-}
-
-TypeDeserializer@88 {
-    classDescriptors('3': Integer@89) = DeserializedClassDescriptor@87['Any']
-    classDescriptors('4': Integer@90) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@91[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
deleted file mode 100644
index 4de841458bf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
+++ /dev/null
@@ -1,196 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    packageFragments('kotlin.io.A': FqName@35) = null
-    packageFragments('kotlin.io.Int': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.Int': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KFunction0': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['io'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-TypeDeserializer@94 {
-    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
-}
-
-TypeDeserializer@97 {
-    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
-    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
deleted file mode 100644
index f440982f4d4..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
+++ /dev/null
@@ -1,300 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('Int': FqName@39) = null
-    packageFragments('KFunction0': FqName@40) = null
-    packageFragments('KFunction1': FqName@41) = null
-    packageFragments('String': FqName@42) = null
-    packageFragments('Unit': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.Int': FqName@48) = null
-    packageFragments('java.lang.KFunction0': FqName@49) = null
-    packageFragments('java.lang.KFunction1': FqName@50) = null
-    packageFragments('java.lang.String': FqName@51) = null
-    packageFragments('java.lang.Unit': FqName@52) = null
-    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.Int': FqName@54) = null
-    packageFragments('kotlin.KFunction0': FqName@55) = null
-    packageFragments('kotlin.KFunction1': FqName@56) = null
-    packageFragments('kotlin.String': FqName@57) = null
-    packageFragments('kotlin.Unit': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    packageFragments('kotlin.io.Int': FqName@61) = null
-    packageFragments('kotlin.io.KFunction0': FqName@62) = null
-    packageFragments('kotlin.io.KFunction1': FqName@63) = null
-    packageFragments('kotlin.io.String': FqName@64) = null
-    packageFragments('kotlin.io.Unit': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@68) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
-    packageFragments('kotlin.jvm.String': FqName@71) = null
-    packageFragments('kotlin.jvm.Unit': FqName@72) = null
-    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@74) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
-    packageFragments('kotlin.reflect.String': FqName@77) = null
-    packageFragments('kotlin.reflect.Unit': FqName@78) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction1': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('kotlin': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('kotlin': Name@91) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@60['io'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = DeserializedPackageMemberScope@94 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-    membersProtos = LinkedHashMap@96 // through DeserializedPackageMemberScope@94
-    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@67['jvm'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Function0': Name@105) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Function1': Name@106) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Unit': Name@84) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('io': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('jvm': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('reflect': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = DeserializedPackageMemberScope@110 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('io': Name@111) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('jvm': Name@112) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('reflect': Name@113) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
-    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@110
-    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('KFunction0': Name@119) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('KFunction1': Name@120) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@144 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@145 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@133 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
deleted file mode 100644
index 530571e9f98..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
+++ /dev/null
@@ -1,306 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('A': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('KFunction0': FqName@41) = null
-    packageFragments('KFunction1': FqName@42) = null
-    packageFragments('String': FqName@43) = null
-    packageFragments('Unit': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.A': FqName@49) = null
-    packageFragments('java.lang.Int': FqName@50) = null
-    packageFragments('java.lang.KFunction0': FqName@51) = null
-    packageFragments('java.lang.KFunction1': FqName@52) = null
-    packageFragments('java.lang.String': FqName@53) = null
-    packageFragments('java.lang.Unit': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.KFunction0': FqName@58) = null
-    packageFragments('kotlin.KFunction1': FqName@59) = null
-    packageFragments('kotlin.String': FqName@60) = null
-    packageFragments('kotlin.Unit': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    packageFragments('kotlin.io.A': FqName@64) = null
-    packageFragments('kotlin.io.Int': FqName@65) = null
-    packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    packageFragments('kotlin.io.String': FqName@68) = null
-    packageFragments('kotlin.io.Unit': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    packageFragments('kotlin.jvm.A': FqName@72) = null
-    packageFragments('kotlin.jvm.Int': FqName@73) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    packageFragments('kotlin.jvm.String': FqName@76) = null
-    packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@79) = null
-    packageFragments('kotlin.reflect.Int': FqName@80) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    packageFragments('kotlin.reflect.String': FqName@83) = null
-    packageFragments('kotlin.reflect.Unit': FqName@84) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@63['io'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@133 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
deleted file mode 100644
index 5976e7641c9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
+++ /dev/null
@@ -1,336 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['KFunction0<1>']
-    <name not found> = JetTypeImpl@13['KFunction0<1>']
-    <name not found> = JetTypeImpl@14['KFunction1<2>']
-}
-
-DescriptorResolver@15 {
-    <name not found> = JetTypeImpl@16['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@18['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@18['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@19['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@22['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
-DeserializedType@33['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-}
-
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-}
-
-DeserializedType@36['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@37
-}
-
-DeserializedType@38['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaPackageFragmentProvider@40 {
-    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    packageFragments('Int': FqName@43) = null
-    packageFragments('KFunction0': FqName@44) = null
-    packageFragments('KFunction1': FqName@45) = null
-    packageFragments('String': FqName@46) = null
-    packageFragments('Unit': FqName@47) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.Int': FqName@52) = null
-    packageFragments('java.lang.KFunction0': FqName@53) = null
-    packageFragments('java.lang.KFunction1': FqName@54) = null
-    packageFragments('java.lang.String': FqName@55) = null
-    packageFragments('java.lang.Unit': FqName@56) = null
-    packageFragments('kotlin': FqName@57) = LazyJavaPackageFragment@17['kotlin']
-    packageFragments('kotlin.Int': FqName@58) = null
-    packageFragments('kotlin.KFunction0': FqName@59) = null
-    packageFragments('kotlin.KFunction1': FqName@60) = null
-    packageFragments('kotlin.String': FqName@61) = null
-    packageFragments('kotlin.Unit': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    packageFragments('kotlin.io.Int': FqName@65) = null
-    packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    packageFragments('kotlin.io.String': FqName@68) = null
-    packageFragments('kotlin.io.Unit': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@72) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@73) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@74) = null
-    packageFragments('kotlin.jvm.String': FqName@75) = null
-    packageFragments('kotlin.jvm.Unit': FqName@76) = null
-    packageFragments('kotlin.reflect': FqName@77) = LazyJavaPackageFragment@18['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@78) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@79) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@80) = null
-    packageFragments('kotlin.reflect.String': FqName@81) = null
-    packageFragments('kotlin.reflect.Unit': FqName@82) = null
-}
-
-LazyJavaPackageFragment@42['<root>'] {
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('KFunction0': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('KFunction1': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('kotlin': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('kotlin': Name@98) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@64['io'] {
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-    membersProtos = LinkedHashMap@103 // through DeserializedPackageMemberScope@101
-    properties('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('x': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('y': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('z': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
-}
-
-LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Function0': Name@112) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Function1': Name@113) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@88) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('io': Name@118) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('jvm': Name@119) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('reflect': Name@120) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
-    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
-    properties('bar': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('baz': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('x': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('y': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('z': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-}
-
-LazyJavaPackageFragment@51['lang'] {
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@123
-}
-
-LazyJavaPackageFragment@18['reflect'] {
-    classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('KFunction0': Name@126) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('KFunction1': Name@127) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Unit': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('x': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('y': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('z': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-TypeDeserializer@147 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@152 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@155 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@146 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
deleted file mode 100644
index c1f7afa2fbf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
+++ /dev/null
@@ -1,306 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('A': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('KFunction0': FqName@41) = null
-    packageFragments('KFunction1': FqName@42) = null
-    packageFragments('String': FqName@43) = null
-    packageFragments('Unit': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.A': FqName@49) = null
-    packageFragments('java.lang.Int': FqName@50) = null
-    packageFragments('java.lang.KFunction0': FqName@51) = null
-    packageFragments('java.lang.KFunction1': FqName@52) = null
-    packageFragments('java.lang.String': FqName@53) = null
-    packageFragments('java.lang.Unit': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.KFunction0': FqName@58) = null
-    packageFragments('kotlin.KFunction1': FqName@59) = null
-    packageFragments('kotlin.String': FqName@60) = null
-    packageFragments('kotlin.Unit': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    packageFragments('kotlin.io.A': FqName@64) = null
-    packageFragments('kotlin.io.Int': FqName@65) = null
-    packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    packageFragments('kotlin.io.String': FqName@68) = null
-    packageFragments('kotlin.io.Unit': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    packageFragments('kotlin.jvm.A': FqName@72) = null
-    packageFragments('kotlin.jvm.Int': FqName@73) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    packageFragments('kotlin.jvm.String': FqName@76) = null
-    packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@79) = null
-    packageFragments('kotlin.reflect.Int': FqName@80) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    packageFragments('kotlin.reflect.String': FqName@83) = null
-    packageFragments('kotlin.reflect.Unit': FqName@84) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@63['io'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@145 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
deleted file mode 100644
index fc87babfe51..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
+++ /dev/null
@@ -1,224 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Int']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@20['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@21
-}
-
-LazyJavaPackageFragmentProvider@22 {
-    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('Int': FqName@25) = null
-    packageFragments('KMemberFunction0': FqName@26) = null
-    packageFragments('a': FqName@27) = null
-    packageFragments('a.b': FqName@28) = null
-    packageFragments('a.b.c': FqName@29) = null
-    packageFragments('a.b.c.D': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.Int': FqName@35) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@36) = null
-    packageFragments('kotlin': FqName@37) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.Int': FqName@38) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    packageFragments('kotlin.io.Int': FqName@42) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@46) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@47) = null
-    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@49) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@41['io'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-}
-
-LazyJavaPackageFragment@34['lang'] {
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KMemberFunction0': Name@80) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
-}
-
-TypeDeserializer@95 {
-    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
-    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@99[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
deleted file mode 100644
index 0f9440b7146..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
+++ /dev/null
@@ -1,267 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction2']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction2']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['D<2>']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction2'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction2'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedTypeParameterDescriptor@9['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@12['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@13['P2'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@17['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@18
-    upperBounds = LinkedHashSet@19[1] { DeserializedType@20['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-    upperBounds = LinkedHashSet@23[1] { DeserializedType@24['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@24['kotlin.Any']
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@20['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@24['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-    memberScope = DeserializedClassMemberScope@26
-}
-
-DeserializedType@27['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@25
-}
-
-DeserializedType@28['kotlin.ExtensionFunction2'] {
-    constructor = DeserializedClassTypeConstructor@29
-}
-
-LazyJavaPackageFragmentProvider@30 {
-    packageFragments('<root>': FqName@31) = LazyJavaPackageFragment@32['<root>']
-    packageFragments('E': FqName@33) = null
-    packageFragments('F': FqName@34) = null
-    packageFragments('Int': FqName@35) = null
-    packageFragments('KMemberFunction2': FqName@36) = null
-    packageFragments('String': FqName@37) = null
-    packageFragments('a': FqName@38) = null
-    packageFragments('a.b': FqName@39) = null
-    packageFragments('a.b.c': FqName@40) = null
-    packageFragments('a.b.c.D': FqName@41) = null
-    packageFragments('a.b.c.E': FqName@42) = null
-    packageFragments('a.b.c.F': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.E': FqName@48) = null
-    packageFragments('java.lang.F': FqName@49) = null
-    packageFragments('java.lang.Int': FqName@50) = null
-    packageFragments('java.lang.KMemberFunction2': FqName@51) = null
-    packageFragments('java.lang.String': FqName@52) = null
-    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.E': FqName@54) = null
-    packageFragments('kotlin.F': FqName@55) = null
-    packageFragments('kotlin.Int': FqName@56) = null
-    packageFragments('kotlin.KMemberFunction2': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    packageFragments('kotlin.io.E': FqName@61) = null
-    packageFragments('kotlin.io.F': FqName@62) = null
-    packageFragments('kotlin.io.Int': FqName@63) = null
-    packageFragments('kotlin.io.KMemberFunction2': FqName@64) = null
-    packageFragments('kotlin.io.String': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    packageFragments('kotlin.jvm.E': FqName@68) = null
-    packageFragments('kotlin.jvm.F': FqName@69) = null
-    packageFragments('kotlin.jvm.Int': FqName@70) = null
-    packageFragments('kotlin.jvm.KMemberFunction2': FqName@71) = null
-    packageFragments('kotlin.jvm.String': FqName@72) = null
-    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction2': FqName@74) = null
-}
-
-LazyJavaPackageFragment@32['<root>'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('KMemberFunction2': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('kotlin': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('kotlin': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@60['io'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@67['jvm'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('ExtensionFunction2': Name@93) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('io': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('jvm': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('reflect': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = DeserializedPackageMemberScope@97 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-    functions('io': Name@98) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-    functions('jvm': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-    functions('reflect': Name@100) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@92
-    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@97
-    properties('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-    properties('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-    properties('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@103
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction2': Name@104) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('KMemberFunction2': Name@106) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
-
-TypeDeserializer@118 {
-    classDescriptors('2': Integer@119) = DeserializedClassDescriptor@120['Any']
-}
-
-TypeDeserializer@121 {
-    classDescriptors('3': Integer@122) = DeserializedClassDescriptor@120['Any']
-    classDescriptors('4': Integer@123) = DeserializedClassDescriptor@2['ExtensionFunction2']
-}
-
-null {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@113 }
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-    <name not found> = EmptyList@83[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
deleted file mode 100644
index d46c4a3a692..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
+++ /dev/null
@@ -1,340 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMemberFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KMemberFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KMemberFunction0': FqName@49) = null
-    packageFragments('KMemberFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-TypeDeserializer@154 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
deleted file mode 100644
index a1d06ab16e5..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
+++ /dev/null
@@ -1,340 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMemberFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KMemberFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KMemberFunction0': FqName@49) = null
-    packageFragments('KMemberFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@153 }
-}
-
-TypeDeserializer@154 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@157 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('2': Integer@155) = DeserializedClassDescriptor@156['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@162 {
-    classDescriptors('3': Integer@160) = DeserializedClassDescriptor@156['Any']
-    classDescriptors('4': Integer@161) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@153 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@150 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@147 }
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-    <name not found> = EmptyList@104[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
deleted file mode 100644
index 04c48a2b481..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
+++ /dev/null
@@ -1,341 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMemberFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KMemberFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('B': FqName@48) = null
-    packageFragments('Int': FqName@49) = null
-    packageFragments('KMemberFunction0': FqName@50) = null
-    packageFragments('KMemberFunction1': FqName@51) = null
-    packageFragments('String': FqName@52) = null
-    packageFragments('Unit': FqName@53) = null
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('java.lang.A': FqName@58) = null
-    packageFragments('java.lang.Int': FqName@59) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@60) = null
-    packageFragments('java.lang.KMemberFunction1': FqName@61) = null
-    packageFragments('java.lang.String': FqName@62) = null
-    packageFragments('java.lang.Unit': FqName@63) = null
-    packageFragments('kotlin': FqName@64) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@67) = null
-    packageFragments('kotlin.KMemberFunction1': FqName@68) = null
-    packageFragments('kotlin.String': FqName@69) = null
-    packageFragments('kotlin.Unit': FqName@70) = null
-    packageFragments('kotlin.io': FqName@71) = LazyJavaPackageFragment@72['io']
-    packageFragments('kotlin.io.A': FqName@73) = null
-    packageFragments('kotlin.io.Int': FqName@74) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@75) = null
-    packageFragments('kotlin.io.KMemberFunction1': FqName@76) = null
-    packageFragments('kotlin.io.String': FqName@77) = null
-    packageFragments('kotlin.io.Unit': FqName@78) = null
-    packageFragments('kotlin.jvm': FqName@79) = LazyJavaPackageFragment@80['jvm']
-    packageFragments('kotlin.jvm.A': FqName@81) = null
-    packageFragments('kotlin.jvm.Int': FqName@82) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@83) = null
-    packageFragments('kotlin.jvm.KMemberFunction1': FqName@84) = null
-    packageFragments('kotlin.jvm.String': FqName@85) = null
-    packageFragments('kotlin.jvm.Unit': FqName@86) = null
-    packageFragments('kotlin.reflect': FqName@87) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@88) = null
-    packageFragments('kotlin.reflect.Int': FqName@89) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@90) = null
-    packageFragments('kotlin.reflect.KMemberFunction1': FqName@91) = null
-    packageFragments('kotlin.reflect.String': FqName@92) = null
-    packageFragments('kotlin.reflect.Unit': FqName@93) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction0': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('KMemberFunction1': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('kotlin': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('kotlin': Name@106) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@72['io'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = DeserializedPackageMemberScope@109 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
-    membersProtos = LinkedHashMap@111 // through DeserializedPackageMemberScope@109
-    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-}
-
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('lang': Name@114) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-LazyJavaPackageFragment@80['jvm'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('ExtensionFunction0': Name@120) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('ExtensionFunction1': Name@121) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Unit': Name@99) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('io': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('jvm': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('reflect': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = DeserializedPackageMemberScope@125 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('io': Name@126) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('jvm': Name@127) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    functions('reflect': Name@128) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@119
-    membersProtos = LinkedHashMap@130 // through DeserializedPackageMemberScope@125
-    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    properties('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    properties('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-    properties('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
-}
-
-LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('KMemberFunction0': Name@134) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('KMemberFunction1': Name@135) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-}
-
-TypeDeserializer@155 {
-    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('2': Integer@156) = DeserializedClassDescriptor@157['Any']
-}
-
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@157['Any']
-    classDescriptors('4': Integer@162) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@163 {
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@157['Any']
-    classDescriptors('4': Integer@162) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-    <name not found> = EmptyList@105[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
deleted file mode 100644
index d6a3e006976..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
+++ /dev/null
@@ -1,484 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMemberFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMemberFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KMemberFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@30['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-DeserializedType@40['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@41
-}
-
-DeserializedType@42['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-LazyJavaPackageFragmentProvider@44 {
-    packageFragments('<root>': FqName@45) = LazyJavaPackageFragment@46['<root>']
-    packageFragments('A': FqName@47) = null
-    packageFragments('Int': FqName@48) = null
-    packageFragments('KMemberFunction0': FqName@49) = null
-    packageFragments('KMemberFunction1': FqName@50) = null
-    packageFragments('String': FqName@51) = null
-    packageFragments('Unit': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.A': FqName@57) = null
-    packageFragments('java.lang.Int': FqName@58) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@59) = null
-    packageFragments('java.lang.KMemberFunction1': FqName@60) = null
-    packageFragments('java.lang.String': FqName@61) = null
-    packageFragments('java.lang.Unit': FqName@62) = null
-    packageFragments('kotlin': FqName@63) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@66) = null
-    packageFragments('kotlin.KMemberFunction1': FqName@67) = null
-    packageFragments('kotlin.String': FqName@68) = null
-    packageFragments('kotlin.Unit': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = LazyJavaPackageFragment@71['io']
-    packageFragments('kotlin.io.A': FqName@72) = null
-    packageFragments('kotlin.io.Int': FqName@73) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@74) = null
-    packageFragments('kotlin.io.KMemberFunction1': FqName@75) = null
-    packageFragments('kotlin.io.String': FqName@76) = null
-    packageFragments('kotlin.io.Unit': FqName@77) = null
-    packageFragments('kotlin.jvm': FqName@78) = LazyJavaPackageFragment@79['jvm']
-    packageFragments('kotlin.jvm.A': FqName@80) = null
-    packageFragments('kotlin.jvm.Int': FqName@81) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@82) = null
-    packageFragments('kotlin.jvm.KMemberFunction1': FqName@83) = null
-    packageFragments('kotlin.jvm.String': FqName@84) = null
-    packageFragments('kotlin.jvm.Unit': FqName@85) = null
-    packageFragments('kotlin.reflect': FqName@86) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@87) = null
-    packageFragments('kotlin.reflect.Int': FqName@88) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@89) = null
-    packageFragments('kotlin.reflect.KMemberFunction1': FqName@90) = null
-    packageFragments('kotlin.reflect.String': FqName@91) = null
-    packageFragments('kotlin.reflect.Unit': FqName@92) = null
-}
-
-LazyJavaPackageFragment@46['<root>'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction0': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('KMemberFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@101) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
-}
-
-LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@109
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('ExtensionFunction0': Name@112) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('ExtensionFunction1': Name@113) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-    functions('io': Name@118) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-    functions('jvm': Name@119) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-    functions('reflect': Name@120) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
-    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
-    properties('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-    properties('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-    properties('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KMemberFunction0': Name@124) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('KMemberFunction1': Name@125) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@123
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@151 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@153 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@154 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
-
-TypeDeserializer@156 {
-    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
-}
-
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@157) = DeserializedClassDescriptor@158['Any']
-}
-
-TypeDeserializer@161 {
-    classDescriptors('3': Integer@162) = DeserializedClassDescriptor@158['Any']
-    classDescriptors('4': Integer@163) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@164 {
-    classDescriptors('3': Integer@162) = DeserializedClassDescriptor@158['Any']
-    classDescriptors('4': Integer@163) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-null {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@167[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@140 }
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-    <name not found> = EmptyList@102[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
deleted file mode 100644
index 909ca3cf5ac..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
+++ /dev/null
@@ -1,474 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('B': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('Nested': FqName@22) = null
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('java.lang.A': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('java.lang.Nested': FqName@29) = null
-    packageFragments('kotlin': FqName@30) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.Nested': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = LazyJavaPackageFragment@35['io']
-    packageFragments('kotlin.io.A': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.io.Nested': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = LazyJavaPackageFragment@40['jvm']
-    packageFragments('kotlin.jvm.A': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.jvm.Nested': FqName@43) = null
-    packageFragments('kotlin.reflect': FqName@44) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@45) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('KFunction0': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@35['io'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@40['jvm'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@26['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
-}
-
-ResolutionTaskHolder@109 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@112 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@113 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@115 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@116 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-TypeDeserializer@117 {
-    classDescriptors('2': Integer@118) = DeserializedClassDescriptor@119['Any']
-}
-
-TypeDeserializer@120 {
-    classDescriptors('3': Integer@121) = DeserializedClassDescriptor@119['Any']
-    classDescriptors('4': Integer@122) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@125[1] { ResolutionCandidate@108 }
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
deleted file mode 100644
index 844d8ed01b7..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
+++ /dev/null
@@ -1,403 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('Int': FqName@20) = null
-    packageFragments('KFunction0': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.Int': FqName@27) = null
-    packageFragments('java.lang.KFunction0': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@30) = null
-    packageFragments('kotlin.Int': FqName@31) = null
-    packageFragments('kotlin.KFunction0': FqName@32) = null
-    packageFragments('kotlin.io': FqName@33) = LazyJavaPackageFragment@34['io']
-    packageFragments('kotlin.io.A': FqName@35) = null
-    packageFragments('kotlin.io.Int': FqName@36) = null
-    packageFragments('kotlin.io.KFunction0': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = LazyJavaPackageFragment@39['jvm']
-    packageFragments('kotlin.jvm.A': FqName@40) = null
-    packageFragments('kotlin.jvm.Int': FqName@41) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@42) = null
-    packageFragments('kotlin.reflect': FqName@43) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@44) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('KFunction0': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@34['io'] {
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@55 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@39['jvm'] {
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
-
-TypeDeserializer@103 {
-    classDescriptors('2': Integer@104) = DeserializedClassDescriptor@105['Any']
-}
-
-TypeDeserializer@106 {
-    classDescriptors('3': Integer@107) = DeserializedClassDescriptor@105['Any']
-    classDescriptors('4': Integer@108) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@96 }
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-    <name not found> = EmptyList@51[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
deleted file mode 100644
index 739a276ce5d..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
+++ /dev/null
@@ -1,155 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-    upperBounds = LinkedHashSet@9[1] { DeserializedType@10['kotlin.Any'] }
-}
-
-DeserializedType@10['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-    memberScope = DeserializedClassMemberScope@12
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@11
-}
-
-DeserializedType@14['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@15
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('A': FqName@19) = null
-    packageFragments('KFunction0': FqName@20) = null
-    packageFragments('java': FqName@21) = LazyJavaPackageFragment@22['java']
-    packageFragments('java.lang': FqName@23) = LazyJavaPackageFragment@24['lang']
-    packageFragments('java.lang.A': FqName@25) = null
-    packageFragments('java.lang.KFunction0': FqName@26) = null
-    packageFragments('kotlin': FqName@27) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@28) = null
-    packageFragments('kotlin.KFunction0': FqName@29) = null
-    packageFragments('kotlin.io': FqName@30) = LazyJavaPackageFragment@31['io']
-    packageFragments('kotlin.io.A': FqName@32) = null
-    packageFragments('kotlin.io.KFunction0': FqName@33) = null
-    packageFragments('kotlin.jvm': FqName@34) = LazyJavaPackageFragment@35['jvm']
-    packageFragments('kotlin.jvm.A': FqName@36) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@37) = null
-    packageFragments('kotlin.reflect': FqName@38) = LazyJavaPackageFragment@6['reflect']
-    packageFragments('kotlin.reflect.KFunction0': FqName@39) = null
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('KFunction0': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('kotlin': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Function0': Name@53) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('reflect': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@59) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('reflect': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('reflect': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
-    properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('reflect': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@63) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('KFunction0': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
-
-TypeDeserializer@75 {
-    classDescriptors('2': Integer@76) = DeserializedClassDescriptor@77['Any']
-}
-
-TypeDeserializer@78 {
-    classDescriptors('3': Integer@79) = DeserializedClassDescriptor@77['Any']
-    classDescriptors('4': Integer@80) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@81[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-    <name not found> = EmptyList@45[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
deleted file mode 100644
index 56b49243992..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
+++ /dev/null
@@ -1,117 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Int']
-    <name not found> = JetTypeImpl@6['Int']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-}
-
-DeserializedType@11['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@12
-}
-
-DeserializedType@13['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@14
-}
-
-LazyJavaPackageFragmentProvider@15 {
-    packageFragments('<root>': FqName@16) = LazyJavaPackageFragment@17['<root>']
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('kotlin': FqName@22) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.io': FqName@23) = LazyJavaPackageFragment@24['io']
-    packageFragments('kotlin.jvm': FqName@25) = LazyJavaPackageFragment@26['jvm']
-    packageFragments('kotlin.reflect': FqName@27) = LazyJavaPackageFragment@8['reflect']
-}
-
-LazyJavaPackageFragment@17['<root>'] {
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
-}
-
-LazyJavaPackageFragment@24['io'] {
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = DeserializedPackageMemberScope@34 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@34
-    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
-    membersProtos = LinkedHashMap@36 // through DeserializedPackageMemberScope@34
-    properties('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@34
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
-}
-
-LazyJavaPackageFragment@26['jvm'] {
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('Function0': Name@45) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('io': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('jvm': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = DeserializedPackageMemberScope@48 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-    functions('io': Name@49) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-    functions('jvm': Name@50) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@44
-    membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@48
-    properties('bar': Name@28) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-    properties('io': Name@49) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-    properties('jvm': Name@50) = EmptyList@31[empty] // through DeserializedPackageMemberScope@48
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('bar': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('bar': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KFunction0': Name@55) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@57 {
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
-}
-
-TypeDeserializer@60 {
-    classDescriptors('2': Integer@61) = DeserializedClassDescriptor@62['Any']
-}
-
-TypeDeserializer@63 {
-    classDescriptors('4': Integer@64) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@59 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
deleted file mode 100644
index c43abfef71d..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
+++ /dev/null
@@ -1,217 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-}
-
-DescriptorResolver@5 {
-    <name not found> = JetTypeImpl@6['Int']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@20['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@21
-}
-
-LazyJavaPackageFragmentProvider@22 {
-    packageFragments('<root>': FqName@23) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('A': FqName@25) = null
-    packageFragments('Int': FqName@26) = null
-    packageFragments('KMemberFunction0': FqName@27) = null
-    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    packageFragments('java.lang.A': FqName@32) = null
-    packageFragments('java.lang.Int': FqName@33) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@34) = null
-    packageFragments('kotlin': FqName@35) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@36) = null
-    packageFragments('kotlin.Int': FqName@37) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@38) = null
-    packageFragments('kotlin.io': FqName@39) = LazyJavaPackageFragment@40['io']
-    packageFragments('kotlin.io.A': FqName@41) = null
-    packageFragments('kotlin.io.Int': FqName@42) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    packageFragments('kotlin.jvm': FqName@44) = LazyJavaPackageFragment@45['jvm']
-    packageFragments('kotlin.jvm.A': FqName@46) = null
-    packageFragments('kotlin.jvm.Int': FqName@47) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
-    packageFragments('kotlin.reflect': FqName@49) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@50) = null
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('KMemberFunction0': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@40['io'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
-}
-
-LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@77) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('KMemberFunction0': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
-}
-
-ResolutionTaskHolder@84 {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-ResolutionTaskHolder@90 {
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
-
-TypeDeserializer@91 {
-    classDescriptors('2': Integer@92) = DeserializedClassDescriptor@93['Any']
-}
-
-TypeDeserializer@94 {
-    classDescriptors('3': Integer@95) = DeserializedClassDescriptor@93['Any']
-    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@86 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@83 }
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-    <name not found> = EmptyList@57[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
deleted file mode 100644
index 082f25f9dc8..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
+++ /dev/null
@@ -1,182 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberFunction0']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Unit']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedClassDescriptor@4['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@8['reflect']
-}
-
-DeserializedClassDescriptor@6['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@7['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@9['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@10
-    upperBounds = LinkedHashSet@11[1] { DeserializedType@12['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@13['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-    upperBounds = LinkedHashSet@15[1] { DeserializedType@16['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@16['kotlin.Any']
-}
-
-DeserializedType@16['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@12['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-    memberScope = DeserializedClassMemberScope@18
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@20['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@17
-}
-
-DeserializedType@21['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaPackageFragmentProvider@23 {
-    packageFragments('<root>': FqName@24) = LazyJavaPackageFragment@25['<root>']
-    packageFragments('A': FqName@26) = null
-    packageFragments('KMemberFunction0': FqName@27) = null
-    packageFragments('Unit': FqName@28) = null
-    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
-    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
-    packageFragments('java.lang.A': FqName@33) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@34) = null
-    packageFragments('java.lang.Unit': FqName@35) = null
-    packageFragments('kotlin': FqName@36) = LazyJavaPackageFragment@7['kotlin']
-    packageFragments('kotlin.A': FqName@37) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@38) = null
-    packageFragments('kotlin.Unit': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = LazyJavaPackageFragment@41['io']
-    packageFragments('kotlin.io.A': FqName@42) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@43) = null
-    packageFragments('kotlin.io.Unit': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    packageFragments('kotlin.jvm.A': FqName@47) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@48) = null
-    packageFragments('kotlin.jvm.Unit': FqName@49) = null
-    packageFragments('kotlin.reflect': FqName@50) = LazyJavaPackageFragment@8['reflect']
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@51) = null
-}
-
-LazyJavaPackageFragment@25['<root>'] {
-    classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('kotlin': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('kotlin': Name@59) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@53
-}
-
-LazyJavaPackageFragment@41['io'] {
-    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = DeserializedPackageMemberScope@62 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-    membersProtos = LinkedHashMap@64 // through DeserializedPackageMemberScope@62
-    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
-}
-
-LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('lang': Name@67) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-LazyJavaPackageFragment@46['jvm'] {
-    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
-}
-
-LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('Unit': Name@54) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    functions('io': Name@78) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    functions('jvm': Name@79) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    functions('reflect': Name@80) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
-    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
-    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    properties('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    properties('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-    properties('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
-}
-
-LazyJavaPackageFragment@32['lang'] {
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
-}
-
-LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@85) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('KMemberFunction0': Name@87) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-}
-
-TypeDeserializer@95 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
-}
-
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
-}
-
-TypeDeserializer@99 {
-    classDescriptors('3': Integer@100) = DeserializedClassDescriptor@97['Any']
-    classDescriptors('4': Integer@101) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-null {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@58[empty]
-    <name not found> = EmptyList@58[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
deleted file mode 100644
index 4b3e56a4ea9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
+++ /dev/null
@@ -1,521 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['ExtensionFunction1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Function0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KExtensionFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KFunction0']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['KMemberFunction0']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['Unit']
-}
-
-DescriptorResolver@15 {
-    <name not found> = JetTypeImpl@16['Int']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedClassDescriptor@4['ExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedClassDescriptor@6['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedClassDescriptor@8['KExtensionFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@18['reflect']
-}
-
-DeserializedClassDescriptor@10['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@18['reflect']
-}
-
-DeserializedClassDescriptor@12['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@18['reflect']
-}
-
-DeserializedClassDescriptor@14['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@17['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@19['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@22['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@31['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@35['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@37[1] { DeserializedType@38['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@38['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@39['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-    upperBounds = LinkedHashSet@41[1] { DeserializedType@42['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@42['kotlin.Any']
-}
-
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@45['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-DeserializedType@47['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-DeserializedType@48['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-}
-
-DeserializedType@49['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@50
-}
-
-DeserializedType@51['kotlin.ExtensionFunction1'] {
-    constructor = DeserializedClassTypeConstructor@52
-}
-
-DeserializedType@53['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@54
-}
-
-LazyJavaPackageFragmentProvider@55 {
-    packageFragments('<root>': FqName@56) = LazyJavaPackageFragment@57['<root>']
-    packageFragments('A': FqName@58) = null
-    packageFragments('AA': FqName@59) = null
-    packageFragments('Int': FqName@60) = null
-    packageFragments('KExtensionFunction1': FqName@61) = null
-    packageFragments('KFunction0': FqName@62) = null
-    packageFragments('KMemberFunction0': FqName@63) = null
-    packageFragments('String': FqName@64) = null
-    packageFragments('Unit': FqName@65) = null
-    packageFragments('java': FqName@66) = LazyJavaPackageFragment@67['java']
-    packageFragments('java.lang': FqName@68) = LazyJavaPackageFragment@69['lang']
-    packageFragments('java.lang.A': FqName@70) = null
-    packageFragments('java.lang.AA': FqName@71) = null
-    packageFragments('java.lang.Int': FqName@72) = null
-    packageFragments('java.lang.KExtensionFunction1': FqName@73) = null
-    packageFragments('java.lang.KFunction0': FqName@74) = null
-    packageFragments('java.lang.KMemberFunction0': FqName@75) = null
-    packageFragments('java.lang.String': FqName@76) = null
-    packageFragments('java.lang.Unit': FqName@77) = null
-    packageFragments('kotlin': FqName@78) = LazyJavaPackageFragment@17['kotlin']
-    packageFragments('kotlin.A': FqName@79) = null
-    packageFragments('kotlin.AA': FqName@80) = null
-    packageFragments('kotlin.Int': FqName@81) = null
-    packageFragments('kotlin.KExtensionFunction1': FqName@82) = null
-    packageFragments('kotlin.KFunction0': FqName@83) = null
-    packageFragments('kotlin.KMemberFunction0': FqName@84) = null
-    packageFragments('kotlin.String': FqName@85) = null
-    packageFragments('kotlin.Unit': FqName@86) = null
-    packageFragments('kotlin.io': FqName@87) = LazyJavaPackageFragment@88['io']
-    packageFragments('kotlin.io.A': FqName@89) = null
-    packageFragments('kotlin.io.AA': FqName@90) = null
-    packageFragments('kotlin.io.Int': FqName@91) = null
-    packageFragments('kotlin.io.KExtensionFunction1': FqName@92) = null
-    packageFragments('kotlin.io.KFunction0': FqName@93) = null
-    packageFragments('kotlin.io.KMemberFunction0': FqName@94) = null
-    packageFragments('kotlin.io.String': FqName@95) = null
-    packageFragments('kotlin.io.Unit': FqName@96) = null
-    packageFragments('kotlin.jvm': FqName@97) = LazyJavaPackageFragment@98['jvm']
-    packageFragments('kotlin.jvm.A': FqName@99) = null
-    packageFragments('kotlin.jvm.AA': FqName@100) = null
-    packageFragments('kotlin.jvm.Int': FqName@101) = null
-    packageFragments('kotlin.jvm.KExtensionFunction1': FqName@102) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@103) = null
-    packageFragments('kotlin.jvm.KMemberFunction0': FqName@104) = null
-    packageFragments('kotlin.jvm.String': FqName@105) = null
-    packageFragments('kotlin.jvm.Unit': FqName@106) = null
-    packageFragments('kotlin.reflect': FqName@107) = LazyJavaPackageFragment@18['reflect']
-    packageFragments('kotlin.reflect.AA': FqName@108) = null
-    packageFragments('kotlin.reflect.Int': FqName@109) = null
-    packageFragments('kotlin.reflect.KExtensionFunction1': FqName@110) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@111) = null
-    packageFragments('kotlin.reflect.KMemberFunction0': FqName@112) = null
-    packageFragments('kotlin.reflect.String': FqName@113) = null
-    packageFragments('kotlin.reflect.Unit': FqName@114) = null
-    packageFragments('other': FqName@115) = null
-    packageFragments('other.A': FqName@116) = null
-    packageFragments('other.String': FqName@117) = null
-    packageFragments('other.baz': FqName@118) = null
-    packageFragments('other.foo': FqName@119) = null
-}
-
-LazyJavaPackageFragment@57['<root>'] {
-    classes('AA': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KExtensionFunction1': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KFunction0': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KMemberFunction0': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('kotlin': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('other': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('kotlin': Name@134) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('other': Name@135) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-LazyJavaPackageFragment@88['io'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    deserializedPackageScope = DeserializedPackageMemberScope@139 // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@137
-    membersProtos = LinkedHashMap@141 // through DeserializedPackageMemberScope@139
-    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
-}
-
-LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('lang': Name@144) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@143
-}
-
-LazyJavaPackageFragment@98['jvm'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
-}
-
-LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ExtensionFunction0': Name@150) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ExtensionFunction1': Name@151) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Function0': Name@152) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Unit': Name@127) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('io': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('jvm': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('reflect': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = DeserializedPackageMemberScope@156 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    functions('io': Name@157) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    functions('jvm': Name@158) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    functions('reflect': Name@159) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
-    membersProtos = LinkedHashMap@161 // through DeserializedPackageMemberScope@156
-    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    properties('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    properties('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-    properties('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
-}
-
-LazyJavaPackageFragment@69['lang'] {
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@18['reflect'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('KExtensionFunction1': Name@165) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('KFunction0': Name@166) = DeserializedClassDescriptor@10['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('KMemberFunction0': Name@167) = DeserializedClassDescriptor@12['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@164
-    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@164
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = ArrayList@170[1] { ResolutionCandidate@171 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@172 {
-    <name not found> = ArrayList@173[1] { ResolutionCandidate@174 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@175 {
-    <name not found> = ArrayList@176[1] { ResolutionCandidate@177 }
-}
-
-ResolutionTaskHolder@178 {
-    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
-}
-
-ResolutionTaskHolder@181 {
-    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
-}
-
-ResolutionTaskHolder@184 {
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@186 }
-}
-
-ResolutionTaskHolder@187 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@189 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@190 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@192 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
-
-TypeDeserializer@195 {
-    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
-}
-
-TypeDeserializer@198 {
-    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
-}
-
-TypeDeserializer@199 {
-    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
-}
-
-TypeDeserializer@200 {
-    classDescriptors('2': Integer@196) = DeserializedClassDescriptor@197['Any']
-}
-
-TypeDeserializer@201 {
-    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
-    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@204 {
-    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
-    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@4['ExtensionFunction1']
-}
-
-TypeDeserializer@205 {
-    classDescriptors('3': Integer@202) = DeserializedClassDescriptor@197['Any']
-    classDescriptors('4': Integer@203) = DeserializedClassDescriptor@6['Function0']
-}
-
-null {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@171 }
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@186 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@174 }
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@183 }
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@177 }
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@180 }
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-    <name not found> = EmptyList@133[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
deleted file mode 100644
index 487cd5ee048..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
+++ /dev/null
@@ -1,349 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('A': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('KFunction0': FqName@41) = null
-    packageFragments('KFunction1': FqName@42) = null
-    packageFragments('String': FqName@43) = null
-    packageFragments('Unit': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.Int': FqName@49) = null
-    packageFragments('java.lang.KFunction0': FqName@50) = null
-    packageFragments('java.lang.KFunction1': FqName@51) = null
-    packageFragments('java.lang.String': FqName@52) = null
-    packageFragments('java.lang.Unit': FqName@53) = null
-    packageFragments('kotlin': FqName@54) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.Int': FqName@55) = null
-    packageFragments('kotlin.KFunction0': FqName@56) = null
-    packageFragments('kotlin.KFunction1': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.Unit': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = LazyJavaPackageFragment@61['io']
-    packageFragments('kotlin.io.Int': FqName@62) = null
-    packageFragments('kotlin.io.KFunction0': FqName@63) = null
-    packageFragments('kotlin.io.KFunction1': FqName@64) = null
-    packageFragments('kotlin.io.String': FqName@65) = null
-    packageFragments('kotlin.io.Unit': FqName@66) = null
-    packageFragments('kotlin.jvm': FqName@67) = LazyJavaPackageFragment@68['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@69) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@70) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@71) = null
-    packageFragments('kotlin.jvm.String': FqName@72) = null
-    packageFragments('kotlin.jvm.Unit': FqName@73) = null
-    packageFragments('kotlin.reflect': FqName@74) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@75) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@76) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@77) = null
-    packageFragments('kotlin.reflect.String': FqName@78) = null
-    packageFragments('kotlin.reflect.Unit': FqName@79) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction0': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('KFunction1': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('kotlin': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('kotlin': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@61['io'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = DeserializedPackageMemberScope@95 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-    membersProtos = LinkedHashMap@97 // through DeserializedPackageMemberScope@95
-    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@68['jvm'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Function0': Name@106) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Function1': Name@107) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Unit': Name@85) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('io': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('jvm': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('reflect': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = DeserializedPackageMemberScope@111 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('io': Name@112) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('jvm': Name@113) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    functions('reflect': Name@114) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@105
-    membersProtos = LinkedHashMap@116 // through DeserializedPackageMemberScope@111
-    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    properties('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    properties('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-    properties('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('KFunction0': Name@120) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('KFunction1': Name@121) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@119
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-TypeDeserializer@141 {
-    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
-}
-
-TypeDeserializer@144 {
-    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
-}
-
-TypeDeserializer@145 {
-    classDescriptors('2': Integer@142) = DeserializedClassDescriptor@143['Any']
-}
-
-TypeDeserializer@146 {
-    classDescriptors('3': Integer@147) = DeserializedClassDescriptor@143['Any']
-    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('3': Integer@147) = DeserializedClassDescriptor@143['Any']
-    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@125 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@128 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-    <name not found> = EmptyList@91[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
deleted file mode 100644
index 15fb9ee28fa..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
+++ /dev/null
@@ -1,354 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('A': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('KFunction0': FqName@41) = null
-    packageFragments('KFunction1': FqName@42) = null
-    packageFragments('String': FqName@43) = null
-    packageFragments('Unit': FqName@44) = null
-    packageFragments('java': FqName@45) = LazyJavaPackageFragment@46['java']
-    packageFragments('java.lang': FqName@47) = LazyJavaPackageFragment@48['lang']
-    packageFragments('java.lang.A': FqName@49) = null
-    packageFragments('java.lang.Int': FqName@50) = null
-    packageFragments('java.lang.KFunction0': FqName@51) = null
-    packageFragments('java.lang.KFunction1': FqName@52) = null
-    packageFragments('java.lang.String': FqName@53) = null
-    packageFragments('java.lang.Unit': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@56) = null
-    packageFragments('kotlin.Int': FqName@57) = null
-    packageFragments('kotlin.KFunction0': FqName@58) = null
-    packageFragments('kotlin.KFunction1': FqName@59) = null
-    packageFragments('kotlin.String': FqName@60) = null
-    packageFragments('kotlin.Unit': FqName@61) = null
-    packageFragments('kotlin.io': FqName@62) = LazyJavaPackageFragment@63['io']
-    packageFragments('kotlin.io.A': FqName@64) = null
-    packageFragments('kotlin.io.Int': FqName@65) = null
-    packageFragments('kotlin.io.KFunction0': FqName@66) = null
-    packageFragments('kotlin.io.KFunction1': FqName@67) = null
-    packageFragments('kotlin.io.String': FqName@68) = null
-    packageFragments('kotlin.io.Unit': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = LazyJavaPackageFragment@71['jvm']
-    packageFragments('kotlin.jvm.A': FqName@72) = null
-    packageFragments('kotlin.jvm.Int': FqName@73) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@74) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@75) = null
-    packageFragments('kotlin.jvm.String': FqName@76) = null
-    packageFragments('kotlin.jvm.Unit': FqName@77) = null
-    packageFragments('kotlin.reflect': FqName@78) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@79) = null
-    packageFragments('kotlin.reflect.Int': FqName@80) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@81) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@82) = null
-    packageFragments('kotlin.reflect.String': FqName@83) = null
-    packageFragments('kotlin.reflect.Unit': FqName@84) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction0': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('KFunction1': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('kotlin': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('kotlin': Name@97) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@63['io'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@100
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
-}
-
-LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-}
-
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@154 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@145 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-    <name not found> = EmptyList@96[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
deleted file mode 100644
index d95a36df8db..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
+++ /dev/null
@@ -1,415 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('A': FqName@39) = null
-    packageFragments('B': FqName@40) = null
-    packageFragments('Int': FqName@41) = null
-    packageFragments('KFunction0': FqName@42) = null
-    packageFragments('KFunction1': FqName@43) = null
-    packageFragments('String': FqName@44) = null
-    packageFragments('Unit': FqName@45) = null
-    packageFragments('java': FqName@46) = LazyJavaPackageFragment@47['java']
-    packageFragments('java.lang': FqName@48) = LazyJavaPackageFragment@49['lang']
-    packageFragments('java.lang.A': FqName@50) = null
-    packageFragments('java.lang.Int': FqName@51) = null
-    packageFragments('java.lang.KFunction0': FqName@52) = null
-    packageFragments('java.lang.KFunction1': FqName@53) = null
-    packageFragments('java.lang.String': FqName@54) = null
-    packageFragments('java.lang.Unit': FqName@55) = null
-    packageFragments('kotlin': FqName@56) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.A': FqName@57) = null
-    packageFragments('kotlin.Int': FqName@58) = null
-    packageFragments('kotlin.KFunction0': FqName@59) = null
-    packageFragments('kotlin.KFunction1': FqName@60) = null
-    packageFragments('kotlin.String': FqName@61) = null
-    packageFragments('kotlin.Unit': FqName@62) = null
-    packageFragments('kotlin.io': FqName@63) = LazyJavaPackageFragment@64['io']
-    packageFragments('kotlin.io.A': FqName@65) = null
-    packageFragments('kotlin.io.Int': FqName@66) = null
-    packageFragments('kotlin.io.KFunction0': FqName@67) = null
-    packageFragments('kotlin.io.KFunction1': FqName@68) = null
-    packageFragments('kotlin.io.String': FqName@69) = null
-    packageFragments('kotlin.io.Unit': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = LazyJavaPackageFragment@72['jvm']
-    packageFragments('kotlin.jvm.A': FqName@73) = null
-    packageFragments('kotlin.jvm.Int': FqName@74) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@75) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@76) = null
-    packageFragments('kotlin.jvm.String': FqName@77) = null
-    packageFragments('kotlin.jvm.Unit': FqName@78) = null
-    packageFragments('kotlin.reflect': FqName@79) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.A': FqName@80) = null
-    packageFragments('kotlin.reflect.Int': FqName@81) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@82) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@83) = null
-    packageFragments('kotlin.reflect.String': FqName@84) = null
-    packageFragments('kotlin.reflect.Unit': FqName@85) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction0': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('KFunction1': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('kotlin': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('kotlin': Name@98) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@64['io'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-    membersProtos = LinkedHashMap@103 // through DeserializedPackageMemberScope@101
-    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-}
-
-LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@72['jvm'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Function0': Name@112) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Function1': Name@113) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@91) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('io': Name@118) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('jvm': Name@119) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    functions('reflect': Name@120) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
-    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
-    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-    properties('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
-}
-
-LazyJavaPackageFragment@49['lang'] {
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@123
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('KFunction0': Name@126) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('KFunction1': Name@127) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
-
-ResolutionTaskHolder@138 {
-    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
-}
-
-TypeDeserializer@147 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@151 {
-    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
-}
-
-TypeDeserializer@152 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@155 {
-    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
-    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@137 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@134 }
-    <name not found> = ArrayList@158[1] { ResolutionCandidate@131 }
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@143 }
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@140 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@146 }
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-    <name not found> = EmptyList@97[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
deleted file mode 100644
index 888ccb8044d..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
+++ /dev/null
@@ -1,312 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function1']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction1']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['Unit']
-}
-
-DescriptorResolver@11 {
-    <name not found> = JetTypeImpl@12['String']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedClassDescriptor@6['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction1'] {
-    containingDeclaration = LazyJavaPackageFragment@14['reflect']
-}
-
-DeserializedClassDescriptor@10['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@15['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-    upperBounds = LinkedHashSet@17[1] { DeserializedType@18['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@18['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@19['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-    upperBounds = LinkedHashSet@21[1] { DeserializedType@22['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@23['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@32['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@33
-}
-
-DeserializedType@34['kotlin.Function1'] {
-    constructor = DeserializedClassTypeConstructor@35
-}
-
-LazyJavaPackageFragmentProvider@36 {
-    packageFragments('<root>': FqName@37) = LazyJavaPackageFragment@38['<root>']
-    packageFragments('Int': FqName@39) = null
-    packageFragments('KFunction0': FqName@40) = null
-    packageFragments('KFunction1': FqName@41) = null
-    packageFragments('String': FqName@42) = null
-    packageFragments('Unit': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.Int': FqName@48) = null
-    packageFragments('java.lang.KFunction0': FqName@49) = null
-    packageFragments('java.lang.KFunction1': FqName@50) = null
-    packageFragments('java.lang.String': FqName@51) = null
-    packageFragments('java.lang.Unit': FqName@52) = null
-    packageFragments('kotlin': FqName@53) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.Int': FqName@54) = null
-    packageFragments('kotlin.KFunction0': FqName@55) = null
-    packageFragments('kotlin.KFunction1': FqName@56) = null
-    packageFragments('kotlin.String': FqName@57) = null
-    packageFragments('kotlin.Unit': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = LazyJavaPackageFragment@60['io']
-    packageFragments('kotlin.io.Int': FqName@61) = null
-    packageFragments('kotlin.io.KFunction0': FqName@62) = null
-    packageFragments('kotlin.io.KFunction1': FqName@63) = null
-    packageFragments('kotlin.io.String': FqName@64) = null
-    packageFragments('kotlin.io.Unit': FqName@65) = null
-    packageFragments('kotlin.jvm': FqName@66) = LazyJavaPackageFragment@67['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@68) = null
-    packageFragments('kotlin.jvm.KFunction0': FqName@69) = null
-    packageFragments('kotlin.jvm.KFunction1': FqName@70) = null
-    packageFragments('kotlin.jvm.String': FqName@71) = null
-    packageFragments('kotlin.jvm.Unit': FqName@72) = null
-    packageFragments('kotlin.reflect': FqName@73) = LazyJavaPackageFragment@14['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@74) = null
-    packageFragments('kotlin.reflect.KFunction0': FqName@75) = null
-    packageFragments('kotlin.reflect.KFunction1': FqName@76) = null
-    packageFragments('kotlin.reflect.String': FqName@77) = null
-    packageFragments('kotlin.reflect.Unit': FqName@78) = null
-}
-
-LazyJavaPackageFragment@38['<root>'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction1': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('kotlin': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('kotlin': Name@91) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@60['io'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = DeserializedPackageMemberScope@94 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-    membersProtos = LinkedHashMap@96 // through DeserializedPackageMemberScope@94
-    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@94
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@67['jvm'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Function0': Name@105) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Function1': Name@106) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('Unit': Name@84) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('io': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('jvm': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('reflect': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = DeserializedPackageMemberScope@110 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('io': Name@111) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('jvm': Name@112) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    functions('reflect': Name@113) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
-    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@110
-    properties('bar': Name@85) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('baz': Name@86) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('foo': Name@87) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('io': Name@111) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('jvm': Name@112) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-    properties('reflect': Name@113) = EmptyList@90[empty] // through DeserializedPackageMemberScope@110
-}
-
-LazyJavaPackageFragment@47['lang'] {
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
-}
-
-LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('KFunction0': Name@119) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('KFunction1': Name@120) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@85) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@86) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@144 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
-}
-
-TypeDeserializer@145 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['Function0']
-}
-
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['Function1']
-}
-
-null {
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-    <name not found> = EmptyList@90[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
deleted file mode 100644
index 8bd3b1dab63..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
+++ /dev/null
@@ -1,408 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KFunction0']
-}
-
-DeserializedClassDescriptor@2['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@5['kotlin']
-}
-
-DeserializedClassDescriptor@4['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@6['reflect']
-}
-
-DeserializedTypeParameterDescriptor@7['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8
-}
-
-DeserializedType@9['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@10
-}
-
-DeserializedType@11['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaPackageFragmentProvider@13 {
-    packageFragments('<root>': FqName@14) = LazyJavaPackageFragment@15['<root>']
-    packageFragments('A': FqName@16) = null
-    packageFragments('B': FqName@17) = null
-    packageFragments('java': FqName@18) = LazyJavaPackageFragment@19['java']
-    packageFragments('java.lang': FqName@20) = LazyJavaPackageFragment@21['lang']
-    packageFragments('java.lang.A': FqName@22) = null
-    packageFragments('java.lang.B': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@5['kotlin']
-    packageFragments('kotlin.A': FqName@25) = null
-    packageFragments('kotlin.B': FqName@26) = null
-    packageFragments('kotlin.io': FqName@27) = LazyJavaPackageFragment@28['io']
-    packageFragments('kotlin.io.A': FqName@29) = null
-    packageFragments('kotlin.io.B': FqName@30) = null
-    packageFragments('kotlin.jvm': FqName@31) = LazyJavaPackageFragment@32['jvm']
-    packageFragments('kotlin.jvm.A': FqName@33) = null
-    packageFragments('kotlin.jvm.B': FqName@34) = null
-    packageFragments('kotlin.reflect': FqName@35) = LazyJavaPackageFragment@6['reflect']
-}
-
-LazyJavaPackageFragment@15['<root>'] {
-    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@37
-}
-
-LazyJavaPackageFragment@28['io'] {
-    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = DeserializedPackageMemberScope@44 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
-    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
-    membersProtos = LinkedHashMap@46 // through DeserializedPackageMemberScope@44
-    properties('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
-    properties('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@44
-}
-
-LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@32['jvm'] {
-    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Function0': Name@55) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('io': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('jvm': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@58 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    functions('io': Name@59) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    functions('jvm': Name@60) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@58
-    properties('bar': Name@38) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    properties('foo': Name@39) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    properties('io': Name@59) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-    properties('jvm': Name@60) = EmptyList@41[empty] // through DeserializedPackageMemberScope@58
-}
-
-LazyJavaPackageFragment@21['lang'] {
-    classes('B': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('bar': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('bar': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@65) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@71 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@72 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@74 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@75 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@77 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@78 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@80 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@81 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
-
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
-}
-
-TypeDeserializer@87 {
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
-}
-
-null {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-    <name not found> = EmptyList@41[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
deleted file mode 100644
index 48510360a8f..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
+++ /dev/null
@@ -1,877 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KProperty']
-}
-
-DescriptorResolver@7 {
-    <name not found> = DoubleValue@8
-    <name not found> = IntValue@9
-    <name not found> = StringValue@10
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
-    membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
-    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
-}
-
-DeserializedClassDescriptor@4['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    defaultType = JetTypeImpl@17['KMemberProperty<2>']
-    functions('get': Name@12) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['get'] } // through DeserializedClassMemberScope@20
-    membersProtos = LinkedHashMap@21 // through DeserializedClassMemberScope@20
-    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@20
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-}
-
-DeserializedClassDescriptor@6['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@23
-    membersProtos = LinkedHashMap@24 // through DeserializedClassMemberScope@23
-    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@23
-}
-
-DeserializedTypeParameterDescriptor@25['R'] {
-    defaultType = JetTypeImpl@26['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@27
-    upperBounds = LinkedHashSet@28[1] { DeserializedType@29['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@30['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
-}
-
-DeserializedTypeParameterDescriptor@32['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-DeserializedTypeParameterDescriptor@34['T'] {
-    defaultType = JetTypeImpl@35['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@37[1] { DeserializedType@38['kotlin.Any'] }
-}
-
-DeserializedType@39['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@27
-}
-
-DeserializedType@40['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-DeserializedType@41['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@42
-    memberScope = DeserializedClassMemberScope@43
-}
-
-DeserializedType@38['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@42
-    memberScope = DeserializedClassMemberScope@43
-}
-
-DeserializedType@29['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@42
-    memberScope = DeserializedClassMemberScope@43
-}
-
-DeserializedType@44['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@45
-}
-
-DeserializedType@46['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@45
-}
-
-DeserializedType@47['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@48
-}
-
-DeserializedType@49['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@48
-}
-
-DeserializedType@50['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@51
-    memberScope = SubstitutingScope@52
-}
-
-DeserializedType@53['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = SubstitutingScope@55
-}
-
-EnumEntryClassDescriptors@56 {
-    findEnumEntry('get': Name@12) = null
-}
-
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@58) = LazyJavaPackageFragment@59['<root>']
-    packageFragments('A': FqName@60) = null
-    packageFragments('Any': FqName@61) = null
-    packageFragments('B': FqName@62) = null
-    packageFragments('Base': FqName@63) = null
-    packageFragments('C': FqName@64) = null
-    packageFragments('Int': FqName@65) = null
-    packageFragments('KMemberProperty': FqName@66) = null
-    packageFragments('Number': FqName@67) = null
-    packageFragments('String': FqName@68) = null
-    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
-    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.A': FqName@73) = null
-    packageFragments('java.lang.Any': FqName@74) = null
-    packageFragments('java.lang.B': FqName@75) = null
-    packageFragments('java.lang.Base': FqName@76) = null
-    packageFragments('java.lang.Int': FqName@77) = null
-    packageFragments('java.lang.KMemberProperty': FqName@78) = null
-    packageFragments('java.lang.Number': FqName@79) = null
-    packageFragments('java.lang.String': FqName@80) = null
-    packageFragments('kotlin': FqName@81) = LazyJavaPackageFragment@82['kotlin']
-    packageFragments('kotlin.A': FqName@83) = null
-    packageFragments('kotlin.Any': FqName@84) = null
-    packageFragments('kotlin.B': FqName@85) = null
-    packageFragments('kotlin.Base': FqName@86) = null
-    packageFragments('kotlin.Int': FqName@87) = null
-    packageFragments('kotlin.KMemberProperty': FqName@88) = null
-    packageFragments('kotlin.Number': FqName@89) = null
-    packageFragments('kotlin.String': FqName@90) = null
-    packageFragments('kotlin.io': FqName@91) = LazyJavaPackageFragment@92['io']
-    packageFragments('kotlin.io.A': FqName@93) = null
-    packageFragments('kotlin.io.Any': FqName@94) = null
-    packageFragments('kotlin.io.B': FqName@95) = null
-    packageFragments('kotlin.io.Base': FqName@96) = null
-    packageFragments('kotlin.io.Int': FqName@97) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@98) = null
-    packageFragments('kotlin.io.Number': FqName@99) = null
-    packageFragments('kotlin.io.String': FqName@100) = null
-    packageFragments('kotlin.jvm': FqName@101) = LazyJavaPackageFragment@102['jvm']
-    packageFragments('kotlin.jvm.A': FqName@103) = null
-    packageFragments('kotlin.jvm.Any': FqName@104) = null
-    packageFragments('kotlin.jvm.B': FqName@105) = null
-    packageFragments('kotlin.jvm.Base': FqName@106) = null
-    packageFragments('kotlin.jvm.Int': FqName@107) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@108) = null
-    packageFragments('kotlin.jvm.Number': FqName@109) = null
-    packageFragments('kotlin.jvm.String': FqName@110) = null
-    packageFragments('kotlin.reflect': FqName@111) = LazyJavaPackageFragment@11['reflect']
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@112) = null
-}
-
-LazyJavaPackageFragment@59['<root>'] {
-    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('KMemberProperty': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('kotlin': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('kotlin': Name@126) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@114
-}
-
-LazyJavaPackageFragment@92['io'] {
-    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('invoke': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
-    membersProtos = LinkedHashMap@131 // through DeserializedPackageMemberScope@129
-    properties('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    properties('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    properties('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-    properties('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('lang': Name@134) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
-}
-
-LazyJavaPackageFragment@102['jvm'] {
-    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
-}
-
-LazyJavaPackageFragment@82['kotlin'] {
-    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('CharSequence': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('io': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('jvm': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('reflect': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = DeserializedPackageMemberScope@143 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('get': Name@16) = ArrayList@144[2] { DeserializedSimpleFunctionDescriptor@145['get'], DeserializedSimpleFunctionDescriptor@146['get'] } // through DeserializedPackageMemberScope@143
-    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('invoke': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('io': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('io': Name@147) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('jvm': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('jvm': Name@148) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('reflect': Name@149) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('reflect': Name@149) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@138
-    membersProtos = LinkedHashMap@151 // through DeserializedPackageMemberScope@143
-    properties('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('io': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('jvm': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('reflect': Name@149) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-    properties('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
-}
-
-LazyJavaPackageFragment@72['lang'] {
-    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@152
-}
-
-LazyJavaPackageFragment@11['reflect'] {
-    classes('KCallable': Name@154) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('KMemberProperty': Name@156) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('KProperty': Name@157) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@155
-    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('KMemberProperty': Name@158) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@155
-}
-
-NestedClassDescriptors@160 {
-    findNestedClass('get': Name@12) = null
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@164[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@176 {
-    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@179 {
-    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@182 {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@185 {
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@188 {
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@191 {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@194 {
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
-}
-
-ResolutionTaskHolder@197 {
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-}
-
-ResolutionTaskHolder@203 {
-    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
-}
-
-ResolutionTaskHolder@206 {
-    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
-}
-
-ResolutionTaskHolder@209 {
-    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
-}
-
-ResolutionTaskHolder@212 {
-    <name not found> = ArrayList@213[1] { ResolutionCandidate@214 }
-}
-
-ResolutionTaskHolder@215 {
-    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
-}
-
-ResolutionTaskHolder@218 {
-    <name not found> = ArrayList@219[1] { ResolutionCandidate@220 }
-}
-
-ResolutionTaskHolder@221 {
-    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
-}
-
-ResolutionTaskHolder@224 {
-    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
-}
-
-ResolutionTaskHolder@227 {
-    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = ArrayList@231[1] { ResolutionCandidate@232 }
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = ArrayList@237[1] { ResolutionCandidate@238 }
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = ArrayList@240[1] { ResolutionCandidate@241 }
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-TypeDeserializer@263 {
-    classDescriptors('27': Integer@264) = DeserializedClassDescriptor@265['Int']
-    classDescriptors('40': Integer@266) = DeserializedClassDescriptor@267['CharSequence']
-}
-
-TypeDeserializer@268 {
-    classDescriptors('27': Integer@264) = DeserializedClassDescriptor@265['Int']
-    classDescriptors('40': Integer@266) = DeserializedClassDescriptor@267['CharSequence']
-}
-
-TypeDeserializer@269 {
-    classDescriptors('3': Integer@270) = DeserializedClassDescriptor@271['Any']
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@273 {
-    classDescriptors('3': Integer@270) = DeserializedClassDescriptor@271['Any']
-}
-
-TypeDeserializer@274 {
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@2['KCallable']
-}
-
-null {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@211 }
-    <name not found> = ArrayList@276[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@279[1] { ResolutionCandidate@217 }
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@193 }
-    <name not found> = ArrayList@281[1] { ResolutionCandidate@232 }
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@220 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@184 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@244 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@238 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@181 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@247 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@214 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@196 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@208 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@190 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@226 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@223 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@178 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@241 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@229 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@235 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@187 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@205 }
-    <name not found> = ArrayList@303[2] { ResolutionCandidate@165, ResolutionCandidate@166 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
deleted file mode 100644
index 47dafe389d3..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
+++ /dev/null
@@ -1,388 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KProperty']
-}
-
-DescriptorResolver@7 {
-    <name not found> = IntValue@8
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@9['reflect']
-    functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@12
-    membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
-}
-
-DeserializedClassDescriptor@4['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@9['reflect']
-    defaultType = JetTypeImpl@14['KMemberProperty<2>']
-    functions('get': Name@10) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['get'] } // through DeserializedClassMemberScope@17
-    membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-}
-
-DeserializedClassDescriptor@6['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@9['reflect']
-    functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@20
-    membersProtos = LinkedHashMap@21 // through DeserializedClassMemberScope@20
-}
-
-DeserializedTypeParameterDescriptor@22['R'] {
-    defaultType = JetTypeImpl@23['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@25[1] { DeserializedType@26['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@27['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-}
-
-DeserializedTypeParameterDescriptor@29['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-}
-
-DeserializedTypeParameterDescriptor@31['T'] {
-    defaultType = JetTypeImpl@32['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@34[1] { DeserializedType@35['kotlin.Any'] }
-}
-
-DeserializedType@36['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@24
-}
-
-DeserializedType@37['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@33
-}
-
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
-}
-
-DeserializedType@40['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@38
-    memberScope = DeserializedClassMemberScope@39
-}
-
-DeserializedType@41['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@42
-    memberScope = SubstitutingScope@43
-}
-
-DeserializedType@44['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@45
-    memberScope = SubstitutingScope@46
-}
-
-EnumEntryClassDescriptors@47 {
-    findEnumEntry('get': Name@10) = null
-}
-
-LazyJavaPackageFragmentProvider@48 {
-    packageFragments('<root>': FqName@49) = LazyJavaPackageFragment@50['<root>']
-    packageFragments('Base': FqName@51) = null
-    packageFragments('Derived': FqName@52) = null
-    packageFragments('Int': FqName@53) = null
-    packageFragments('KMemberProperty': FqName@54) = null
-    packageFragments('java': FqName@55) = LazyJavaPackageFragment@56['java']
-    packageFragments('java.lang': FqName@57) = LazyJavaPackageFragment@58['lang']
-    packageFragments('java.lang.Base': FqName@59) = null
-    packageFragments('java.lang.Int': FqName@60) = null
-    packageFragments('java.lang.KMemberProperty': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = LazyJavaPackageFragment@63['kotlin']
-    packageFragments('kotlin.Base': FqName@64) = null
-    packageFragments('kotlin.Int': FqName@65) = null
-    packageFragments('kotlin.KMemberProperty': FqName@66) = null
-    packageFragments('kotlin.io': FqName@67) = LazyJavaPackageFragment@68['io']
-    packageFragments('kotlin.io.Base': FqName@69) = null
-    packageFragments('kotlin.io.Int': FqName@70) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@71) = null
-    packageFragments('kotlin.jvm': FqName@72) = LazyJavaPackageFragment@73['jvm']
-    packageFragments('kotlin.jvm.Base': FqName@74) = null
-    packageFragments('kotlin.jvm.Int': FqName@75) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@76) = null
-    packageFragments('kotlin.reflect': FqName@77) = LazyJavaPackageFragment@9['reflect']
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@78) = null
-}
-
-LazyJavaPackageFragment@50['<root>'] {
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KMemberProperty': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('kotlin': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('kotlin': Name@87) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@68['io'] {
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = DeserializedPackageMemberScope@90 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
-    membersProtos = LinkedHashMap@92 // through DeserializedPackageMemberScope@90
-    properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-}
-
-LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@73['jvm'] {
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@63['kotlin'] {
-    classes('Any': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('io': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('jvm': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('reflect': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = DeserializedPackageMemberScope@104 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('io': Name@105) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('io': Name@105) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('jvm': Name@106) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('jvm': Name@106) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('reflect': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('reflect': Name@107) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@100
-    membersProtos = LinkedHashMap@109 // through DeserializedPackageMemberScope@104
-    properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('io': Name@105) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('jvm': Name@106) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('reflect': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-}
-
-LazyJavaPackageFragment@58['lang'] {
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
-}
-
-LazyJavaPackageFragment@9['reflect'] {
-    classes('KCallable': Name@112) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('KMemberProperty': Name@114) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('KProperty': Name@115) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('KMemberProperty': Name@116) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-NestedClassDescriptors@118 {
-    findNestedClass('get': Name@10) = null
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@141 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-ResolutionTaskHolder@144 {
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
-
-TypeDeserializer@145 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@147['Any']
-    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@149 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@147['Any']
-}
-
-TypeDeserializer@150 {
-    classDescriptors('4': Integer@148) = DeserializedClassDescriptor@2['KCallable']
-}
-
-null {
-    <name not found> = ArrayList@151[1] { ResolutionCandidate@130 }
-    <name not found> = ArrayList@152[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@154[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@155[1] { ResolutionCandidate@127 }
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@124 }
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-    <name not found> = EmptyList@11[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
deleted file mode 100644
index 21d0e00c0ca..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
+++ /dev/null
@@ -1,626 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KMemberProperty']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMutableMemberProperty']
-}
-
-DescriptorResolver@5 {
-    <name not found> = IntValue@6
-}
-
-DeserializedClassDescriptor@2['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@7['reflect']
-}
-
-DeserializedClassDescriptor@4['KMutableMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@7['reflect']
-}
-
-DeserializedTypeParameterDescriptor@8['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@9
-    upperBounds = LinkedHashSet@10[1] { DeserializedType@11['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@12['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@13
-    upperBounds = LinkedHashSet@14[1] { DeserializedType@15['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@16['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@17
-    upperBounds = LinkedHashSet@18[1] { DeserializedType@19['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@20['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@21
-    upperBounds = LinkedHashSet@22[1] { DeserializedType@23['kotlin.Any'] }
-}
-
-DeserializedType@23['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
-DeserializedType@15['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
-DeserializedType@11['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
-LazyJavaPackageFragmentProvider@26 {
-    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
-    packageFragments('A': FqName@29) = null
-    packageFragments('Int': FqName@30) = null
-    packageFragments('KMemberProperty': FqName@31) = null
-    packageFragments('KMutableMemberProperty': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.A': FqName@37) = null
-    packageFragments('java.lang.Int': FqName@38) = null
-    packageFragments('java.lang.KMemberProperty': FqName@39) = null
-    packageFragments('java.lang.KMutableMemberProperty': FqName@40) = null
-    packageFragments('kotlin': FqName@41) = LazyJavaPackageFragment@42['kotlin']
-    packageFragments('kotlin.A': FqName@43) = null
-    packageFragments('kotlin.Int': FqName@44) = null
-    packageFragments('kotlin.KMemberProperty': FqName@45) = null
-    packageFragments('kotlin.KMutableMemberProperty': FqName@46) = null
-    packageFragments('kotlin.io': FqName@47) = LazyJavaPackageFragment@48['io']
-    packageFragments('kotlin.io.A': FqName@49) = null
-    packageFragments('kotlin.io.Int': FqName@50) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@51) = null
-    packageFragments('kotlin.io.KMutableMemberProperty': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = LazyJavaPackageFragment@54['jvm']
-    packageFragments('kotlin.jvm.A': FqName@55) = null
-    packageFragments('kotlin.jvm.Int': FqName@56) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@57) = null
-    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@58) = null
-    packageFragments('kotlin.reflect': FqName@59) = LazyJavaPackageFragment@7['reflect']
-    packageFragments('kotlin.reflect.A': FqName@60) = null
-    packageFragments('kotlin.reflect.Int': FqName@61) = null
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@62) = null
-    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@63) = null
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('KMemberProperty': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('KMutableMemberProperty': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('kotlin': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('kotlin': Name@74) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@48['io'] {
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('invoke': Name@70) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@77
-    properties('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
-    properties('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@77
-}
-
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@54['jvm'] {
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@42['kotlin'] {
-    classes('Any': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('io': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('jvm': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('reflect': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = DeserializedPackageMemberScope@91 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('invoke': Name@70) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('io': Name@92) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('io': Name@92) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('jvm': Name@93) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('jvm': Name@93) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('reflect': Name@94) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    functions('reflect': Name@94) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@87
-    membersProtos = LinkedHashMap@96 // through DeserializedPackageMemberScope@91
-    properties('f': Name@68) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    properties('g': Name@69) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    properties('io': Name@92) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    properties('jvm': Name@93) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-    properties('reflect': Name@94) = EmptyList@73[empty] // through DeserializedPackageMemberScope@91
-}
-
-LazyJavaPackageFragment@36['lang'] {
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@7['reflect'] {
-    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('KMemberProperty': Name@66) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('KMutableMemberProperty': Name@67) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('f': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('g': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('invoke': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('f': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('g': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('invoke': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@110 {
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@128 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@129 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@132 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@135 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
-
-TypeDeserializer@137 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@139['Any']
-}
-
-TypeDeserializer@140 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@139['Any']
-}
-
-null {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@103 }
-    <name not found> = ArrayList@142[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@109 }
-    <name not found> = ArrayList@145[1] { ResolutionCandidate@121 }
-    <name not found> = ArrayList@146[1] { ResolutionCandidate@112 }
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@114 }
-    <name not found> = ArrayList@148[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@149[1] { ResolutionCandidate@118 }
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@124 }
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-    <name not found> = EmptyList@73[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
deleted file mode 100644
index d3709c05eb7..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
+++ /dev/null
@@ -1,589 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableTopLevelExtensionProperty']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KMutableTopLevelProperty']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['KProperty']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty']
-    classes(ClassKey@15) = DeserializedClassDescriptor@16['KTopLevelProperty']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@4['KExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@6['KMutableExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@8['KMutableTopLevelExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@10['KMutableTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@12['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@14['KTopLevelExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedClassDescriptor@16['KTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@17['reflect']
-}
-
-DeserializedTypeParameterDescriptor@18['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@19
-    upperBounds = LinkedHashSet@20[1] { DeserializedType@21['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@22['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
-    upperBounds = LinkedHashSet@24[1] { DeserializedType@25['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@26['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@27
-}
-
-DeserializedTypeParameterDescriptor@28['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@29
-}
-
-DeserializedTypeParameterDescriptor@30['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
-    upperBounds = LinkedHashSet@32[1] { DeserializedType@33['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@34['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    upperBounds = LinkedHashSet@36[1] { DeserializedType@37['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@38['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedTypeParameterDescriptor@40['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@42['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@27
-}
-
-DeserializedType@43['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@29
-}
-
-DeserializedType@44['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@45['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@37['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@46
-    memberScope = DeserializedClassMemberScope@47
-}
-
-DeserializedType@25['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@46
-    memberScope = DeserializedClassMemberScope@47
-}
-
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@46
-    memberScope = DeserializedClassMemberScope@47
-}
-
-DeserializedType@33['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@46
-    memberScope = DeserializedClassMemberScope@47
-}
-
-DeserializedType@48['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@46
-}
-
-DeserializedType@49['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@50
-}
-
-DeserializedType@51['kotlin.reflect.KExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@52
-    memberScope = SubstitutingScope@53
-}
-
-DeserializedType@54['kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = SubstitutingScope@56
-}
-
-DeserializedType@57['kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@58
-}
-
-DeserializedType@59['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@60
-}
-
-DeserializedType@61['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@60
-}
-
-DeserializedType@62['kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@63
-}
-
-DeserializedType@64['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@65
-}
-
-LazyJavaPackageFragmentProvider@66 {
-    packageFragments('<root>': FqName@67) = LazyJavaPackageFragment@68['<root>']
-    packageFragments('A': FqName@69) = null
-    packageFragments('Int': FqName@70) = null
-    packageFragments('KExtensionProperty': FqName@71) = null
-    packageFragments('KMutableExtensionProperty': FqName@72) = null
-    packageFragments('String': FqName@73) = null
-    packageFragments('bar': FqName@74) = null
-    packageFragments('foo': FqName@75) = null
-    packageFragments('java': FqName@76) = LazyJavaPackageFragment@77['java']
-    packageFragments('java.lang': FqName@78) = LazyJavaPackageFragment@79['lang']
-    packageFragments('java.lang.A': FqName@80) = null
-    packageFragments('java.lang.Int': FqName@81) = null
-    packageFragments('java.lang.KExtensionProperty': FqName@82) = null
-    packageFragments('java.lang.KMutableExtensionProperty': FqName@83) = null
-    packageFragments('java.lang.String': FqName@84) = null
-    packageFragments('kotlin': FqName@85) = LazyJavaPackageFragment@86['kotlin']
-    packageFragments('kotlin.A': FqName@87) = null
-    packageFragments('kotlin.Int': FqName@88) = null
-    packageFragments('kotlin.KExtensionProperty': FqName@89) = null
-    packageFragments('kotlin.KMutableExtensionProperty': FqName@90) = null
-    packageFragments('kotlin.String': FqName@91) = null
-    packageFragments('kotlin.io': FqName@92) = LazyJavaPackageFragment@93['io']
-    packageFragments('kotlin.io.A': FqName@94) = null
-    packageFragments('kotlin.io.Int': FqName@95) = null
-    packageFragments('kotlin.io.KExtensionProperty': FqName@96) = null
-    packageFragments('kotlin.io.KMutableExtensionProperty': FqName@97) = null
-    packageFragments('kotlin.io.String': FqName@98) = null
-    packageFragments('kotlin.jvm': FqName@99) = LazyJavaPackageFragment@100['jvm']
-    packageFragments('kotlin.jvm.A': FqName@101) = null
-    packageFragments('kotlin.jvm.Int': FqName@102) = null
-    packageFragments('kotlin.jvm.KExtensionProperty': FqName@103) = null
-    packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@104) = null
-    packageFragments('kotlin.jvm.String': FqName@105) = null
-    packageFragments('kotlin.reflect': FqName@106) = LazyJavaPackageFragment@17['reflect']
-    packageFragments('kotlin.reflect.A': FqName@107) = null
-    packageFragments('kotlin.reflect.Int': FqName@108) = null
-    packageFragments('kotlin.reflect.KExtensionProperty': FqName@109) = null
-    packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@110) = null
-    packageFragments('kotlin.reflect.String': FqName@111) = null
-}
-
-LazyJavaPackageFragment@68['<root>'] {
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('KExtensionProperty': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('KMutableExtensionProperty': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('kotlin': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('kotlin': Name@123) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@113
-}
-
-LazyJavaPackageFragment@93['io'] {
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = DeserializedPackageMemberScope@126 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('invoke': Name@119) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
-    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@126
-    properties('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
-    properties('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@126
-}
-
-LazyJavaPackageFragment@77['java'] {
-    classes('lang': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('lang': Name@131) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@100['jvm'] {
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
-}
-
-LazyJavaPackageFragment@86['kotlin'] {
-    classes('Any': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('io': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('jvm': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('reflect': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = DeserializedPackageMemberScope@140 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('invoke': Name@119) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('io': Name@141) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('io': Name@141) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('jvm': Name@142) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('jvm': Name@142) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('reflect': Name@143) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    functions('reflect': Name@143) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@136
-    membersProtos = LinkedHashMap@145 // through DeserializedPackageMemberScope@140
-    properties('bar': Name@117) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    properties('foo': Name@118) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    properties('io': Name@141) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    properties('jvm': Name@142) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-    properties('reflect': Name@143) = EmptyList@122[empty] // through DeserializedPackageMemberScope@140
-}
-
-LazyJavaPackageFragment@79['lang'] {
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
-}
-
-LazyJavaPackageFragment@17['reflect'] {
-    classes('Int': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KCallable': Name@149) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KExtensionProperty': Name@114) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableExtensionProperty': Name@115) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableTopLevelExtensionProperty': Name@150) = DeserializedClassDescriptor@8['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableTopLevelProperty': Name@151) = DeserializedClassDescriptor@10['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KProperty': Name@152) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KTopLevelExtensionProperty': Name@153) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KTopLevelProperty': Name@154) = DeserializedClassDescriptor@16['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('bar': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('foo': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('invoke': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('bar': Name@117) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('foo': Name@118) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('invoke': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@148
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@169 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
-
-TypeDeserializer@172 {
-    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
-    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@176 {
-    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
-}
-
-TypeDeserializer@177 {
-    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Any']
-}
-
-TypeDeserializer@178 {
-    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@179 {
-    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@180) = DeserializedClassDescriptor@16['KTopLevelProperty']
-}
-
-TypeDeserializer@181 {
-    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@182 {
-    classDescriptors('4': Integer@175) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@180) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@183) = DeserializedClassDescriptor@10['KMutableTopLevelProperty']
-}
-
-null {
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-    <name not found> = EmptyList@122[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
deleted file mode 100644
index 6690528118e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
+++ /dev/null
@@ -1,1032 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableProperty']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['KProperty']
-    classes(ClassKey@15) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
-    classes(ClassKey@17) = DeserializedClassDescriptor@18['KTopLevelProperty']
-    classes(ClassKey@19) = DeserializedClassDescriptor@20['Unit']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
-    membersProtos = LinkedHashMap@26 // through DeserializedClassMemberScope@24
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
-}
-
-DeserializedClassDescriptor@4['KExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@27['KExtensionProperty<2>']
-    functions('get': Name@22) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['get'] } // through DeserializedClassMemberScope@30
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
-    membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@30
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-}
-
-DeserializedClassDescriptor@6['KMutableExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@33['KMutableExtensionProperty<2>']
-    functions('get': Name@34) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['get'] } // through DeserializedClassMemberScope@37
-    functions('set': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['set'] } // through DeserializedClassMemberScope@37
-    membersProtos = LinkedHashMap@41 // through DeserializedClassMemberScope@37
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
-}
-
-DeserializedClassDescriptor@8['KMutableProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
-    functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
-    membersProtos = LinkedHashMap@44 // through DeserializedClassMemberScope@43
-}
-
-DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@34) = ArrayList@45[1] { DeserializedSimpleFunctionDescriptor@46['get'] } // through DeserializedClassMemberScope@47
-    functions('set': Name@38) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['set'] } // through DeserializedClassMemberScope@47
-    membersProtos = LinkedHashMap@50 // through DeserializedClassMemberScope@47
-}
-
-DeserializedClassDescriptor@12['KMutableTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
-    functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
-    membersProtos = LinkedHashMap@52 // through DeserializedClassMemberScope@51
-}
-
-DeserializedClassDescriptor@14['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
-    membersProtos = LinkedHashMap@54 // through DeserializedClassMemberScope@53
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
-}
-
-DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@55['KTopLevelExtensionProperty<2>']
-    functions('get': Name@22) = ArrayList@56[1] { DeserializedSimpleFunctionDescriptor@57['get'] } // through DeserializedClassMemberScope@58
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
-    membersProtos = LinkedHashMap@59 // through DeserializedClassMemberScope@58
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
-}
-
-DeserializedClassDescriptor@18['KTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
-    membersProtos = LinkedHashMap@61 // through DeserializedClassMemberScope@60
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
-}
-
-DeserializedClassDescriptor@20['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@62['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@63['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-    upperBounds = LinkedHashSet@65[1] { DeserializedType@66['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@67['R'] {
-    defaultType = JetTypeImpl@68['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-    upperBounds = LinkedHashSet@70[1] { DeserializedType@71['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@72['R'] {
-    defaultType = JetTypeImpl@73['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-    upperBounds = LinkedHashSet@75[1] { DeserializedType@76['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@77['R'] {
-    defaultType = JetTypeImpl@78['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-    upperBounds = LinkedHashSet@80[1] { DeserializedType@81['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@82['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@84[1] { DeserializedType@85['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@86['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
-}
-
-DeserializedTypeParameterDescriptor@88['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-DeserializedTypeParameterDescriptor@90['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
-}
-
-DeserializedTypeParameterDescriptor@92['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
-}
-
-DeserializedTypeParameterDescriptor@94['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-DeserializedTypeParameterDescriptor@96['T'] {
-    defaultType = JetTypeImpl@97['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    upperBounds = LinkedHashSet@99[1] { DeserializedType@100['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@101['T'] {
-    defaultType = JetTypeImpl@102['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
-    upperBounds = LinkedHashSet@104[1] { DeserializedType@105['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@106['T'] {
-    defaultType = JetTypeImpl@107['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@109[1] { DeserializedType@110['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@111['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
-    upperBounds = LinkedHashSet@113[1] { DeserializedType@114['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@115['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@117[1] { DeserializedType@118['kotlin.Any'] }
-}
-
-DeserializedType@119['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-DeserializedType@120['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@64
-}
-
-DeserializedType@121['R in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-DeserializedType@122['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-DeserializedType@123['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-DeserializedType@124['R in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-DeserializedType@125['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-DeserializedType@126['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-DeserializedType@127['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-DeserializedType@130['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-DeserializedType@131['T in kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
-}
-
-DeserializedType@132['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-DeserializedType@133['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@112
-}
-
-DeserializedType@134['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
-}
-
-DeserializedType@135['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-DeserializedType@136['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-DeserializedType@137['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@116
-}
-
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@110['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@81['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@114['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@140['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@76['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@105['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@85['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@66['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@118['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@141['kotlin.MutableMap'] {
-    constructor = DeserializedClassTypeConstructor@142
-    memberScope = SubstitutingScope@143
-}
-
-DeserializedType@144['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@145
-    memberScope = DeserializedClassMemberScope@146
-}
-
-DeserializedType@147['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = SubstitutingScope@149
-}
-
-DeserializedType@150['kotlin.reflect.KExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@151
-    memberScope = SubstitutingScope@152
-}
-
-DeserializedType@153['kotlin.reflect.KExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@151
-    memberScope = SubstitutingScope@154
-}
-
-DeserializedType@155['kotlin.reflect.KMutableExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@156
-    memberScope = SubstitutingScope@157
-}
-
-DeserializedType@158['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@159
-    memberScope = SubstitutingScope@160
-}
-
-DeserializedType@161['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@159
-    memberScope = SubstitutingScope@162
-}
-
-DeserializedType@163['kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@164
-    memberScope = SubstitutingScope@165
-}
-
-DeserializedType@166['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@167
-    memberScope = SubstitutingScope@168
-}
-
-DeserializedType@169['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@167
-    memberScope = SubstitutingScope@170
-}
-
-DeserializedType@171['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@167
-    memberScope = SubstitutingScope@172
-}
-
-DeserializedType@173['kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@174
-    memberScope = SubstitutingScope@175
-}
-
-DeserializedType@176['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@177
-    memberScope = SubstitutingScope@178
-}
-
-DeserializedType@179['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@177
-    memberScope = SubstitutingScope@180
-}
-
-EnumEntryClassDescriptors@181 {
-    findEnumEntry('get': Name@22) = null
-    findEnumEntry('set': Name@25) = null
-}
-
-EnumEntryClassDescriptors@182 {
-    findEnumEntry('get': Name@34) = null
-    findEnumEntry('set': Name@38) = null
-}
-
-LazyJavaPackageFragmentProvider@183 {
-    packageFragments('<root>': FqName@184) = LazyJavaPackageFragment@185['<root>']
-    packageFragments('Int': FqName@186) = null
-    packageFragments('KExtensionProperty': FqName@187) = null
-    packageFragments('KMutableExtensionProperty': FqName@188) = null
-    packageFragments('KMutableTopLevelExtensionProperty': FqName@189) = null
-    packageFragments('KTopLevelExtensionProperty': FqName@190) = null
-    packageFragments('Long': FqName@191) = null
-    packageFragments('String': FqName@192) = null
-    packageFragments('countCharacters': FqName@193) = null
-    packageFragments('java': FqName@194) = LazyJavaPackageFragment@195['java']
-    packageFragments('java.lang': FqName@196) = LazyJavaPackageFragment@197['lang']
-    packageFragments('java.lang.Int': FqName@198) = null
-    packageFragments('java.lang.KExtensionProperty': FqName@199) = null
-    packageFragments('java.lang.KMutableExtensionProperty': FqName@200) = null
-    packageFragments('java.lang.KMutableTopLevelExtensionProperty': FqName@201) = null
-    packageFragments('java.lang.KTopLevelExtensionProperty': FqName@202) = null
-    packageFragments('java.lang.Long': FqName@203) = null
-    packageFragments('java.lang.String': FqName@204) = null
-    packageFragments('kotlin': FqName@205) = LazyJavaPackageFragment@62['kotlin']
-    packageFragments('kotlin.Int': FqName@206) = null
-    packageFragments('kotlin.KExtensionProperty': FqName@207) = null
-    packageFragments('kotlin.KMutableExtensionProperty': FqName@208) = null
-    packageFragments('kotlin.KMutableTopLevelExtensionProperty': FqName@209) = null
-    packageFragments('kotlin.KTopLevelExtensionProperty': FqName@210) = null
-    packageFragments('kotlin.Long': FqName@211) = null
-    packageFragments('kotlin.String': FqName@212) = null
-    packageFragments('kotlin.io': FqName@213) = LazyJavaPackageFragment@214['io']
-    packageFragments('kotlin.io.Int': FqName@215) = null
-    packageFragments('kotlin.io.KExtensionProperty': FqName@216) = null
-    packageFragments('kotlin.io.KMutableExtensionProperty': FqName@217) = null
-    packageFragments('kotlin.io.KMutableTopLevelExtensionProperty': FqName@218) = null
-    packageFragments('kotlin.io.KTopLevelExtensionProperty': FqName@219) = null
-    packageFragments('kotlin.io.Long': FqName@220) = null
-    packageFragments('kotlin.io.String': FqName@221) = null
-    packageFragments('kotlin.jvm': FqName@222) = LazyJavaPackageFragment@223['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@224) = null
-    packageFragments('kotlin.jvm.KExtensionProperty': FqName@225) = null
-    packageFragments('kotlin.jvm.KMutableExtensionProperty': FqName@226) = null
-    packageFragments('kotlin.jvm.KMutableTopLevelExtensionProperty': FqName@227) = null
-    packageFragments('kotlin.jvm.KTopLevelExtensionProperty': FqName@228) = null
-    packageFragments('kotlin.jvm.Long': FqName@229) = null
-    packageFragments('kotlin.jvm.String': FqName@230) = null
-    packageFragments('kotlin.reflect': FqName@231) = LazyJavaPackageFragment@21['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@232) = null
-    packageFragments('kotlin.reflect.KExtensionProperty': FqName@233) = null
-    packageFragments('kotlin.reflect.KMutableExtensionProperty': FqName@234) = null
-    packageFragments('kotlin.reflect.KMutableTopLevelExtensionProperty': FqName@235) = null
-    packageFragments('kotlin.reflect.KTopLevelExtensionProperty': FqName@236) = null
-    packageFragments('kotlin.reflect.Long': FqName@237) = null
-    packageFragments('kotlin.reflect.String': FqName@238) = null
-    packageFragments('meaning': FqName@239) = null
-}
-
-LazyJavaPackageFragment@185['<root>'] {
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('KExtensionProperty': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('KMutableExtensionProperty': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('KMutableTopLevelExtensionProperty': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('KTopLevelExtensionProperty': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('kotlin': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('kotlin': Name@254) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    memberIndex = computeMemberIndex$1@255 // through LazyPackageFragmentScopeForJavaPackage@241
-}
-
-LazyJavaPackageFragment@214['io'] {
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    deserializedPackageScope = DeserializedPackageMemberScope@257 // through LazyPackageFragmentScopeForJavaPackage@256
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
-    functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
-    functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
-    functions('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
-    memberIndex = computeMemberIndex$1@258 // through LazyPackageFragmentScopeForJavaPackage@256
-    membersProtos = LinkedHashMap@259 // through DeserializedPackageMemberScope@257
-    properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-}
-
-LazyJavaPackageFragment@195['java'] {
-    classes('lang': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@261
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@261
-    functions('lang': Name@262) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@261
-    memberIndex = computeMemberIndex$1@263 // through LazyPackageFragmentScopeForJavaPackage@261
-}
-
-LazyJavaPackageFragment@223['jvm'] {
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    memberIndex = computeMemberIndex$1@265 // through LazyPackageFragmentScopeForJavaPackage@264
-}
-
-LazyJavaPackageFragment@62['kotlin'] {
-    classes('Any': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('MutableMap': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('Unit': Name@269) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('io': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('jvm': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('reflect': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    deserializedPackageScope = DeserializedPackageMemberScope@273 // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('io': Name@274) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('io': Name@274) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('jvm': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('jvm': Name@275) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('reflect': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('reflect': Name@276) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('set': Name@25) = ArrayList@277[1] { DeserializedSimpleFunctionDescriptor@278['set'] } // through DeserializedPackageMemberScope@273
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    memberIndex = computeMemberIndex$1@279 // through LazyPackageFragmentScopeForJavaPackage@267
-    membersProtos = LinkedHashMap@280 // through DeserializedPackageMemberScope@273
-    properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('io': Name@274) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('jvm': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('reflect': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-}
-
-LazyJavaPackageFragment@197['lang'] {
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@281
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@281
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@281
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@281
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@281
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@281
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
-    memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@281
-}
-
-LazyJavaPackageFragment@21['reflect'] {
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KCallable': Name@284) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KExtensionProperty': Name@242) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KMutableExtensionProperty': Name@243) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KMutableProperty': Name@285) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KMutableTopLevelExtensionProperty': Name@286) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KMutableTopLevelProperty': Name@287) = DeserializedClassDescriptor@12['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KProperty': Name@288) = DeserializedClassDescriptor@14['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KTopLevelExtensionProperty': Name@289) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('KTopLevelProperty': Name@290) = DeserializedClassDescriptor@18['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@283
-}
-
-NestedClassDescriptors@292 {
-    findNestedClass('get': Name@34) = null
-    findNestedClass('set': Name@38) = null
-}
-
-NestedClassDescriptors@293 {
-    findNestedClass('get': Name@22) = null
-    findNestedClass('set': Name@25) = null
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@299 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@300 {
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@303 {
-    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@306 {
-    <name not found> = ArrayList@307[1] { ResolutionCandidate@308 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@309 {
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@311 }
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@312 {
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@314 }
-}
-
-ResolutionTaskHolder@315 {
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
-}
-
-ResolutionTaskHolder@318 {
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
-}
-
-ResolutionTaskHolder@321 {
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@323 }
-}
-
-ResolutionTaskHolder@324 {
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@326 }
-}
-
-ResolutionTaskHolder@327 {
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@329 }
-}
-
-ResolutionTaskHolder@330 {
-    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
-}
-
-ResolutionTaskHolder@333 {
-    <name not found> = ArrayList@334[1] { ResolutionCandidate@335 }
-}
-
-ResolutionTaskHolder@336 {
-    <name not found> = ArrayList@337[1] { ResolutionCandidate@338 }
-}
-
-ResolutionTaskHolder@339 {
-    <name not found> = ArrayList@340[1] { ResolutionCandidate@341 }
-}
-
-ResolutionTaskHolder@342 {
-    <name not found> = ArrayList@343[1] { ResolutionCandidate@344 }
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@356 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@359 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@362 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
-
-TypeDeserializer@366 {
-    classDescriptors('129': Integer@367) = DeserializedClassDescriptor@368['MutableMap']
-    classDescriptors('9': Integer@369) = DeserializedClassDescriptor@370['Any']
-}
-
-TypeDeserializer@371 {
-    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@375 {
-    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@18['KTopLevelProperty']
-}
-
-TypeDeserializer@376 {
-    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@377 {
-    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@378) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@379 {
-    classDescriptors('3': Integer@372) = DeserializedClassDescriptor@370['Any']
-}
-
-TypeDeserializer@380 {
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@381 {
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@382 {
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@14['KProperty']
-}
-
-TypeDeserializer@383 {
-    classDescriptors('4': Integer@373) = DeserializedClassDescriptor@18['KTopLevelProperty']
-    classDescriptors('5': Integer@374) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@384 {
-    classDescriptors('6': Integer@378) = DeserializedClassDescriptor@20['Unit']
-}
-
-null {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@311 }
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@296 }
-    <name not found> = ArrayList@387[1] { ResolutionCandidate@308 }
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@317 }
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@341 }
-    <name not found> = ArrayList@390[1] { ResolutionCandidate@338 }
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@323 }
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@314 }
-    <name not found> = ArrayList@393[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@302 }
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@299 }
-    <name not found> = ArrayList@396[1] { ResolutionCandidate@305 }
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@320 }
-    <name not found> = ArrayList@399[1] { ResolutionCandidate@344 }
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@332 }
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@335 }
-    <name not found> = ArrayList@402[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@329 }
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@326 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
deleted file mode 100644
index c7b8ff69fad..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
+++ /dev/null
@@ -1,405 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KTopLevelProperty']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
-    membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
-}
-
-DeserializedClassDescriptor@4['KExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    defaultType = JetTypeImpl@16['KExtensionProperty<2>']
-    functions('get': Name@12) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['get'] } // through DeserializedClassMemberScope@19
-    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-}
-
-DeserializedClassDescriptor@6['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
-    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
-}
-
-DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@25['get'] } // through DeserializedClassMemberScope@26
-    membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@26
-}
-
-DeserializedClassDescriptor@10['KTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@28
-    membersProtos = LinkedHashMap@29 // through DeserializedClassMemberScope@28
-}
-
-DeserializedTypeParameterDescriptor@30['R'] {
-    defaultType = JetTypeImpl@31['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-}
-
-DeserializedTypeParameterDescriptor@33['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-}
-
-DeserializedTypeParameterDescriptor@35['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-DeserializedTypeParameterDescriptor@37['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedTypeParameterDescriptor@39['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
-}
-
-DeserializedTypeParameterDescriptor@41['T'] {
-    defaultType = JetTypeImpl@42['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-DeserializedTypeParameterDescriptor@44['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
-}
-
-DeserializedType@46['R in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@32
-}
-
-DeserializedType@47['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-DeserializedType@48['T in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-DeserializedType@49['T in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@45
-}
-
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@51
-    memberScope = DeserializedClassMemberScope@52
-}
-
-DeserializedType@53['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = SubstitutingScope@55
-}
-
-DeserializedType@56['kotlin.reflect.KExtensionProperty'] {
-    constructor = DeserializedClassTypeConstructor@57
-    memberScope = SubstitutingScope@58
-}
-
-DeserializedType@59['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@60
-    memberScope = SubstitutingScope@61
-}
-
-DeserializedType@62['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@60
-    memberScope = SubstitutingScope@63
-}
-
-DeserializedType@64['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@65
-    memberScope = SubstitutingScope@66
-}
-
-EnumEntryClassDescriptors@67 {
-    findEnumEntry('get': Name@12) = null
-}
-
-LazyJavaPackageFragmentProvider@68 {
-    packageFragments('<root>': FqName@69) = LazyJavaPackageFragment@70['<root>']
-    packageFragments('Any': FqName@71) = null
-    packageFragments('Int': FqName@72) = null
-    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
-    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
-    packageFragments('java.lang.Any': FqName@77) = null
-    packageFragments('java.lang.Int': FqName@78) = null
-    packageFragments('kotlin': FqName@79) = LazyJavaPackageFragment@80['kotlin']
-    packageFragments('kotlin.Any': FqName@81) = null
-    packageFragments('kotlin.Int': FqName@82) = null
-    packageFragments('kotlin.io': FqName@83) = LazyJavaPackageFragment@84['io']
-    packageFragments('kotlin.io.Any': FqName@85) = null
-    packageFragments('kotlin.io.Int': FqName@86) = null
-    packageFragments('kotlin.jvm': FqName@87) = LazyJavaPackageFragment@88['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@89) = null
-    packageFragments('kotlin.jvm.Int': FqName@90) = null
-    packageFragments('kotlin.reflect': FqName@91) = LazyJavaPackageFragment@11['reflect']
-    packageFragments('meaning': FqName@92) = null
-}
-
-LazyJavaPackageFragment@70['<root>'] {
-    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@84['io'] {
-    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-    membersProtos = LinkedHashMap@103 // through DeserializedPackageMemberScope@101
-    properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
-}
-
-LazyJavaPackageFragment@88['jvm'] {
-    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
-}
-
-LazyJavaPackageFragment@80['kotlin'] {
-    classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('io': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('jvm': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@117 // through DeserializedPackageMemberScope@113
-    properties('io': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    properties('jvm': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-}
-
-LazyJavaPackageFragment@76['lang'] {
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
-}
-
-LazyJavaPackageFragment@11['reflect'] {
-    classes('KCallable': Name@120) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KExtensionProperty': Name@122) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KProperty': Name@123) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KTopLevelExtensionProperty': Name@124) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('KTopLevelProperty': Name@125) = DeserializedClassDescriptor@10['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
-}
-
-NestedClassDescriptors@126 {
-    findNestedClass('get': Name@12) = null
-}
-
-ResolutionTaskHolder@127 {
-    <name not found> = ArrayList@128[1] { ResolutionCandidate@129 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@130 {
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@133 {
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
-}
-
-ResolutionTaskHolder@136 {
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
-}
-
-ResolutionTaskHolder@139 {
-    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
-}
-
-ResolutionTaskHolder@142 {
-    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
-}
-
-ResolutionTaskHolder@145 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@147 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@148 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-ResolutionTaskHolder@150 {
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
-
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@153['Any']
-}
-
-TypeDeserializer@154 {
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@156 {
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@157) = DeserializedClassDescriptor@10['KTopLevelProperty']
-}
-
-TypeDeserializer@158 {
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
-}
-
-TypeDeserializer@159 {
-    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
-}
-
-null {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@129 }
-    <name not found> = ArrayList@161[1] { ResolutionCandidate@132 }
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@141 }
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@138 }
-    <name not found> = ArrayList@164[1] { ResolutionCandidate@144 }
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@135 }
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-    <name not found> = EmptyList@13[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
deleted file mode 100644
index 30935428517..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
+++ /dev/null
@@ -1,435 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KMemberProperty']
-}
-
-DeserializedClassDescriptor@2['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@3['reflect']
-}
-
-DeserializedTypeParameterDescriptor@4['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@5
-    upperBounds = LinkedHashSet@6[1] { DeserializedType@7['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@8['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@9
-    upperBounds = LinkedHashSet@10[1] { DeserializedType@11['kotlin.Any'] }
-}
-
-DeserializedType@11['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@12
-    memberScope = DeserializedClassMemberScope@13
-}
-
-DeserializedType@7['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@12
-    memberScope = DeserializedClassMemberScope@13
-}
-
-LazyJavaPackageFragmentProvider@14 {
-    packageFragments('<root>': FqName@15) = LazyJavaPackageFragment@16['<root>']
-    packageFragments('A': FqName@17) = null
-    packageFragments('Any': FqName@18) = null
-    packageFragments('KMemberProperty': FqName@19) = null
-    packageFragments('String': FqName@20) = null
-    packageFragments('T': FqName@21) = null
-    packageFragments('java': FqName@22) = LazyJavaPackageFragment@23['java']
-    packageFragments('java.lang': FqName@24) = LazyJavaPackageFragment@25['lang']
-    packageFragments('java.lang.A': FqName@26) = null
-    packageFragments('java.lang.Any': FqName@27) = null
-    packageFragments('java.lang.KMemberProperty': FqName@28) = null
-    packageFragments('java.lang.String': FqName@29) = null
-    packageFragments('java.lang.T': FqName@30) = null
-    packageFragments('kotlin': FqName@31) = LazyJavaPackageFragment@32['kotlin']
-    packageFragments('kotlin.A': FqName@33) = null
-    packageFragments('kotlin.Any': FqName@34) = null
-    packageFragments('kotlin.KMemberProperty': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.T': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = LazyJavaPackageFragment@39['io']
-    packageFragments('kotlin.io.A': FqName@40) = null
-    packageFragments('kotlin.io.Any': FqName@41) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@42) = null
-    packageFragments('kotlin.io.String': FqName@43) = null
-    packageFragments('kotlin.io.T': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    packageFragments('kotlin.jvm.A': FqName@47) = null
-    packageFragments('kotlin.jvm.Any': FqName@48) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@49) = null
-    packageFragments('kotlin.jvm.String': FqName@50) = null
-    packageFragments('kotlin.jvm.T': FqName@51) = null
-    packageFragments('kotlin.reflect': FqName@52) = LazyJavaPackageFragment@3['reflect']
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@53) = null
-}
-
-LazyJavaPackageFragment@16['<root>'] {
-    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('KMemberProperty': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('kotlin': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('kotlin': Name@64) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@39['io'] {
-    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
-    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('invoke': Name@59) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
-    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
-    properties('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
-    properties('t': Name@61) = EmptyList@63[empty] // through DeserializedPackageMemberScope@67
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('lang': Name@72) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
-}
-
-LazyJavaPackageFragment@46['jvm'] {
-    classes('Any': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@32['kotlin'] {
-    classes('Any': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('io': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('jvm': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('reflect': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = DeserializedPackageMemberScope@81 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('invoke': Name@59) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    functions('io': Name@82) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    functions('jvm': Name@83) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('reflect': Name@84) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    functions('reflect': Name@84) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
-    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@81
-    properties('foo': Name@58) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    properties('io': Name@82) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    properties('jvm': Name@83) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    properties('reflect': Name@84) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-    properties('t': Name@61) = EmptyList@63[empty] // through DeserializedPackageMemberScope@81
-}
-
-LazyJavaPackageFragment@25['lang'] {
-    classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('invoke': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('t': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('invoke': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@3['reflect'] {
-    classes('KMemberProperty': Name@89) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('KMemberProperty': Name@91) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-ResolutionTaskHolder@93 {
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@96 {
-    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = ArrayList@103[1] { ResolutionCandidate@104 }
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
-}
-
-ResolutionTaskHolder@108 {
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
-}
-
-ResolutionTaskHolder@111 {
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
-}
-
-ResolutionTaskHolder@114 {
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
-}
-
-ResolutionTaskHolder@117 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@118 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@119 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@120 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@121 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@122 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@123 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@124 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@125 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-ResolutionTaskHolder@126 {
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
-
-TypeDeserializer@127 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@129['Any']
-}
-
-null {
-    <name not found> = ArrayList@130[1] { ResolutionCandidate@101 }
-    <name not found> = ArrayList@131[1] { ResolutionCandidate@95 }
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@107 }
-    <name not found> = ArrayList@133[1] { ResolutionCandidate@116 }
-    <name not found> = ArrayList@134[1] { ResolutionCandidate@110 }
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@98 }
-    <name not found> = ArrayList@136[1] { ResolutionCandidate@113 }
-    <name not found> = ArrayList@137[1] { ResolutionCandidate@104 }
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-    <name not found> = EmptyList@63[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
deleted file mode 100644
index 7ba845f886e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaInstanceField.lazy.log
+++ /dev/null
@@ -1,1170 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KMemberProperty']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMutableMemberProperty']
-}
-
-DeserializedClassDescriptor@2['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@5['reflect']
-}
-
-DeserializedClassDescriptor@4['KMutableMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@5['reflect']
-}
-
-DeserializedTypeParameterDescriptor@6['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@7
-    upperBounds = LinkedHashSet@8[1] { DeserializedType@9['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@10['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@11
-    upperBounds = LinkedHashSet@12[1] { DeserializedType@13['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@14['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
-    upperBounds = LinkedHashSet@16[1] { DeserializedType@17['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@18['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@19
-    upperBounds = LinkedHashSet@20[1] { DeserializedType@21['kotlin.Any'] }
-}
-
-DeserializedType@21['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@22
-    memberScope = DeserializedClassMemberScope@23
-}
-
-DeserializedType@13['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@22
-    memberScope = DeserializedClassMemberScope@23
-}
-
-DeserializedType@17['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@22
-    memberScope = DeserializedClassMemberScope@23
-}
-
-DeserializedType@9['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@22
-    memberScope = DeserializedClassMemberScope@23
-}
-
-LazyJavaClassDescriptor@24['JavaClass'] {
-    defaultType = JetTypeImpl@25['JavaClass']
-    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
-    functions('privateFinal': Name@28) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('privateFinal': Name@30) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    functions('privateMutable': Name@32) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('privateMutable': Name@33) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    functions('protectedFinal': Name@34) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('protectedFinal': Name@35) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    functions('protectedMutable': Name@36) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('protectedMutable': Name@37) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    functions('publicFinal': Name@38) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('publicFinal': Name@39) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    functions('publicMutable': Name@40) = EmptyList@29[empty] // through LazyJavaClassMemberScope@27
-    functions('publicMutable': Name@41) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaStaticClassScope@31
-    nestedClassIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@27
-    nestedClasses('privateFinal': Name@30) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('privateMutable': Name@33) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('protectedFinal': Name@35) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('protectedMutable': Name@37) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('publicFinal': Name@39) = null // through LazyJavaClassMemberScope@27
-    nestedClasses('publicMutable': Name@41) = null // through LazyJavaClassMemberScope@27
-    properties('privateFinal': Name@28) = ArrayList@45[1] { JavaPropertyDescriptor@46['privateFinal'] } // through LazyJavaClassMemberScope@27
-    properties('privateFinal': Name@30) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    properties('privateMutable': Name@32) = ArrayList@47[1] { JavaPropertyDescriptor@48['privateMutable'] } // through LazyJavaClassMemberScope@27
-    properties('privateMutable': Name@33) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    properties('protectedFinal': Name@34) = ArrayList@49[1] { JavaPropertyDescriptor@50['protectedFinal'] } // through LazyJavaClassMemberScope@27
-    properties('protectedFinal': Name@35) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    properties('protectedMutable': Name@36) = ArrayList@51[1] { JavaPropertyDescriptor@52['protectedMutable'] } // through LazyJavaClassMemberScope@27
-    properties('protectedMutable': Name@37) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    properties('publicFinal': Name@38) = ArrayList@53[1] { JavaPropertyDescriptor@54['publicFinal'] } // through LazyJavaClassMemberScope@27
-    properties('publicFinal': Name@39) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    properties('publicMutable': Name@40) = ArrayList@55[1] { JavaPropertyDescriptor@56['publicMutable'] } // through LazyJavaClassMemberScope@27
-    properties('publicMutable': Name@41) = EmptyList@29[empty] // through LazyJavaStaticClassScope@31
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@57['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@58['JavaClass']
-}
-
-LazyJavaClassTypeConstructor@58['JavaClass'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
-}
-
-LazyJavaClassifierType@62['Object'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaClassImpl@64['Object']
-    memberScope = DeserializedClassMemberScope@23
-    nullable = 'false': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@66['Object'] {
-    arguments = ArrayList@67[empty]
-    classifier = JavaClassImpl@64['Object']
-    nullable = 'true': Boolean@68
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@69['Object'] {
-    classifier = JavaClassImpl@70['Object']
-    typeConstructor = DeserializedClassTypeConstructor@22
-}
-
-LazyJavaClassifierType@71['String'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['String']
-    memberScope = DeserializedClassMemberScope@74
-    nullable = 'false': Boolean@65
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaClassifierType@76['String'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@73['String']
-    nullable = 'true': Boolean@68
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaPackageFragmentProvider@78 {
-    packageFragments('<root>': FqName@79) = LazyJavaPackageFragment@80['<root>']
-    packageFragments('Any': FqName@81) = null
-    packageFragments('Char': FqName@82) = null
-    packageFragments('Double': FqName@83) = null
-    packageFragments('Int': FqName@84) = null
-    packageFragments('JavaClass': FqName@85) = null
-    packageFragments('KMemberProperty': FqName@86) = null
-    packageFragments('KMutableMemberProperty': FqName@87) = null
-    packageFragments('Long': FqName@88) = null
-    packageFragments('String': FqName@89) = null
-    packageFragments('java': FqName@90) = LazyJavaPackageFragment@91['java']
-    packageFragments('java.lang': FqName@92) = LazyJavaPackageFragment@93['lang']
-    packageFragments('java.lang.Any': FqName@94) = null
-    packageFragments('java.lang.Char': FqName@95) = null
-    packageFragments('java.lang.Double': FqName@96) = null
-    packageFragments('java.lang.Int': FqName@97) = null
-    packageFragments('java.lang.JavaClass': FqName@98) = null
-    packageFragments('java.lang.KMemberProperty': FqName@99) = null
-    packageFragments('java.lang.KMutableMemberProperty': FqName@100) = null
-    packageFragments('java.lang.Long': FqName@101) = null
-    packageFragments('java.lang.String': FqName@102) = null
-    packageFragments('kotlin': FqName@103) = LazyJavaPackageFragment@104['kotlin']
-    packageFragments('kotlin.Any': FqName@105) = null
-    packageFragments('kotlin.Char': FqName@106) = null
-    packageFragments('kotlin.Double': FqName@107) = null
-    packageFragments('kotlin.Int': FqName@108) = null
-    packageFragments('kotlin.JavaClass': FqName@109) = null
-    packageFragments('kotlin.KMemberProperty': FqName@110) = null
-    packageFragments('kotlin.KMutableMemberProperty': FqName@111) = null
-    packageFragments('kotlin.Long': FqName@112) = null
-    packageFragments('kotlin.String': FqName@113) = null
-    packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
-    packageFragments('kotlin.io.Any': FqName@116) = null
-    packageFragments('kotlin.io.Char': FqName@117) = null
-    packageFragments('kotlin.io.Double': FqName@118) = null
-    packageFragments('kotlin.io.Int': FqName@119) = null
-    packageFragments('kotlin.io.JavaClass': FqName@120) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@121) = null
-    packageFragments('kotlin.io.KMutableMemberProperty': FqName@122) = null
-    packageFragments('kotlin.io.Long': FqName@123) = null
-    packageFragments('kotlin.io.String': FqName@124) = null
-    packageFragments('kotlin.jvm': FqName@125) = LazyJavaPackageFragment@126['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@127) = null
-    packageFragments('kotlin.jvm.Char': FqName@128) = null
-    packageFragments('kotlin.jvm.Double': FqName@129) = null
-    packageFragments('kotlin.jvm.Int': FqName@130) = null
-    packageFragments('kotlin.jvm.JavaClass': FqName@131) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@132) = null
-    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@133) = null
-    packageFragments('kotlin.jvm.Long': FqName@134) = null
-    packageFragments('kotlin.jvm.String': FqName@135) = null
-    packageFragments('kotlin.reflect': FqName@136) = LazyJavaPackageFragment@5['reflect']
-    packageFragments('kotlin.reflect.Any': FqName@137) = null
-    packageFragments('kotlin.reflect.Char': FqName@138) = null
-    packageFragments('kotlin.reflect.Double': FqName@139) = null
-    packageFragments('kotlin.reflect.Int': FqName@140) = null
-    packageFragments('kotlin.reflect.JavaClass': FqName@141) = null
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@142) = null
-    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@143) = null
-    packageFragments('kotlin.reflect.Long': FqName@144) = null
-    packageFragments('kotlin.reflect.String': FqName@145) = null
-    topLevelClasses(JavaClassImpl@146['JavaClass']) = LazyJavaClassDescriptor@24['JavaClass']
-}
-
-LazyJavaPackageFragment@80['<root>'] {
-    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('JavaClass': Name@152) = LazyJavaClassDescriptor@24['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMemberProperty': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('KMutableMemberProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('kotlin': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@148
-    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('kotlin': Name@166) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@148
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@148
-}
-
-LazyJavaPackageFragment@115['io'] {
-    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    deserializedPackageScope = DeserializedPackageMemberScope@169 // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('invoke': Name@157) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@168
-    membersProtos = LinkedHashMap@171 // through DeserializedPackageMemberScope@169
-    properties('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    properties('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    properties('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    properties('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    properties('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-    properties('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@169
-}
-
-LazyJavaPackageFragment@91['java'] {
-    classes('lang': Name@172) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('lang': Name@174) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@173
-}
-
-LazyJavaPackageFragment@126['jvm'] {
-    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    memberIndex = computeMemberIndex$1@177 // through LazyPackageFragmentScopeForJavaPackage@176
-}
-
-LazyJavaPackageFragment@104['kotlin'] {
-    classes('Any': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('io': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('jvm': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('reflect': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = DeserializedPackageMemberScope@183 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('invoke': Name@157) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('io': Name@184) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('io': Name@184) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('jvm': Name@185) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('jvm': Name@185) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('reflect': Name@186) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    functions('reflect': Name@186) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@187 // through LazyPackageFragmentScopeForJavaPackage@179
-    membersProtos = LinkedHashMap@188 // through DeserializedPackageMemberScope@183
-    properties('io': Name@184) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('jvm': Name@185) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('privateFinal': Name@159) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('privateMutable': Name@160) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('protectedFinal': Name@161) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('protectedMutable': Name@162) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('publicFinal': Name@163) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('publicMutable': Name@164) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-    properties('reflect': Name@186) = EmptyList@29[empty] // through DeserializedPackageMemberScope@183
-}
-
-LazyJavaPackageFragment@93['lang'] {
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    memberIndex = computeMemberIndex$1@190 // through LazyPackageFragmentScopeForJavaPackage@189
-}
-
-LazyJavaPackageFragment@5['reflect'] {
-    classes('Any': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Char': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Double': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('KMemberProperty': Name@153) = DeserializedClassDescriptor@2['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('KMutableMemberProperty': Name@154) = DeserializedClassDescriptor@4['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('Long': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('String': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('invoke': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('privateFinal': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('privateMutable': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('protectedFinal': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('protectedMutable': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('publicFinal': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    classes('publicMutable': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@191
-    deserializedPackageScope = Empty@165 // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('invoke': Name@157) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('privateFinal': Name@159) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('privateMutable': Name@160) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('protectedFinal': Name@161) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('protectedMutable': Name@162) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('publicFinal': Name@163) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    functions('publicMutable': Name@164) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@191
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@191
-}
-
-ResolutionTaskHolder@193 {
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@195 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@196 {
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@198 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@199 {
-    <name not found> = ArrayList@200[1] { ResolutionCandidate@201 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@202 {
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@208 {
-    <name not found> = ArrayList@209[1] { ResolutionCandidate@210 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@214 {
-    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@230 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@233 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@236 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@239 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@242 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@245 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@248 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@251 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@254 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@257 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
-
-TypeDeserializer@259 {
-    classDescriptors('3': Integer@260) = DeserializedClassDescriptor@261['Any']
-}
-
-TypeDeserializer@262 {
-    classDescriptors('3': Integer@260) = DeserializedClassDescriptor@261['Any']
-}
-
-null {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@210 }
-    <name not found> = ArrayList@264[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@267[1] { ResolutionCandidate@195 }
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@270[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@201 }
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@216 }
-    <name not found> = ArrayList@273[1] { ResolutionCandidate@198 }
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@213 }
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-    <name not found> = EmptyList@29[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
deleted file mode 100644
index 59b1b4867e2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
+++ /dev/null
@@ -1,886 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMutableProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableTopLevelVariable']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KMutableVariable']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['KProperty']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classes(ClassKey@15) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classes(ClassKey@17) = DeserializedClassDescriptor@18['KVariable']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@4['KMutableProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@6['KMutableTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@8['KMutableTopLevelVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@10['KMutableVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@12['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@14['KTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@16['KTopLevelVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedClassDescriptor@18['KVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@19['reflect']
-}
-
-DeserializedTypeParameterDescriptor@20['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@21
-    upperBounds = LinkedHashSet@22[1] { DeserializedType@23['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@24['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-    upperBounds = LinkedHashSet@26[1] { DeserializedType@27['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@28['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@29
-    upperBounds = LinkedHashSet@30[1] { DeserializedType@31['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@32['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@34[1] { DeserializedType@35['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@36['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@37
-}
-
-DeserializedTypeParameterDescriptor@38['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedTypeParameterDescriptor@40['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedTypeParameterDescriptor@42['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-DeserializedType@44['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@45['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-DeserializedType@47['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@49['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@37
-}
-
-DeserializedType@31['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@50
-    memberScope = DeserializedClassMemberScope@51
-}
-
-DeserializedType@27['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@50
-    memberScope = DeserializedClassMemberScope@51
-}
-
-DeserializedType@35['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@50
-    memberScope = DeserializedClassMemberScope@51
-}
-
-DeserializedType@23['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@50
-    memberScope = DeserializedClassMemberScope@51
-}
-
-DeserializedType@52['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@50
-}
-
-DeserializedType@53['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@54
-}
-
-DeserializedType@55['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@56
-    memberScope = SubstitutingScope@57
-}
-
-DeserializedType@58['kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@59
-    memberScope = SubstitutingScope@60
-}
-
-DeserializedType@61['kotlin.reflect.KMutableVariable'] {
-    constructor = DeserializedClassTypeConstructor@62
-}
-
-DeserializedType@63['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@64
-    memberScope = SubstitutingScope@65
-}
-
-DeserializedType@66['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@64
-}
-
-DeserializedType@67['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@64
-}
-
-DeserializedType@68['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@69
-    memberScope = SubstitutingScope@70
-}
-
-DeserializedType@71['kotlin.reflect.KTopLevelVariable'] {
-    constructor = DeserializedClassTypeConstructor@72
-}
-
-DeserializedType@73['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@74
-}
-
-DeserializedType@75['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@74
-}
-
-LazyJavaClassDescriptor@76['JavaClass'] {
-    enumEntryIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@78
-    functionTypeForSamInterface = null
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaStaticClassScope@81
-    memberIndex = computeMemberIndex$1@88 // through LazyJavaClassMemberScope@78
-    memberIndex = computeMemberIndex$1@89 // through LazyJavaStaticClassScope@81
-    nestedClassIndex = LinkedHashMap@90 // through LazyJavaClassMemberScope@78
-    nestedClasses('Any': Name@91) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('Char': Name@92) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('Double': Name@93) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('String': Name@94) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('Throwable': Name@95) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('invoke': Name@79) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('privateFinal': Name@82) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('privateMutable': Name@83) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('protectedFinal': Name@84) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('protectedMutable': Name@85) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('publicFinal': Name@86) = null // through LazyJavaClassMemberScope@78
-    nestedClasses('publicMutable': Name@87) = null // through LazyJavaClassMemberScope@78
-    properties('privateFinal': Name@82) = ArrayList@96[1] { JavaPropertyDescriptor@97['privateFinal'] } // through LazyJavaStaticClassScope@81
-    properties('privateFinal': Name@82) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    properties('privateMutable': Name@83) = ArrayList@98[1] { JavaPropertyDescriptor@99['privateMutable'] } // through LazyJavaStaticClassScope@81
-    properties('privateMutable': Name@83) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    properties('protectedFinal': Name@84) = ArrayList@100[1] { JavaPropertyDescriptor@101['protectedFinal'] } // through LazyJavaStaticClassScope@81
-    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    properties('protectedMutable': Name@85) = ArrayList@102[1] { JavaPropertyDescriptor@103['protectedMutable'] } // through LazyJavaStaticClassScope@81
-    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    properties('publicFinal': Name@86) = ArrayList@104[1] { JavaPropertyDescriptor@105['publicFinal'] } // through LazyJavaStaticClassScope@81
-    properties('publicFinal': Name@86) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    properties('publicMutable': Name@87) = ArrayList@106[1] { JavaPropertyDescriptor@107['publicMutable'] } // through LazyJavaStaticClassScope@81
-    properties('publicMutable': Name@87) = EmptyList@80[empty] // through LazyJavaClassMemberScope@78
-    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
-}
-
-LazyJavaClassTypeConstructor@108['JavaClass'] {
-    parameters = ArrayList@109[empty]
-    supertypes = ArrayList@110[1] { JetTypeImpl@111['Any'] }
-}
-
-LazyJavaClassifierType@112['JavaClass'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaClassImpl@114['JavaClass']
-    memberScope = LazyJavaClassMemberScope@78
-    nullable = 'false': Boolean@115
-    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
-}
-
-LazyJavaClassifierType@116['JavaClass'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@114['JavaClass']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@108['JavaClass']
-}
-
-LazyJavaClassifierType@119['Object'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaClassImpl@121['Object']
-    memberScope = DeserializedClassMemberScope@51
-    nullable = 'false': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@122['Object'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@121['Object']
-    nullable = 'true': Boolean@118
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@124['Object'] {
-    classifier = JavaClassImpl@125['Object']
-    typeConstructor = DeserializedClassTypeConstructor@50
-}
-
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['String']
-    memberScope = DeserializedClassMemberScope@129
-    nullable = 'false': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@131['String'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@128['String']
-    nullable = 'true': Boolean@118
-    typeConstructor = DeserializedClassTypeConstructor@130
-}
-
-LazyJavaClassifierType@133['Throwable'] {
-    arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@135['Throwable']
-    memberScope = DeserializedClassMemberScope@136
-    nullable = 'false': Boolean@115
-    typeConstructor = DeserializedClassTypeConstructor@137
-}
-
-LazyJavaClassifierType@138['Throwable'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@135['Throwable']
-    nullable = 'true': Boolean@118
-    typeConstructor = DeserializedClassTypeConstructor@137
-}
-
-LazyJavaPackageFragmentProvider@140 {
-    packageFragments('<root>': FqName@141) = LazyJavaPackageFragment@142['<root>']
-    packageFragments('Any': FqName@143) = null
-    packageFragments('Char': FqName@144) = null
-    packageFragments('Double': FqName@145) = null
-    packageFragments('JavaClass': FqName@146) = null
-    packageFragments('KMutableProperty': FqName@147) = null
-    packageFragments('KMutableTopLevelProperty': FqName@148) = null
-    packageFragments('KProperty': FqName@149) = null
-    packageFragments('KTopLevelProperty': FqName@150) = null
-    packageFragments('String': FqName@151) = null
-    packageFragments('Throwable': FqName@152) = null
-    packageFragments('java': FqName@153) = LazyJavaPackageFragment@154['java']
-    packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
-    packageFragments('java.lang.Any': FqName@157) = null
-    packageFragments('java.lang.Char': FqName@158) = null
-    packageFragments('java.lang.Double': FqName@159) = null
-    packageFragments('java.lang.JavaClass': FqName@160) = null
-    packageFragments('java.lang.KMutableProperty': FqName@161) = null
-    packageFragments('java.lang.KMutableTopLevelProperty': FqName@162) = null
-    packageFragments('java.lang.KProperty': FqName@163) = null
-    packageFragments('java.lang.KTopLevelProperty': FqName@164) = null
-    packageFragments('java.lang.String': FqName@165) = null
-    packageFragments('java.lang.Throwable': FqName@166) = null
-    packageFragments('kotlin': FqName@167) = LazyJavaPackageFragment@168['kotlin']
-    packageFragments('kotlin.Any': FqName@169) = null
-    packageFragments('kotlin.Char': FqName@170) = null
-    packageFragments('kotlin.Double': FqName@171) = null
-    packageFragments('kotlin.JavaClass': FqName@172) = null
-    packageFragments('kotlin.KMutableProperty': FqName@173) = null
-    packageFragments('kotlin.KMutableTopLevelProperty': FqName@174) = null
-    packageFragments('kotlin.KProperty': FqName@175) = null
-    packageFragments('kotlin.KTopLevelProperty': FqName@176) = null
-    packageFragments('kotlin.String': FqName@177) = null
-    packageFragments('kotlin.Throwable': FqName@178) = null
-    packageFragments('kotlin.io': FqName@179) = LazyJavaPackageFragment@180['io']
-    packageFragments('kotlin.io.Any': FqName@181) = null
-    packageFragments('kotlin.io.Char': FqName@182) = null
-    packageFragments('kotlin.io.Double': FqName@183) = null
-    packageFragments('kotlin.io.JavaClass': FqName@184) = null
-    packageFragments('kotlin.io.KMutableProperty': FqName@185) = null
-    packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@186) = null
-    packageFragments('kotlin.io.KProperty': FqName@187) = null
-    packageFragments('kotlin.io.KTopLevelProperty': FqName@188) = null
-    packageFragments('kotlin.io.String': FqName@189) = null
-    packageFragments('kotlin.io.Throwable': FqName@190) = null
-    packageFragments('kotlin.jvm': FqName@191) = LazyJavaPackageFragment@192['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@193) = null
-    packageFragments('kotlin.jvm.Char': FqName@194) = null
-    packageFragments('kotlin.jvm.Double': FqName@195) = null
-    packageFragments('kotlin.jvm.JavaClass': FqName@196) = null
-    packageFragments('kotlin.jvm.KMutableProperty': FqName@197) = null
-    packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@198) = null
-    packageFragments('kotlin.jvm.KProperty': FqName@199) = null
-    packageFragments('kotlin.jvm.KTopLevelProperty': FqName@200) = null
-    packageFragments('kotlin.jvm.String': FqName@201) = null
-    packageFragments('kotlin.jvm.Throwable': FqName@202) = null
-    packageFragments('kotlin.reflect': FqName@203) = LazyJavaPackageFragment@19['reflect']
-    packageFragments('kotlin.reflect.Any': FqName@204) = null
-    packageFragments('kotlin.reflect.Char': FqName@205) = null
-    packageFragments('kotlin.reflect.Double': FqName@206) = null
-    packageFragments('kotlin.reflect.JavaClass': FqName@207) = null
-    packageFragments('kotlin.reflect.KMutableProperty': FqName@208) = null
-    packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@209) = null
-    packageFragments('kotlin.reflect.KProperty': FqName@210) = null
-    packageFragments('kotlin.reflect.KTopLevelProperty': FqName@211) = null
-    packageFragments('kotlin.reflect.String': FqName@212) = null
-    packageFragments('kotlin.reflect.Throwable': FqName@213) = null
-    topLevelClasses(JavaClassImpl@214['JavaClass']) = LazyJavaClassDescriptor@76['JavaClass']
-}
-
-LazyJavaPackageFragment@142['<root>'] {
-    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('JavaClass': Name@216) = LazyJavaClassDescriptor@76['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('KMutableProperty': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('KMutableTopLevelProperty': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('KProperty': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('KTopLevelProperty': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('kotlin': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('JavaClass': Name@223) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('kotlin': Name@224) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@225 // through LazyPackageFragmentScopeForJavaPackage@215
-}
-
-LazyJavaPackageFragment@180['io'] {
-    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@226
-    deserializedPackageScope = DeserializedPackageMemberScope@227 // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('invoke': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@226
-    memberIndex = computeMemberIndex$1@228 // through LazyPackageFragmentScopeForJavaPackage@226
-    membersProtos = LinkedHashMap@229 // through DeserializedPackageMemberScope@227
-    properties('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    properties('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    properties('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-    properties('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@227
-}
-
-LazyJavaPackageFragment@154['java'] {
-    classes('lang': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('lang': Name@232) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    memberIndex = computeMemberIndex$1@233 // through LazyPackageFragmentScopeForJavaPackage@231
-}
-
-LazyJavaPackageFragment@192['jvm'] {
-    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    memberIndex = computeMemberIndex$1@235 // through LazyPackageFragmentScopeForJavaPackage@234
-}
-
-LazyJavaPackageFragment@168['kotlin'] {
-    classes('Any': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('io': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('jvm': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    classes('reflect': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@237
-    deserializedPackageScope = DeserializedPackageMemberScope@241 // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('invoke': Name@79) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('io': Name@242) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('io': Name@242) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('jvm': Name@243) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('jvm': Name@243) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    functions('reflect': Name@244) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    functions('reflect': Name@244) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@237
-    memberIndex = computeMemberIndex$1@245 // through LazyPackageFragmentScopeForJavaPackage@237
-    membersProtos = LinkedHashMap@246 // through DeserializedPackageMemberScope@241
-    properties('io': Name@242) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('jvm': Name@243) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('privateFinal': Name@82) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('privateMutable': Name@83) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('protectedFinal': Name@84) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('protectedMutable': Name@85) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('publicFinal': Name@86) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('publicMutable': Name@87) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-    properties('reflect': Name@244) = EmptyList@80[empty] // through DeserializedPackageMemberScope@241
-}
-
-LazyJavaPackageFragment@156['lang'] {
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@247
-    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@247
-}
-
-LazyJavaPackageFragment@19['reflect'] {
-    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Char': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Double': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KCallable': Name@250) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KMutableProperty': Name@251) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KMutableTopLevelProperty': Name@218) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KMutableTopLevelVariable': Name@252) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KMutableVariable': Name@253) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KProperty': Name@254) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KTopLevelProperty': Name@220) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KTopLevelVariable': Name@255) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('KVariable': Name@256) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('String': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('Throwable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('invoke': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('privateFinal': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('privateMutable': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('protectedFinal': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('protectedMutable': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('publicFinal': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    classes('publicMutable': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@249
-    deserializedPackageScope = Empty@222 // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('invoke': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('privateFinal': Name@82) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('privateMutable': Name@83) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('protectedFinal': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('protectedMutable': Name@85) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('publicFinal': Name@86) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    functions('publicMutable': Name@87) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@249
-    memberIndex = computeMemberIndex$1@257 // through LazyPackageFragmentScopeForJavaPackage@249
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = ArrayList@259[1] { ResolutionCandidate@260 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = ArrayList@262[1] { ResolutionCandidate@263 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@267 {
-    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@270 {
-    <name not found> = ArrayList@271[1] { ResolutionCandidate@272 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@273 {
-    <name not found> = ArrayList@274[1] { ResolutionCandidate@275 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@276 {
-    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@279 {
-    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@284 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@287 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@291 {
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@294 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@296 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@297 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-ResolutionTaskHolder@299 {
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
-
-TypeDeserializer@300 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@304 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@305 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@306 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
-}
-
-TypeDeserializer@307 {
-    classDescriptors('3': Integer@301) = DeserializedClassDescriptor@302['Any']
-}
-
-TypeDeserializer@308 {
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@309 {
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@311) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@312 {
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@313 {
-    classDescriptors('4': Integer@303) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@310) = DeserializedClassDescriptor@14['KTopLevelProperty']
-}
-
-null {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@266 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@284 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@275 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@290 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@269 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@293 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@272 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@287 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@263 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@278 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@260 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@281 }
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-    <name not found> = EmptyList@80[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
deleted file mode 100644
index 20218a326af..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
+++ /dev/null
@@ -1,204 +0,0 @@
-LazyJavaPackageFragmentProvider@0 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@2['<root>']
-    packageFragments('String': FqName@3) = null
-    packageFragments('java': FqName@4) = LazyJavaPackageFragment@5['java']
-    packageFragments('java.lang': FqName@6) = LazyJavaPackageFragment@7['lang']
-    packageFragments('java.lang.String': FqName@8) = null
-    packageFragments('kotlin': FqName@9) = LazyJavaPackageFragment@10['kotlin']
-    packageFragments('kotlin.String': FqName@11) = null
-    packageFragments('kotlin.io': FqName@12) = LazyJavaPackageFragment@13['io']
-    packageFragments('kotlin.io.String': FqName@14) = null
-    packageFragments('kotlin.jvm': FqName@15) = LazyJavaPackageFragment@16['jvm']
-    packageFragments('kotlin.jvm.String': FqName@17) = null
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
-LazyJavaPackageFragment@13['io'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = DeserializedPackageMemberScope@28 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@20) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
-    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lambda': Name@21) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
-    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('local': Name@22) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
-    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('param': Name@23) = EmptyList@25[empty] // through DeserializedPackageMemberScope@28
-    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
-    membersProtos = LinkedHashMap@30 // through DeserializedPackageMemberScope@28
-}
-
-LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('lang': Name@33) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@16['jvm'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@10['kotlin'] {
-    classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('io': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('jvm': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = DeserializedPackageMemberScope@40 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@20) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('io': Name@41) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('io': Name@41) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('jvm': Name@42) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('jvm': Name@42) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lambda': Name@21) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('local': Name@22) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('param': Name@23) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@37
-    membersProtos = LinkedHashMap@44 // through DeserializedPackageMemberScope@40
-    properties('io': Name@41) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-    properties('jvm': Name@42) = EmptyList@25[empty] // through DeserializedPackageMemberScope@40
-}
-
-LazyJavaPackageFragment@7['lang'] {
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('lambda': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('local': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('param': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lambda': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('local': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
-}
-
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@50 {
-    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@53 {
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-ResolutionTaskHolder@65 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-ResolutionTaskHolder@66 {
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
-
-null {
-    <name not found> = ArrayList@67[1] { ResolutionCandidate@52 }
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@64 }
-    <name not found> = ArrayList@69[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@58 }
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@55 }
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@61 }
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-    <name not found> = EmptyList@25[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
deleted file mode 100644
index b5f8480c6bf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
+++ /dev/null
@@ -1,960 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableMemberProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableProperty']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KProperty']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['Unit']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-    functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
-    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
-    membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@16
-}
-
-DeserializedClassDescriptor@4['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-    defaultType = JetTypeImpl@19['KMemberProperty<2>']
-    functions('get': Name@14) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@21['get'] } // through DeserializedClassMemberScope@22
-    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
-    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
-}
-
-DeserializedClassDescriptor@6['KMutableMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-    defaultType = JetTypeImpl@25['KMutableMemberProperty<2>']
-    functions('get': Name@14) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['get'] } // through DeserializedClassMemberScope@28
-    functions('set': Name@17) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['set'] } // through DeserializedClassMemberScope@28
-    membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-}
-
-DeserializedClassDescriptor@8['KMutableProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-    functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
-    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
-    membersProtos = LinkedHashMap@34 // through DeserializedClassMemberScope@33
-}
-
-DeserializedClassDescriptor@10['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@13['reflect']
-    functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
-    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
-    membersProtos = LinkedHashMap@36 // through DeserializedClassMemberScope@35
-}
-
-DeserializedClassDescriptor@12['Unit'] {
-    classObjectDescriptor = DeserializedClassDescriptor@37['<class-object-for-Unit>']
-    containingDeclaration = LazyJavaPackageFragment@38['kotlin']
-    defaultType = JetTypeImpl@39['Unit']
-    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedClassMemberScope@41
-    functions('toString': Name@42) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@44['toString'] } // through DeserializedClassMemberScope@41
-    membersProtos = LinkedHashMap@45 // through DeserializedClassMemberScope@41
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
-}
-
-DeserializedTypeParameterDescriptor@47['R'] {
-    defaultType = JetTypeImpl@48['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-    upperBounds = LinkedHashSet@50[1] { DeserializedType@51['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@52['R'] {
-    defaultType = JetTypeImpl@53['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-    upperBounds = LinkedHashSet@55[1] { DeserializedType@56['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@57['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-DeserializedTypeParameterDescriptor@59['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-DeserializedTypeParameterDescriptor@61['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-DeserializedTypeParameterDescriptor@63['T'] {
-    defaultType = JetTypeImpl@64['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-    upperBounds = LinkedHashSet@66[1] { DeserializedType@67['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@68['T'] {
-    defaultType = JetTypeImpl@69['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-    upperBounds = LinkedHashSet@71[1] { DeserializedType@72['kotlin.Any'] }
-}
-
-DeserializedType@73['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-DeserializedType@74['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-DeserializedType@75['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-DeserializedType@76['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-DeserializedType@77['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-DeserializedType@78['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-DeserializedType@79['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@56['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@82['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@72['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = DeserializedClassMemberScope@81
-}
-
-DeserializedType@83['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@84
-}
-
-DeserializedType@85['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@86
-    memberScope = DeserializedClassMemberScope@41
-}
-
-DeserializedType@87['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = SubstitutingScope@89
-}
-
-DeserializedType@90['kotlin.reflect.KMemberProperty'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = SubstitutingScope@92
-}
-
-DeserializedType@93['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@94
-    memberScope = SubstitutingScope@95
-}
-
-DeserializedType@96['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@97
-    memberScope = SubstitutingScope@98
-}
-
-DeserializedType@99['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@97
-    memberScope = SubstitutingScope@100
-}
-
-EnumEntryClassDescriptors@101 {
-    findEnumEntry('get': Name@14) = null
-    findEnumEntry('set': Name@17) = null
-}
-
-EnumEntryClassDescriptors@102 {
-    findEnumEntry('get': Name@103) = null
-}
-
-EnumEntryClassDescriptors@104 {
-    findEnumEntry('invoke': Name@40) = null
-    findEnumEntry('toString': Name@42) = null
-}
-
-LazyJavaPackageFragmentProvider@105 {
-    packageFragments('<root>': FqName@106) = LazyJavaPackageFragment@107['<root>']
-    packageFragments('A': FqName@108) = null
-    packageFragments('KMemberProperty': FqName@109) = null
-    packageFragments('KMutableMemberProperty': FqName@110) = null
-    packageFragments('String': FqName@111) = null
-    packageFragments('Unit': FqName@112) = null
-    packageFragments('java': FqName@113) = LazyJavaPackageFragment@114['java']
-    packageFragments('java.lang': FqName@115) = LazyJavaPackageFragment@116['lang']
-    packageFragments('java.lang.A': FqName@117) = null
-    packageFragments('java.lang.KMemberProperty': FqName@118) = null
-    packageFragments('java.lang.KMutableMemberProperty': FqName@119) = null
-    packageFragments('java.lang.String': FqName@120) = null
-    packageFragments('java.lang.Unit': FqName@121) = null
-    packageFragments('kotlin': FqName@122) = LazyJavaPackageFragment@38['kotlin']
-    packageFragments('kotlin.A': FqName@123) = null
-    packageFragments('kotlin.KMemberProperty': FqName@124) = null
-    packageFragments('kotlin.KMutableMemberProperty': FqName@125) = null
-    packageFragments('kotlin.String': FqName@126) = null
-    packageFragments('kotlin.Unit': FqName@127) = null
-    packageFragments('kotlin.io': FqName@128) = LazyJavaPackageFragment@129['io']
-    packageFragments('kotlin.io.A': FqName@130) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@131) = null
-    packageFragments('kotlin.io.KMutableMemberProperty': FqName@132) = null
-    packageFragments('kotlin.io.String': FqName@133) = null
-    packageFragments('kotlin.io.Unit': FqName@134) = null
-    packageFragments('kotlin.jvm': FqName@135) = LazyJavaPackageFragment@136['jvm']
-    packageFragments('kotlin.jvm.A': FqName@137) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@138) = null
-    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@139) = null
-    packageFragments('kotlin.jvm.String': FqName@140) = null
-    packageFragments('kotlin.jvm.Unit': FqName@141) = null
-    packageFragments('kotlin.reflect': FqName@142) = LazyJavaPackageFragment@13['reflect']
-    packageFragments('kotlin.reflect.A': FqName@143) = null
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@144) = null
-    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@145) = null
-    packageFragments('kotlin.reflect.String': FqName@146) = null
-    packageFragments('kotlin.reflect.Unit': FqName@147) = null
-}
-
-LazyJavaPackageFragment@107['<root>'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('KMemberProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('KMutableMemberProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('kotlin': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('kotlin': Name@159) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
-}
-
-LazyJavaPackageFragment@129['io'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = DeserializedPackageMemberScope@162 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
-    membersProtos = LinkedHashMap@164 // through DeserializedPackageMemberScope@162
-    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-}
-
-LazyJavaPackageFragment@114['java'] {
-    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('lang': Name@168) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@167
-}
-
-LazyJavaPackageFragment@136['jvm'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@170
-}
-
-LazyJavaPackageFragment@38['kotlin'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('Any': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('Unit': Name@153) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('io': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('jvm': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('reflect': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = DeserializedPackageMemberScope@177 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('io': Name@178) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('io': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('jvm': Name@179) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('jvm': Name@179) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('reflect': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('reflect': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@172
-    membersProtos = LinkedHashMap@182 // through DeserializedPackageMemberScope@177
-    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('io': Name@178) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('jvm': Name@179) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('reflect': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
-}
-
-LazyJavaPackageFragment@116['lang'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@183
-}
-
-LazyJavaPackageFragment@13['reflect'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('KCallable': Name@186) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('KMemberProperty': Name@187) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('KMutableMemberProperty': Name@188) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('KMutableProperty': Name@189) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('KProperty': Name@190) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@185
-}
-
-NestedClassDescriptors@192 {
-    findNestedClass('get': Name@14) = null
-    findNestedClass('set': Name@17) = null
-}
-
-NestedClassDescriptors@193 {
-    findNestedClass('get': Name@103) = null
-}
-
-NestedClassDescriptors@194 {
-    findNestedClass('invoke': Name@40) = null
-    findNestedClass('toString': Name@42) = null
-}
-
-ResolutionTaskHolder@195 {
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@200 {
-    <name not found> = ArrayList@201[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@205 {
-    <name not found> = ArrayList@206[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@210 {
-    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@213 {
-    <name not found> = ArrayList@214[1] { ResolutionCandidate@215 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@216 {
-    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@219 {
-    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@222 {
-    <name not found> = ArrayList@223[1] { ResolutionCandidate@224 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@225 {
-    <name not found> = ArrayList@226[1] { ResolutionCandidate@227 }
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@228 {
-    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
-}
-
-ResolutionTaskHolder@231 {
-    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
-}
-
-ResolutionTaskHolder@234 {
-    <name not found> = ArrayList@235[1] { ResolutionCandidate@236 }
-}
-
-ResolutionTaskHolder@237 {
-    <name not found> = ArrayList@238[1] { ResolutionCandidate@239 }
-}
-
-ResolutionTaskHolder@240 {
-    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
-}
-
-ResolutionTaskHolder@243 {
-    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
-}
-
-ResolutionTaskHolder@246 {
-    <name not found> = ArrayList@247[1] { ResolutionCandidate@248 }
-}
-
-ResolutionTaskHolder@249 {
-    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
-}
-
-ResolutionTaskHolder@252 {
-    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
-}
-
-ResolutionTaskHolder@255 {
-    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
-}
-
-ResolutionTaskHolder@258 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@260 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@261 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@263 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@264 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-ResolutionTaskHolder@266 {
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
-
-TypeDeserializer@267 {
-    classDescriptors('2': Integer@268) = DeserializedClassDescriptor@269['Any']
-}
-
-TypeDeserializer@270 {
-    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@273) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@274 {
-    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@275 {
-    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@269['Any']
-}
-
-TypeDeserializer@276 {
-    classDescriptors('3': Integer@271) = DeserializedClassDescriptor@277['String']
-}
-
-TypeDeserializer@278 {
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@279 {
-    classDescriptors('4': Integer@272) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@280 {
-    classDescriptors('6': Integer@281) = DeserializedClassDescriptor@12['Unit']
-}
-
-null {
-    <name not found> = ArrayList@282[1] { ResolutionCandidate@218 }
-    <name not found> = ArrayList@283[1] { ResolutionCandidate@207 }
-    <name not found> = ArrayList@284[1] { ResolutionCandidate@209 }
-    <name not found> = ArrayList@285[1] { ResolutionCandidate@221 }
-    <name not found> = ArrayList@286[1] { ResolutionCandidate@202 }
-    <name not found> = ArrayList@287[1] { ResolutionCandidate@204 }
-    <name not found> = ArrayList@288[1] { ResolutionCandidate@227 }
-    <name not found> = ArrayList@289[1] { ResolutionCandidate@197 }
-    <name not found> = ArrayList@290[1] { ResolutionCandidate@199 }
-    <name not found> = ArrayList@291[1] { ResolutionCandidate@224 }
-    <name not found> = ArrayList@292[1] { ResolutionCandidate@254 }
-    <name not found> = ArrayList@293[1] { ResolutionCandidate@230 }
-    <name not found> = ArrayList@294[1] { ResolutionCandidate@239 }
-    <name not found> = ArrayList@295[1] { ResolutionCandidate@242 }
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@257 }
-    <name not found> = ArrayList@297[1] { ResolutionCandidate@215 }
-    <name not found> = ArrayList@298[1] { ResolutionCandidate@251 }
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@233 }
-    <name not found> = ArrayList@300[1] { ResolutionCandidate@212 }
-    <name not found> = ArrayList@301[1] { ResolutionCandidate@248 }
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@236 }
-    <name not found> = ArrayList@303[1] { ResolutionCandidate@245 }
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-    <name not found> = EmptyList@15[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
deleted file mode 100644
index 0621a2111fe..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
+++ /dev/null
@@ -1,908 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMemberProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableMemberProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableProperty']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KProperty']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['Unit']
-}
-
-DescriptorResolver@13 {
-    <name not found> = IntValue@14
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
-    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@18
-    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
-}
-
-DeserializedClassDescriptor@4['KMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    defaultType = JetTypeImpl@22['KMemberProperty<2>']
-    functions('get': Name@16) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['get'] } // through DeserializedClassMemberScope@25
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
-    membersProtos = LinkedHashMap@26 // through DeserializedClassMemberScope@25
-    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-}
-
-DeserializedClassDescriptor@6['KMutableMemberProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    defaultType = JetTypeImpl@28['KMutableMemberProperty<2>']
-    functions('get': Name@29) = ArrayList@30[1] { DeserializedSimpleFunctionDescriptor@31['get'] } // through DeserializedClassMemberScope@32
-    functions('set': Name@33) = ArrayList@34[1] { DeserializedSimpleFunctionDescriptor@35['set'] } // through DeserializedClassMemberScope@32
-    membersProtos = LinkedHashMap@36 // through DeserializedClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-}
-
-DeserializedClassDescriptor@8['KMutableProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('get': Name@29) = EmptyList@17[empty] // through DeserializedClassMemberScope@38
-    functions('set': Name@33) = EmptyList@17[empty] // through DeserializedClassMemberScope@38
-    membersProtos = LinkedHashMap@39 // through DeserializedClassMemberScope@38
-}
-
-DeserializedClassDescriptor@10['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
-    membersProtos = LinkedHashMap@41 // through DeserializedClassMemberScope@40
-    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
-}
-
-DeserializedClassDescriptor@12['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@42['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@43['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@44
-    upperBounds = LinkedHashSet@45[1] { DeserializedType@46['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@47['R'] {
-    defaultType = JetTypeImpl@48['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-    upperBounds = LinkedHashSet@50[1] { DeserializedType@51['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@52['R'] {
-    defaultType = JetTypeImpl@53['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-    upperBounds = LinkedHashSet@55[1] { DeserializedType@56['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@57['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-}
-
-DeserializedTypeParameterDescriptor@59['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
-}
-
-DeserializedTypeParameterDescriptor@61['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-}
-
-DeserializedTypeParameterDescriptor@63['T'] {
-    defaultType = JetTypeImpl@64['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-    upperBounds = LinkedHashSet@66[1] { DeserializedType@67['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@68['T'] {
-    defaultType = JetTypeImpl@69['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-    upperBounds = LinkedHashSet@71[1] { DeserializedType@72['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@73['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
-    upperBounds = LinkedHashSet@75[1] { DeserializedType@76['kotlin.Any'] }
-}
-
-DeserializedType@77['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
-}
-
-DeserializedType@78['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
-}
-
-DeserializedType@79['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-DeserializedType@80['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-DeserializedType@81['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
-}
-
-DeserializedType@82['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@70
-}
-
-DeserializedType@83['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-DeserializedType@84['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-DeserializedType@85['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-DeserializedType@86['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-DeserializedType@87['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
-}
-
-DeserializedType@72['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@56['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@90['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@76['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@88
-    memberScope = DeserializedClassMemberScope@89
-}
-
-DeserializedType@91['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@92
-}
-
-DeserializedType@93['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@92
-}
-
-DeserializedType@94['kotlin.MutableMap'] {
-    constructor = DeserializedClassTypeConstructor@95
-    memberScope = SubstitutingScope@96
-}
-
-DeserializedType@97['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@98
-    memberScope = DeserializedClassMemberScope@99
-}
-
-DeserializedType@100['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@101
-    memberScope = SubstitutingScope@102
-}
-
-DeserializedType@103['kotlin.reflect.KMemberProperty'] {
-    constructor = DeserializedClassTypeConstructor@104
-    memberScope = SubstitutingScope@105
-}
-
-DeserializedType@106['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@107
-    memberScope = SubstitutingScope@108
-}
-
-DeserializedType@109['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@110
-    memberScope = SubstitutingScope@111
-}
-
-DeserializedType@112['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@110
-    memberScope = SubstitutingScope@113
-}
-
-EnumEntryClassDescriptors@114 {
-    findEnumEntry('get': Name@16) = null
-    findEnumEntry('set': Name@19) = null
-}
-
-EnumEntryClassDescriptors@115 {
-    findEnumEntry('get': Name@29) = null
-    findEnumEntry('set': Name@33) = null
-}
-
-LazyJavaPackageFragmentProvider@116 {
-    packageFragments('<root>': FqName@117) = LazyJavaPackageFragment@118['<root>']
-    packageFragments('A': FqName@119) = null
-    packageFragments('Int': FqName@120) = null
-    packageFragments('KMemberProperty': FqName@121) = null
-    packageFragments('KMutableMemberProperty': FqName@122) = null
-    packageFragments('String': FqName@123) = null
-    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
-    packageFragments('java.lang': FqName@126) = LazyJavaPackageFragment@127['lang']
-    packageFragments('java.lang.A': FqName@128) = null
-    packageFragments('java.lang.Int': FqName@129) = null
-    packageFragments('java.lang.KMemberProperty': FqName@130) = null
-    packageFragments('java.lang.KMutableMemberProperty': FqName@131) = null
-    packageFragments('java.lang.String': FqName@132) = null
-    packageFragments('kotlin': FqName@133) = LazyJavaPackageFragment@42['kotlin']
-    packageFragments('kotlin.A': FqName@134) = null
-    packageFragments('kotlin.Int': FqName@135) = null
-    packageFragments('kotlin.KMemberProperty': FqName@136) = null
-    packageFragments('kotlin.KMutableMemberProperty': FqName@137) = null
-    packageFragments('kotlin.String': FqName@138) = null
-    packageFragments('kotlin.io': FqName@139) = LazyJavaPackageFragment@140['io']
-    packageFragments('kotlin.io.A': FqName@141) = null
-    packageFragments('kotlin.io.Int': FqName@142) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@143) = null
-    packageFragments('kotlin.io.KMutableMemberProperty': FqName@144) = null
-    packageFragments('kotlin.io.String': FqName@145) = null
-    packageFragments('kotlin.jvm': FqName@146) = LazyJavaPackageFragment@147['jvm']
-    packageFragments('kotlin.jvm.A': FqName@148) = null
-    packageFragments('kotlin.jvm.Int': FqName@149) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@150) = null
-    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@151) = null
-    packageFragments('kotlin.jvm.String': FqName@152) = null
-    packageFragments('kotlin.reflect': FqName@153) = LazyJavaPackageFragment@15['reflect']
-    packageFragments('kotlin.reflect.A': FqName@154) = null
-    packageFragments('kotlin.reflect.Int': FqName@155) = null
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@156) = null
-    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@157) = null
-    packageFragments('kotlin.reflect.String': FqName@158) = null
-}
-
-LazyJavaPackageFragment@118['<root>'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('KMemberProperty': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('KMutableMemberProperty': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('kotlin': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('kotlin': Name@170) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@160
-}
-
-LazyJavaPackageFragment@140['io'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = DeserializedPackageMemberScope@173 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('invoke': Name@167) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@172
-    membersProtos = LinkedHashMap@175 // through DeserializedPackageMemberScope@173
-    properties('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    properties('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    properties('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
-}
-
-LazyJavaPackageFragment@125['java'] {
-    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('lang': Name@178) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    memberIndex = computeMemberIndex$1@179 // through LazyPackageFragmentScopeForJavaPackage@177
-}
-
-LazyJavaPackageFragment@147['jvm'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@180
-    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
-    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@180
-}
-
-LazyJavaPackageFragment@42['kotlin'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('Any': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('CharSequence': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('MutableMap': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('Unit': Name@186) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('io': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('jvm': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('reflect': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    deserializedPackageScope = DeserializedPackageMemberScope@190 // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('get': Name@21) = ArrayList@191[2] { DeserializedSimpleFunctionDescriptor@192['get'], DeserializedSimpleFunctionDescriptor@193['get'] } // through DeserializedPackageMemberScope@190
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('invoke': Name@167) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('io': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('io': Name@194) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('jvm': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('jvm': Name@195) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('reflect': Name@196) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    functions('reflect': Name@196) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('set': Name@19) = ArrayList@197[1] { DeserializedSimpleFunctionDescriptor@198['set'] } // through DeserializedPackageMemberScope@190
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@182
-    membersProtos = LinkedHashMap@200 // through DeserializedPackageMemberScope@190
-    properties('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('io': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('jvm': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('reflect': Name@196) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
-}
-
-LazyJavaPackageFragment@127['lang'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
-}
-
-LazyJavaPackageFragment@15['reflect'] {
-    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('KCallable': Name@204) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('KMemberProperty': Name@205) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('KMutableMemberProperty': Name@163) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('KMutableProperty': Name@206) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('KProperty': Name@207) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@203
-}
-
-NestedClassDescriptors@209 {
-    findNestedClass('get': Name@29) = null
-    findNestedClass('set': Name@33) = null
-}
-
-NestedClassDescriptors@210 {
-    findNestedClass('get': Name@16) = null
-    findNestedClass('set': Name@19) = null
-}
-
-ResolutionTaskHolder@211 {
-    <name not found> = ArrayList@212[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@214[2] { ResolutionCandidate@215, ResolutionCandidate@216 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@217 {
-    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@220 {
-    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@223 {
-    <name not found> = ArrayList@224[1] { ResolutionCandidate@225 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@226 {
-    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@229 {
-    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@232 {
-    <name not found> = ArrayList@233[1] { ResolutionCandidate@234 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@235 {
-    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@238 {
-    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
-}
-
-ResolutionTaskHolder@241 {
-    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
-}
-
-ResolutionTaskHolder@244 {
-    <name not found> = ArrayList@245[1] { ResolutionCandidate@246 }
-}
-
-ResolutionTaskHolder@247 {
-    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
-}
-
-ResolutionTaskHolder@250 {
-    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
-}
-
-ResolutionTaskHolder@253 {
-    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
-}
-
-ResolutionTaskHolder@256 {
-    <name not found> = ArrayList@257[1] { ResolutionCandidate@258 }
-}
-
-ResolutionTaskHolder@259 {
-    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
-}
-
-ResolutionTaskHolder@262 {
-    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
-}
-
-ResolutionTaskHolder@265 {
-    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
-}
-
-ResolutionTaskHolder@268 {
-    <name not found> = ArrayList@269[1] { ResolutionCandidate@270 }
-}
-
-ResolutionTaskHolder@271 {
-    <name not found> = ArrayList@272[1] { ResolutionCandidate@273 }
-}
-
-ResolutionTaskHolder@274 {
-    <name not found> = ArrayList@275[1] { ResolutionCandidate@276 }
-}
-
-ResolutionTaskHolder@277 {
-    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
-}
-
-ResolutionTaskHolder@280 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@281 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@282 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@283 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@284 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@286 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@287 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@288 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@289 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-TypeDeserializer@290 {
-    classDescriptors('129': Integer@291) = DeserializedClassDescriptor@292['MutableMap']
-    classDescriptors('9': Integer@293) = DeserializedClassDescriptor@294['Any']
-}
-
-TypeDeserializer@295 {
-    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
-    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@298) = DeserializedClassDescriptor@8['KMutableProperty']
-}
-
-TypeDeserializer@299 {
-    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
-    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@300 {
-    classDescriptors('3': Integer@296) = DeserializedClassDescriptor@294['Any']
-}
-
-TypeDeserializer@301 {
-    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@302 {
-    classDescriptors('4': Integer@297) = DeserializedClassDescriptor@10['KProperty']
-}
-
-TypeDeserializer@303 {
-    classDescriptors('40': Integer@304) = DeserializedClassDescriptor@305['CharSequence']
-}
-
-TypeDeserializer@306 {
-    classDescriptors('40': Integer@304) = DeserializedClassDescriptor@305['CharSequence']
-}
-
-TypeDeserializer@307 {
-    classDescriptors('6': Integer@308) = DeserializedClassDescriptor@12['Unit']
-}
-
-null {
-    <name not found> = ArrayList@309[1] { ResolutionCandidate@219 }
-    <name not found> = ArrayList@310[1] { ResolutionCandidate@246 }
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@273 }
-    <name not found> = ArrayList@312[1] { ResolutionCandidate@249 }
-    <name not found> = ArrayList@313[1] { ResolutionCandidate@276 }
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@228 }
-    <name not found> = ArrayList@315[1] { ResolutionCandidate@267 }
-    <name not found> = ArrayList@316[1] { ResolutionCandidate@270 }
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@213 }
-    <name not found> = ArrayList@318[1] { ResolutionCandidate@279 }
-    <name not found> = ArrayList@319[1] { ResolutionCandidate@234 }
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@225 }
-    <name not found> = ArrayList@321[1] { ResolutionCandidate@222 }
-    <name not found> = ArrayList@322[1] { ResolutionCandidate@240 }
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@252 }
-    <name not found> = ArrayList@324[1] { ResolutionCandidate@258 }
-    <name not found> = ArrayList@325[1] { ResolutionCandidate@243 }
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@231 }
-    <name not found> = ArrayList@327[1] { ResolutionCandidate@264 }
-    <name not found> = ArrayList@328[1] { ResolutionCandidate@255 }
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@237 }
-    <name not found> = ArrayList@330[1] { ResolutionCandidate@261 }
-    <name not found> = ArrayList@331[2] { ResolutionCandidate@215, ResolutionCandidate@216 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
deleted file mode 100644
index b715dc012bc..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
+++ /dev/null
@@ -1,917 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['KCallable']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['KMutableProperty']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KMutableTopLevelVariable']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KMutableVariable']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['KProperty']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classes(ClassKey@15) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classes(ClassKey@17) = DeserializedClassDescriptor@18['KVariable']
-    classes(ClassKey@19) = DeserializedClassDescriptor@20['Unit']
-}
-
-DeserializedClassDescriptor@2['KCallable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@22['KCallable<1>']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
-    membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@25
-    properties('name': Name@28) = ArrayList@29[1] { DeserializedPropertyDescriptor@30['name'] } // through DeserializedClassMemberScope@25
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-}
-
-DeserializedClassDescriptor@4['KMutableProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@33
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@33
-    membersProtos = LinkedHashMap@34 // through DeserializedClassMemberScope@33
-    properties('name': Name@28) = ArrayList@35[1] { DeserializedPropertyDescriptor@36['name'] } // through DeserializedClassMemberScope@33
-}
-
-DeserializedClassDescriptor@6['KMutableTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@37
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@37
-    membersProtos = LinkedHashMap@38 // through DeserializedClassMemberScope@37
-    properties('name': Name@28) = ArrayList@39[1] { DeserializedPropertyDescriptor@40['name'] } // through DeserializedClassMemberScope@37
-}
-
-DeserializedClassDescriptor@8['KMutableTopLevelVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['get'] } // through DeserializedClassMemberScope@43
-    functions('set': Name@26) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@45['set'] } // through DeserializedClassMemberScope@43
-    membersProtos = LinkedHashMap@46 // through DeserializedClassMemberScope@43
-    properties('name': Name@28) = ArrayList@47[1] { DeserializedPropertyDescriptor@48['name'] } // through DeserializedClassMemberScope@43
-}
-
-DeserializedClassDescriptor@10['KMutableVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@49['KMutableVariable<1>']
-    functions('get': Name@23) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@51['get'] } // through DeserializedClassMemberScope@52
-    functions('set': Name@26) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@54['set'] } // through DeserializedClassMemberScope@52
-    membersProtos = LinkedHashMap@55 // through DeserializedClassMemberScope@52
-    properties('name': Name@28) = ArrayList@56[1] { DeserializedPropertyDescriptor@57['name'] } // through DeserializedClassMemberScope@52
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
-}
-
-DeserializedClassDescriptor@12['KProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
-    membersProtos = LinkedHashMap@60 // through DeserializedClassMemberScope@59
-    properties('name': Name@28) = ArrayList@61[1] { DeserializedPropertyDescriptor@62['name'] } // through DeserializedClassMemberScope@59
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
-}
-
-DeserializedClassDescriptor@14['KTopLevelProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
-    membersProtos = LinkedHashMap@64 // through DeserializedClassMemberScope@63
-    properties('name': Name@28) = ArrayList@65[1] { DeserializedPropertyDescriptor@66['name'] } // through DeserializedClassMemberScope@63
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
-}
-
-DeserializedClassDescriptor@16['KTopLevelVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@67['KTopLevelVariable<1>']
-    functions('get': Name@23) = ArrayList@68[1] { DeserializedSimpleFunctionDescriptor@69['get'] } // through DeserializedClassMemberScope@70
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@70
-    membersProtos = LinkedHashMap@71 // through DeserializedClassMemberScope@70
-    properties('name': Name@28) = ArrayList@72[1] { DeserializedPropertyDescriptor@73['name'] } // through DeserializedClassMemberScope@70
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@70
-}
-
-DeserializedClassDescriptor@18['KVariable'] {
-    containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@74['KVariable<1>']
-    functions('get': Name@23) = ArrayList@75[1] { DeserializedSimpleFunctionDescriptor@76['get'] } // through DeserializedClassMemberScope@77
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@77
-    membersProtos = LinkedHashMap@78 // through DeserializedClassMemberScope@77
-    properties('name': Name@28) = ArrayList@79[1] { DeserializedPropertyDescriptor@80['name'] } // through DeserializedClassMemberScope@77
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@77
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@81['<this>']
-}
-
-DeserializedClassDescriptor@20['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@82['kotlin']
-}
-
-DeserializedTypeParameterDescriptor@83['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@85[1] { DeserializedType@86['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@87['R'] {
-    defaultType = JetTypeImpl@88['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-    upperBounds = LinkedHashSet@90[1] { DeserializedType@91['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@92['R'] {
-    defaultType = JetTypeImpl@93['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
-    upperBounds = LinkedHashSet@95[1] { DeserializedType@96['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@97['R'] {
-    defaultType = JetTypeImpl@98['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@100[1] { DeserializedType@101['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@102['R'] {
-    defaultType = JetTypeImpl@103['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
-}
-
-DeserializedTypeParameterDescriptor@105['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@107[1] { DeserializedType@108['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@109['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
-    upperBounds = LinkedHashSet@111[1] { DeserializedType@112['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@113['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-    upperBounds = LinkedHashSet@115[1] { DeserializedType@116['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@117['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
-    upperBounds = LinkedHashSet@119[1] { DeserializedType@120['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@121['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
-    upperBounds = LinkedHashSet@123[1] { DeserializedType@124['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@125['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@127[1] { DeserializedType@128['kotlin.Any'] }
-}
-
-DeserializedType@129['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-DeserializedType@130['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@84
-}
-
-DeserializedType@131['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@106
-}
-
-DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@110
-}
-
-DeserializedType@133['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@110
-}
-
-DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-DeserializedType@136['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@118
-}
-
-DeserializedType@137['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-DeserializedType@138['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-DeserializedType@139['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@94
-}
-
-DeserializedType@140['R in kotlin.reflect.KProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@122
-}
-
-DeserializedType@141['R in kotlin.reflect.KTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-DeserializedType@143['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@99
-}
-
-DeserializedType@144['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@104
-}
-
-DeserializedType@145['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@104
-}
-
-DeserializedType@146['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-DeserializedType@147['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-DeserializedType@148['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@126
-}
-
-DeserializedType@96['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@124['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@128['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@120['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@101['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@108['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@86['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@151['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@91['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@116['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@112['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@149
-    memberScope = DeserializedClassMemberScope@150
-}
-
-DeserializedType@152['kotlin.MutableMap'] {
-    constructor = DeserializedClassTypeConstructor@153
-    memberScope = SubstitutingScope@154
-}
-
-DeserializedType@155['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@156
-    memberScope = DeserializedClassMemberScope@157
-}
-
-DeserializedType@158['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@159
-    memberScope = DeserializedClassMemberScope@160
-}
-
-DeserializedType@161['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@162
-    memberScope = SubstitutingScope@163
-}
-
-DeserializedType@164['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@165
-    memberScope = SubstitutingScope@166
-}
-
-DeserializedType@167['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@165
-    memberScope = SubstitutingScope@168
-}
-
-DeserializedType@169['kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@170
-    memberScope = SubstitutingScope@171
-}
-
-DeserializedType@172['kotlin.reflect.KMutableVariable'] {
-    constructor = DeserializedClassTypeConstructor@173
-    memberScope = SubstitutingScope@174
-}
-
-DeserializedType@175['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@176
-    memberScope = SubstitutingScope@177
-}
-
-DeserializedType@178['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@176
-    memberScope = SubstitutingScope@179
-}
-
-DeserializedType@180['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@176
-    memberScope = SubstitutingScope@181
-}
-
-DeserializedType@182['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@183
-    memberScope = SubstitutingScope@184
-}
-
-DeserializedType@185['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@183
-    memberScope = SubstitutingScope@186
-}
-
-DeserializedType@187['kotlin.reflect.KTopLevelVariable'] {
-    constructor = DeserializedClassTypeConstructor@188
-    memberScope = SubstitutingScope@189
-}
-
-DeserializedType@190['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@191
-    memberScope = SubstitutingScope@192
-}
-
-DeserializedType@193['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@191
-    memberScope = SubstitutingScope@194
-}
-
-EnumEntryClassDescriptors@195 {
-    findEnumEntry('get': Name@23) = null
-    findEnumEntry('name': Name@28) = null
-    findEnumEntry('set': Name@26) = null
-}
-
-EnumEntryClassDescriptors@196 {
-    findEnumEntry('get': Name@197) = null
-    findEnumEntry('name': Name@198) = null
-    findEnumEntry('set': Name@31) = null
-}
-
-LazyJavaPackageFragmentProvider@199 {
-    packageFragments('<root>': FqName@200) = LazyJavaPackageFragment@201['<root>']
-    packageFragments('Int': FqName@202) = null
-    packageFragments('KCallable': FqName@203) = null
-    packageFragments('KMutableProperty': FqName@204) = null
-    packageFragments('KMutableTopLevelProperty': FqName@205) = null
-    packageFragments('KMutableTopLevelVariable': FqName@206) = null
-    packageFragments('KMutableVariable': FqName@207) = null
-    packageFragments('KProperty': FqName@208) = null
-    packageFragments('KTopLevelProperty': FqName@209) = null
-    packageFragments('KTopLevelVariable': FqName@210) = null
-    packageFragments('String': FqName@211) = null
-    packageFragments('java': FqName@212) = LazyJavaPackageFragment@213['java']
-    packageFragments('java.lang': FqName@214) = LazyJavaPackageFragment@215['lang']
-    packageFragments('java.lang.Int': FqName@216) = null
-    packageFragments('java.lang.KCallable': FqName@217) = null
-    packageFragments('java.lang.KMutableProperty': FqName@218) = null
-    packageFragments('java.lang.KMutableTopLevelProperty': FqName@219) = null
-    packageFragments('java.lang.KMutableTopLevelVariable': FqName@220) = null
-    packageFragments('java.lang.KMutableVariable': FqName@221) = null
-    packageFragments('java.lang.KProperty': FqName@222) = null
-    packageFragments('java.lang.KTopLevelProperty': FqName@223) = null
-    packageFragments('java.lang.KTopLevelVariable': FqName@224) = null
-    packageFragments('java.lang.String': FqName@225) = null
-    packageFragments('kotlin': FqName@226) = LazyJavaPackageFragment@82['kotlin']
-    packageFragments('kotlin.Int': FqName@227) = null
-    packageFragments('kotlin.KCallable': FqName@228) = null
-    packageFragments('kotlin.KMutableProperty': FqName@229) = null
-    packageFragments('kotlin.KMutableTopLevelProperty': FqName@230) = null
-    packageFragments('kotlin.KMutableTopLevelVariable': FqName@231) = null
-    packageFragments('kotlin.KMutableVariable': FqName@232) = null
-    packageFragments('kotlin.KProperty': FqName@233) = null
-    packageFragments('kotlin.KTopLevelProperty': FqName@234) = null
-    packageFragments('kotlin.KTopLevelVariable': FqName@235) = null
-    packageFragments('kotlin.String': FqName@236) = null
-    packageFragments('kotlin.io': FqName@237) = LazyJavaPackageFragment@238['io']
-    packageFragments('kotlin.io.Int': FqName@239) = null
-    packageFragments('kotlin.io.KCallable': FqName@240) = null
-    packageFragments('kotlin.io.KMutableProperty': FqName@241) = null
-    packageFragments('kotlin.io.KMutableTopLevelProperty': FqName@242) = null
-    packageFragments('kotlin.io.KMutableTopLevelVariable': FqName@243) = null
-    packageFragments('kotlin.io.KMutableVariable': FqName@244) = null
-    packageFragments('kotlin.io.KProperty': FqName@245) = null
-    packageFragments('kotlin.io.KTopLevelProperty': FqName@246) = null
-    packageFragments('kotlin.io.KTopLevelVariable': FqName@247) = null
-    packageFragments('kotlin.io.String': FqName@248) = null
-    packageFragments('kotlin.jvm': FqName@249) = LazyJavaPackageFragment@250['jvm']
-    packageFragments('kotlin.jvm.Int': FqName@251) = null
-    packageFragments('kotlin.jvm.KCallable': FqName@252) = null
-    packageFragments('kotlin.jvm.KMutableProperty': FqName@253) = null
-    packageFragments('kotlin.jvm.KMutableTopLevelProperty': FqName@254) = null
-    packageFragments('kotlin.jvm.KMutableTopLevelVariable': FqName@255) = null
-    packageFragments('kotlin.jvm.KMutableVariable': FqName@256) = null
-    packageFragments('kotlin.jvm.KProperty': FqName@257) = null
-    packageFragments('kotlin.jvm.KTopLevelProperty': FqName@258) = null
-    packageFragments('kotlin.jvm.KTopLevelVariable': FqName@259) = null
-    packageFragments('kotlin.jvm.String': FqName@260) = null
-    packageFragments('kotlin.reflect': FqName@261) = LazyJavaPackageFragment@21['reflect']
-    packageFragments('kotlin.reflect.Int': FqName@262) = null
-    packageFragments('kotlin.reflect.KCallable': FqName@263) = null
-    packageFragments('kotlin.reflect.KMutableProperty': FqName@264) = null
-    packageFragments('kotlin.reflect.KMutableTopLevelProperty': FqName@265) = null
-    packageFragments('kotlin.reflect.KMutableTopLevelVariable': FqName@266) = null
-    packageFragments('kotlin.reflect.KMutableVariable': FqName@267) = null
-    packageFragments('kotlin.reflect.KProperty': FqName@268) = null
-    packageFragments('kotlin.reflect.KTopLevelProperty': FqName@269) = null
-    packageFragments('kotlin.reflect.KTopLevelVariable': FqName@270) = null
-    packageFragments('kotlin.reflect.String': FqName@271) = null
-    packageFragments('x': FqName@272) = null
-    packageFragments('y': FqName@273) = null
-}
-
-LazyJavaPackageFragment@201['<root>'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KCallable': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KMutableProperty': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KMutableTopLevelProperty': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KMutableTopLevelVariable': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KMutableVariable': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KProperty': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KTopLevelProperty': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('KTopLevelVariable': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('kotlin': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('kotlin': Name@290) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@275
-}
-
-LazyJavaPackageFragment@238['io'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    deserializedPackageScope = DeserializedPackageMemberScope@293 // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
-    memberIndex = computeMemberIndex$1@294 // through LazyPackageFragmentScopeForJavaPackage@292
-    membersProtos = LinkedHashMap@295 // through DeserializedPackageMemberScope@293
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-}
-
-LazyJavaPackageFragment@213['java'] {
-    classes('lang': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@297
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@297
-    functions('lang': Name@298) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
-    memberIndex = computeMemberIndex$1@299 // through LazyPackageFragmentScopeForJavaPackage@297
-}
-
-LazyJavaPackageFragment@250['jvm'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@300
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@300
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
-    memberIndex = computeMemberIndex$1@301 // through LazyPackageFragmentScopeForJavaPackage@300
-}
-
-LazyJavaPackageFragment@82['kotlin'] {
-    classes('Any': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('MutableMap': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Unit': Name@305) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('io': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('jvm': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('reflect': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    deserializedPackageScope = DeserializedPackageMemberScope@309 // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('io': Name@310) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('jvm': Name@311) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('reflect': Name@312) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('set': Name@31) = ArrayList@313[1] { DeserializedSimpleFunctionDescriptor@314['set'] } // through DeserializedPackageMemberScope@309
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    memberIndex = computeMemberIndex$1@315 // through LazyPackageFragmentScopeForJavaPackage@303
-    membersProtos = LinkedHashMap@316 // through DeserializedPackageMemberScope@309
-    properties('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
-}
-
-LazyJavaPackageFragment@215['lang'] {
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    memberIndex = computeMemberIndex$1@318 // through LazyPackageFragmentScopeForJavaPackage@317
-}
-
-LazyJavaPackageFragment@21['reflect'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KCallable': Name@320) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KMutableProperty': Name@321) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KMutableTopLevelProperty': Name@278) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KMutableTopLevelVariable': Name@322) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KMutableVariable': Name@323) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KProperty': Name@324) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KTopLevelProperty': Name@325) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KTopLevelVariable': Name@326) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('KVariable': Name@327) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    memberIndex = computeMemberIndex$1@328 // through LazyPackageFragmentScopeForJavaPackage@319
-}
-
-NestedClassDescriptors@329 {
-    findNestedClass('get': Name@197) = null
-    findNestedClass('name': Name@198) = null
-    findNestedClass('set': Name@31) = null
-}
-
-NestedClassDescriptors@330 {
-    findNestedClass('get': Name@23) = null
-    findNestedClass('name': Name@28) = null
-    findNestedClass('set': Name@26) = null
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
-}
-
-ResolutionTaskHolder@358 {
-    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
-}
-
-ResolutionTaskHolder@361 {
-    <name not found> = ArrayList@362[1] { ResolutionCandidate@363 }
-}
-
-ResolutionTaskHolder@364 {
-    <name not found> = ArrayList@365[1] { ResolutionCandidate@366 }
-}
-
-ResolutionTaskHolder@367 {
-    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[1] { ResolutionCandidate@372 }
-}
-
-ResolutionTaskHolder@373 {
-    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
-}
-
-ResolutionTaskHolder@376 {
-    <name not found> = ArrayList@377[1] { ResolutionCandidate@378 }
-}
-
-ResolutionTaskHolder@379 {
-    <name not found> = ArrayList@380[1] { ResolutionCandidate@381 }
-}
-
-ResolutionTaskHolder@382 {
-    <name not found> = ArrayList@383[1] { ResolutionCandidate@384 }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[1] { ResolutionCandidate@387 }
-}
-
-ResolutionTaskHolder@388 {
-    <name not found> = ArrayList@389[1] { ResolutionCandidate@390 }
-}
-
-ResolutionTaskHolder@391 {
-    <name not found> = ArrayList@392[1] { ResolutionCandidate@393 }
-}
-
-ResolutionTaskHolder@394 {
-    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
-}
-
-ResolutionTaskHolder@397 {
-    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
-}
-
-ResolutionTaskHolder@403 {
-    <name not found> = ArrayList@404[1] { ResolutionCandidate@405 }
-}
-
-ResolutionTaskHolder@406 {
-    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
-}
-
-ResolutionTaskHolder@409 {
-    <name not found> = ArrayList@410[1] { ResolutionCandidate@411 }
-}
-
-ResolutionTaskHolder@412 {
-    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
-}
-
-ResolutionTaskHolder@418 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-ResolutionTaskHolder@419 {
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
-
-TypeDeserializer@420 {
-    classDescriptors('129': Integer@421) = DeserializedClassDescriptor@422['MutableMap']
-    classDescriptors('9': Integer@423) = DeserializedClassDescriptor@424['Any']
-}
-
-TypeDeserializer@425 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@2['KCallable']
-}
-
-TypeDeserializer@428 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@429 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@430 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@432 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@433) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
-}
-
-TypeDeserializer@434 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@4['KMutableProperty']
-}
-
-TypeDeserializer@435 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@431) = DeserializedClassDescriptor@14['KTopLevelProperty']
-}
-
-TypeDeserializer@436 {
-    classDescriptors('3': Integer@426) = DeserializedClassDescriptor@424['Any']
-}
-
-TypeDeserializer@437 {
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@12['KProperty']
-}
-
-TypeDeserializer@438 {
-    classDescriptors('4': Integer@427) = DeserializedClassDescriptor@439['String']
-}
-
-TypeDeserializer@440 {
-    classDescriptors('6': Integer@433) = DeserializedClassDescriptor@20['Unit']
-}
-
-null {
-    <name not found> = ArrayList@441[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@443[1] { ResolutionCandidate@369 }
-    <name not found> = ArrayList@444[1] { ResolutionCandidate@381 }
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@396 }
-    <name not found> = ArrayList@446[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@447[1] { ResolutionCandidate@375 }
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@402 }
-    <name not found> = ArrayList@449[1] { ResolutionCandidate@384 }
-    <name not found> = ArrayList@450[1] { ResolutionCandidate@387 }
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@452[1] { ResolutionCandidate@393 }
-    <name not found> = ArrayList@453[1] { ResolutionCandidate@417 }
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@390 }
-    <name not found> = ArrayList@455[1] { ResolutionCandidate@360 }
-    <name not found> = ArrayList@456[1] { ResolutionCandidate@372 }
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@458[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@459[1] { ResolutionCandidate@408 }
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@414 }
-    <name not found> = ArrayList@461[1] { ResolutionCandidate@411 }
-    <name not found> = ArrayList@462[1] { ResolutionCandidate@399 }
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@378 }
-    <name not found> = ArrayList@464[1] { ResolutionCandidate@366 }
-    <name not found> = ArrayList@465[1] { ResolutionCandidate@357 }
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@405 }
-    <name not found> = ArrayList@467[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@468[1] { ResolutionCandidate@363 }
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@333 }
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-    <name not found> = EmptyList@24[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
deleted file mode 100644
index 2951c05997c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
+++ /dev/null
@@ -1,417 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['ExtensionFunction0']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function0']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['KExtensionFunction0']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['KFunction0']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['KMemberFunction0']
-}
-
-DeserializedClassDescriptor@2['ExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@11['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function0'] {
-    containingDeclaration = LazyJavaPackageFragment@11['kotlin']
-}
-
-DeserializedClassDescriptor@6['KExtensionFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@12['reflect']
-}
-
-DeserializedClassDescriptor@8['KFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@12['reflect']
-}
-
-DeserializedClassDescriptor@10['KMemberFunction0'] {
-    containingDeclaration = LazyJavaPackageFragment@12['reflect']
-}
-
-DeserializedTypeParameterDescriptor@13['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@14
-}
-
-DeserializedTypeParameterDescriptor@15['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@16
-}
-
-DeserializedTypeParameterDescriptor@17['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@18
-}
-
-DeserializedTypeParameterDescriptor@19['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@20
-}
-
-DeserializedTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@22
-}
-
-DeserializedType@23['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-}
-
-DeserializedType@25['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-}
-
-DeserializedType@26['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@28['kotlin.ExtensionFunction0'] {
-    constructor = DeserializedClassTypeConstructor@27
-}
-
-DeserializedType@29['kotlin.Function0'] {
-    constructor = DeserializedClassTypeConstructor@30
-}
-
-LazyJavaPackageFragmentProvider@31 {
-    packageFragments('<root>': FqName@32) = LazyJavaPackageFragment@33['<root>']
-    packageFragments('A': FqName@34) = null
-    packageFragments('java': FqName@35) = LazyJavaPackageFragment@36['java']
-    packageFragments('java.lang': FqName@37) = LazyJavaPackageFragment@38['lang']
-    packageFragments('java.lang.A': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = LazyJavaPackageFragment@11['kotlin']
-    packageFragments('kotlin.A': FqName@41) = null
-    packageFragments('kotlin.io': FqName@42) = LazyJavaPackageFragment@43['io']
-    packageFragments('kotlin.io.A': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = LazyJavaPackageFragment@46['jvm']
-    packageFragments('kotlin.jvm.A': FqName@47) = null
-    packageFragments('kotlin.reflect': FqName@48) = LazyJavaPackageFragment@12['reflect']
-}
-
-LazyJavaPackageFragment@33['<root>'] {
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
-}
-
-LazyJavaPackageFragment@43['io'] {
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-    membersProtos = LinkedHashMap@59 // through DeserializedPackageMemberScope@57
-    properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-    properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@36['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
-}
-
-LazyJavaPackageFragment@46['jvm'] {
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-LazyJavaPackageFragment@11['kotlin'] {
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('ExtensionFunction0': Name@68) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@69) = DeserializedClassDescriptor@4['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@73) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@74) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@72
-    properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-}
-
-LazyJavaPackageFragment@38['lang'] {
-    classes('A': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('bar': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('A': Name@49) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('bar': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@12['reflect'] {
-    classes('KExtensionFunction0': Name@79) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KFunction0': Name@81) = DeserializedClassDescriptor@8['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@10['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@86 {
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@89 {
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@92 {
-    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-}
-
-ResolutionTaskHolder@98 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@99 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@101 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@102 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@104 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@105 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@106 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-ResolutionTaskHolder@107 {
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
-
-TypeDeserializer@108 {
-    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
-}
-
-TypeDeserializer@111 {
-    classDescriptors('2': Integer@109) = DeserializedClassDescriptor@110['Any']
-}
-
-TypeDeserializer@112 {
-    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@114 {
-    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@2['ExtensionFunction0']
-}
-
-TypeDeserializer@115 {
-    classDescriptors('4': Integer@113) = DeserializedClassDescriptor@4['Function0']
-}
-
-null {
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@88 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@91 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@94 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@120[1] { ResolutionCandidate@85 }
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-    <name not found> = EmptyList@54[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
deleted file mode 100644
index f24104e75b0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
+++ /dev/null
@@ -1,472 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Delegates']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['PropertyMetadata']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['ReadWriteProperty']
-}
-
-DescriptorResolver@9 {
-    <name not found> = NullValue@10
-}
-
-DeserializedClassDescriptor@11['<class-object-for-Delegates>'] {
-    functions('notNull': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['notNull'] } // through DeserializedClassMemberScope@15
-    membersProtos = LinkedHashMap@16 // through DeserializedClassMemberScope@15
-    properties('notNull': Name@12) = EmptyList@17[empty] // through DeserializedClassMemberScope@15
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@18
-}
-
-DeserializedClassDescriptor@2['Delegates'] {
-    classObjectDescriptor = DeserializedClassDescriptor@11['<class-object-for-Delegates>']
-    containingDeclaration = LazyJavaPackageFragment@19['properties']
-    defaultType = JetTypeImpl@20['Delegates']
-    functions('notNull': Name@12) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['notNull'] } // through DeserializedClassMemberScope@23
-    membersProtos = LinkedHashMap@24 // through DeserializedClassMemberScope@23
-    properties('notNull': Name@12) = EmptyList@17[empty] // through DeserializedClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@26
-}
-
-DeserializedClassDescriptor@4['PropertyMetadata'] {
-    containingDeclaration = LazyJavaPackageFragment@27['kotlin']
-}
-
-DeserializedClassDescriptor@6['PropertyMetadataImpl'] {
-    classObjectDescriptor = null
-    containingDeclaration = LazyJavaPackageFragment@27['kotlin']
-    primaryConstructor = ConstructorDescriptorImpl@28['<init>']
-}
-
-DeserializedClassDescriptor@8['ReadWriteProperty'] {
-    containingDeclaration = LazyJavaPackageFragment@19['properties']
-    defaultType = JetTypeImpl@29['ReadWriteProperty<2>']
-    functions('get': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@32['get'] } // through DeserializedClassMemberScope@33
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedClassMemberScope@33
-    membersProtos = LinkedHashMap@35 // through DeserializedClassMemberScope@33
-    properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedClassMemberScope@33
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-}
-
-DeserializedTypeParameterDescriptor@37['R'] {
-    defaultType = JetTypeImpl@38['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
-    upperBounds = LinkedHashSet@40[1] { DeserializedType@41['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@41['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@42['T'] {
-    defaultType = JetTypeImpl@43['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@44
-    upperBounds = LinkedHashSet@45[1] { DeserializedType@46['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@47['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@49[1] { DeserializedType@50['kotlin.Any'] }
-}
-
-DeserializedType@51['R in kotlin.properties.ReadWriteProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@52['T in kotlin.properties.Delegates'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
-}
-
-DeserializedType@53['T in kotlin.properties.ReadWriteProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@44
-}
-
-DeserializedType@41['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@56['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@57['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@58['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@54
-    memberScope = DeserializedClassMemberScope@55
-}
-
-DeserializedType@59['kotlin.PropertyMetadata'] {
-    constructor = DeserializedClassTypeConstructor@60
-    memberScope = DeserializedClassMemberScope@61
-}
-
-DeserializedType@62['kotlin.PropertyMetadata'] {
-    constructor = DeserializedClassTypeConstructor@60
-}
-
-DeserializedType@63['kotlin.PropertyMetadataImpl'] {
-    constructor = DeserializedClassTypeConstructor@64
-}
-
-DeserializedType@65['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@66
-}
-
-DeserializedType@67['kotlin.properties.Delegates'] {
-    constructor = DeserializedClassTypeConstructor@68
-    memberScope = DeserializedClassMemberScope@23
-}
-
-DeserializedType@69['kotlin.properties.ReadWriteProperty'] {
-    constructor = DeserializedClassTypeConstructor@70
-    memberScope = SubstitutingScope@71
-}
-
-EnumEntryClassDescriptors@72 {
-    findEnumEntry('get': Name@30) = null
-    findEnumEntry('propertyDelegated': Name@34) = null
-}
-
-EnumEntryClassDescriptors@73 {
-    findEnumEntry('notNull': Name@12) = null
-}
-
-EnumEntryClassDescriptors@74 {
-    findEnumEntry('notNull': Name@12) = null
-}
-
-LazyJavaPackageFragmentProvider@75 {
-    packageFragments('<root>': FqName@76) = LazyJavaPackageFragment@77['<root>']
-    packageFragments('Any': FqName@78) = null
-    packageFragments('C': FqName@79) = null
-    packageFragments('Delegates': FqName@80) = null
-    packageFragments('ReadWriteProperty': FqName@81) = null
-    packageFragments('String': FqName@82) = null
-    packageFragments('java': FqName@83) = LazyJavaPackageFragment@84['java']
-    packageFragments('java.lang': FqName@85) = LazyJavaPackageFragment@86['lang']
-    packageFragments('java.lang.Any': FqName@87) = null
-    packageFragments('java.lang.Delegates': FqName@88) = null
-    packageFragments('java.lang.ReadWriteProperty': FqName@89) = null
-    packageFragments('java.lang.String': FqName@90) = null
-    packageFragments('kotlin': FqName@91) = LazyJavaPackageFragment@27['kotlin']
-    packageFragments('kotlin.Any': FqName@92) = null
-    packageFragments('kotlin.Delegates': FqName@93) = null
-    packageFragments('kotlin.ReadWriteProperty': FqName@94) = null
-    packageFragments('kotlin.String': FqName@95) = null
-    packageFragments('kotlin.io': FqName@96) = LazyJavaPackageFragment@97['io']
-    packageFragments('kotlin.io.Any': FqName@98) = null
-    packageFragments('kotlin.io.Delegates': FqName@99) = null
-    packageFragments('kotlin.io.ReadWriteProperty': FqName@100) = null
-    packageFragments('kotlin.io.String': FqName@101) = null
-    packageFragments('kotlin.jvm': FqName@102) = LazyJavaPackageFragment@103['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@104) = null
-    packageFragments('kotlin.jvm.Delegates': FqName@105) = null
-    packageFragments('kotlin.jvm.ReadWriteProperty': FqName@106) = null
-    packageFragments('kotlin.jvm.String': FqName@107) = null
-    packageFragments('kotlin.properties': FqName@108) = LazyJavaPackageFragment@19['properties']
-    packageFragments('kotlin.properties.Delegates': FqName@109) = null
-    packageFragments('kotlin.properties.ReadWriteProperty': FqName@110) = null
-}
-
-LazyJavaPackageFragment@77['<root>'] {
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Delegates': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('ReadWriteProperty': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('kotlin': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('kotlin': Name@119) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@112
-}
-
-LazyJavaPackageFragment@97['io'] {
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@122 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@122
-    properties('Delegates': Name@125) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    properties('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-}
-
-LazyJavaPackageFragment@84['java'] {
-    classes('lang': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('lang': Name@128) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@127
-}
-
-LazyJavaPackageFragment@103['jvm'] {
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
-}
-
-LazyJavaPackageFragment@27['kotlin'] {
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('PropertyMetadata': Name@133) = DeserializedClassDescriptor@4['PropertyMetadata'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('PropertyMetadataImpl': Name@114) = DeserializedClassDescriptor@6['PropertyMetadataImpl'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('io': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('jvm': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('properties': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = DeserializedPackageMemberScope@137 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('io': Name@138) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('io': Name@138) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('jvm': Name@139) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('jvm': Name@139) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('properties': Name@140) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('properties': Name@140) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@132
-    membersProtos = LinkedHashMap@142 // through DeserializedPackageMemberScope@137
-    properties('Delegates': Name@125) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('io': Name@138) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('jvm': Name@139) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('properties': Name@140) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-}
-
-LazyJavaPackageFragment@86['lang'] {
-    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@143
-}
-
-LazyJavaPackageFragment@19['properties'] {
-    classes('Delegates': Name@145) = DeserializedClassDescriptor@2['Delegates'] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('ReadWriteProperty': Name@147) = DeserializedClassDescriptor@8['ReadWriteProperty'] // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = DeserializedPackageMemberScope@148 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('Delegates': Name@149) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
-    functions('Delegates': Name@149) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
-    functions('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@146
-    membersProtos = LinkedHashMap@152 // through DeserializedPackageMemberScope@148
-    properties('Delegates': Name@149) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
-    properties('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
-}
-
-NestedClassDescriptors@153 {
-    findNestedClass('get': Name@30) = null
-    findNestedClass('propertyDelegated': Name@34) = null
-}
-
-NestedClassDescriptors@154 {
-    findNestedClass('notNull': Name@12) = null
-}
-
-NestedClassDescriptors@155 {
-    findNestedClass('notNull': Name@12) = null
-}
-
-ResolutionTaskHolder@156 {
-    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@159 {
-    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@162 {
-    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@165 {
-    <name not found> = ArrayList@166[1] { ResolutionCandidate@167 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@168 {
-    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-ResolutionTaskHolder@171 {
-    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
-}
-
-ResolutionTaskHolder@174 {
-    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
-}
-
-ResolutionTaskHolder@177 {
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
-
-TypeDeserializer@178 {
-    classDescriptors('1': Integer@179) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
-    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@181['String']
-}
-
-TypeDeserializer@182 {
-    classDescriptors('18': Integer@183) = DeserializedClassDescriptor@8['ReadWriteProperty']
-    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
-}
-
-TypeDeserializer@185 {
-    classDescriptors('2': Integer@186) = DeserializedClassDescriptor@2['Delegates']
-}
-
-TypeDeserializer@187 {
-    classDescriptors('2': Integer@186) = DeserializedClassDescriptor@4['PropertyMetadata']
-}
-
-TypeDeserializer@188 {
-    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
-}
-
-TypeDeserializer@189 {
-    classDescriptors('3': Integer@180) = DeserializedClassDescriptor@184['Any']
-}
-
-TypeDeserializer@190 {
-    classDescriptors('4': Integer@191) = DeserializedClassDescriptor@4['PropertyMetadata']
-}
-
-null {
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@167 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@170 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@158 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@173 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@161 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@176 }
-    <name not found> = ArrayList@198[1] { ResolutionCandidate@164 }
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-    <name not found> = EmptyList@17[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
deleted file mode 100644
index 481a2851bdf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformName']
-}
-
-DeserializedClassDescriptor@2['platformName'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-DeserializedType@5['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@6
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('Any': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.platformName': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = LazyJavaPackageFragment@23['kotlin']
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    packageFragments('kotlin.io.Any': FqName@27) = null
-    packageFragments('kotlin.io.platformName': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@31) = null
-    packageFragments('kotlin.jvm.platformName': FqName@32) = null
-    packageFragments('kotlin.platform': FqName@33) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.Any': FqName@34) = null
-    packageFragments('kotlin.platform.platformName': FqName@35) = null
-    packageFragments('kotlin.platformName': FqName@36) = null
-    packageFragments('platformName': FqName@37) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('platformName': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@26['io'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@30['jvm'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@23['kotlin'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('platform': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('io': Name@58) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@58) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('jvm': Name@59) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@59) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('platform': Name@60) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('platform': Name@60) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
-    properties('io': Name@58) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@59) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    properties('platform': Name@60) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('platformName': Name@41) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-TypeDeserializer@67 {
-    classDescriptors('4': Integer@68) = DeserializedClassDescriptor@69['String']
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
deleted file mode 100644
index 481a2851bdf..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformName']
-}
-
-DeserializedClassDescriptor@2['platformName'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-DeserializedType@5['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@6
-}
-
-LazyAnnotationDescriptor@7 {
-    resolutionResults = OverloadResolutionResultsImpl@8
-    type = JetTypeImpl@9['platformName']
-    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@11
-}
-
-LazyJavaPackageFragmentProvider@12 {
-    packageFragments('<root>': FqName@13) = LazyJavaPackageFragment@14['<root>']
-    packageFragments('Any': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Any': FqName@20) = null
-    packageFragments('java.lang.platformName': FqName@21) = null
-    packageFragments('kotlin': FqName@22) = LazyJavaPackageFragment@23['kotlin']
-    packageFragments('kotlin.Any': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    packageFragments('kotlin.io.Any': FqName@27) = null
-    packageFragments('kotlin.io.platformName': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@31) = null
-    packageFragments('kotlin.jvm.platformName': FqName@32) = null
-    packageFragments('kotlin.platform': FqName@33) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.Any': FqName@34) = null
-    packageFragments('kotlin.platform.platformName': FqName@35) = null
-    packageFragments('kotlin.platformName': FqName@36) = null
-    packageFragments('platformName': FqName@37) = null
-}
-
-LazyJavaPackageFragment@14['<root>'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('platformName': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@39
-}
-
-LazyJavaPackageFragment@26['io'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
-}
-
-LazyJavaPackageFragment@30['jvm'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@23['kotlin'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('platform': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('io': Name@58) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@58) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('jvm': Name@59) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@59) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('platform': Name@60) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    functions('platform': Name@60) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@52
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
-    properties('io': Name@58) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@59) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-    properties('platform': Name@60) = EmptyList@44[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('Any': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('platformName': Name@41) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-}
-
-TypeDeserializer@67 {
-    classDescriptors('4': Integer@68) = DeserializedClassDescriptor@69['String']
-}
-
-null {
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@66 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
deleted file mode 100644
index 2fd74bee391..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
+++ /dev/null
@@ -1,88 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformStatic']
-}
-
-DeserializedClassDescriptor@2['platformStatic'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['platformStatic']
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Base': FqName@11) = null
-    packageFragments('Derived': FqName@12) = null
-    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    packageFragments('java.lang.Base': FqName@17) = null
-    packageFragments('java.lang.platformStatic': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = LazyJavaPackageFragment@20['kotlin']
-    packageFragments('kotlin.Base': FqName@21) = null
-    packageFragments('kotlin.io': FqName@22) = LazyJavaPackageFragment@23['io']
-    packageFragments('kotlin.io.Base': FqName@24) = null
-    packageFragments('kotlin.io.platformStatic': FqName@25) = null
-    packageFragments('kotlin.jvm': FqName@26) = LazyJavaPackageFragment@27['jvm']
-    packageFragments('kotlin.jvm.Base': FqName@28) = null
-    packageFragments('kotlin.jvm.platformStatic': FqName@29) = null
-    packageFragments('kotlin.platform': FqName@30) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.platformStatic': FqName@31) = null
-    packageFragments('kotlin.platformStatic': FqName@32) = null
-    packageFragments('platformStatic': FqName@33) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('kotlin': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('platformStatic': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('kotlin': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@35
-}
-
-LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@20['kotlin'] {
-    classes('io': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('jvm': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('platform': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('io': Name@50) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-    functions('io': Name@50) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('jvm': Name@51) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-    functions('jvm': Name@51) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('platform': Name@52) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-    functions('platform': Name@52) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
-    membersProtos = LinkedHashMap@54 // through DeserializedPackageMemberScope@49
-    properties('io': Name@50) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-    properties('jvm': Name@51) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-    properties('platform': Name@52) = EmptyList@39[empty] // through DeserializedPackageMemberScope@49
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('platformStatic': Name@55) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('platformStatic': Name@57) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
-}
-
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-}
-
-ResolutionTaskHolder@62 {
-    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
-}
-
-null {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@64 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
deleted file mode 100644
index 025a89e9aca..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
+++ /dev/null
@@ -1,103 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['platformStatic']
-}
-
-DeserializedClassDescriptor@2['platformStatic'] {
-    containingDeclaration = LazyJavaPackageFragment@3['platform']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['platformStatic']
-}
-
-LazyJavaPackageFragmentProvider@8 {
-    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    packageFragments('Base': FqName@11) = null
-    packageFragments('Derived': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('java': FqName@14) = LazyJavaPackageFragment@15['java']
-    packageFragments('java.lang': FqName@16) = LazyJavaPackageFragment@17['lang']
-    packageFragments('java.lang.Base': FqName@18) = null
-    packageFragments('java.lang.Int': FqName@19) = null
-    packageFragments('java.lang.platformStatic': FqName@20) = null
-    packageFragments('kotlin': FqName@21) = LazyJavaPackageFragment@22['kotlin']
-    packageFragments('kotlin.Base': FqName@23) = null
-    packageFragments('kotlin.Int': FqName@24) = null
-    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    packageFragments('kotlin.io.Base': FqName@27) = null
-    packageFragments('kotlin.io.Int': FqName@28) = null
-    packageFragments('kotlin.io.platformStatic': FqName@29) = null
-    packageFragments('kotlin.jvm': FqName@30) = LazyJavaPackageFragment@31['jvm']
-    packageFragments('kotlin.jvm.Base': FqName@32) = null
-    packageFragments('kotlin.jvm.Int': FqName@33) = null
-    packageFragments('kotlin.jvm.platformStatic': FqName@34) = null
-    packageFragments('kotlin.platform': FqName@35) = LazyJavaPackageFragment@3['platform']
-    packageFragments('kotlin.platform.platformStatic': FqName@36) = null
-    packageFragments('kotlin.platformStatic': FqName@37) = null
-    packageFragments('platformStatic': FqName@38) = null
-}
-
-LazyJavaPackageFragment@10['<root>'] {
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('kotlin': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('platformStatic': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@40
-}
-
-LazyJavaPackageFragment@26['io'] {
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-}
-
-LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
-}
-
-LazyJavaPackageFragment@31['jvm'] {
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@52
-}
-
-LazyJavaPackageFragment@22['kotlin'] {
-    classes('Int': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('platform': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('io': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('jvm': Name@59) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    functions('platform': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@57
-    properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-    properties('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
-}
-
-LazyJavaPackageFragment@3['platform'] {
-    classes('platformStatic': Name@63) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('platformStatic': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-null {
-    <name not found> = ArrayList@73[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@72 }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
deleted file mode 100644
index 0e212297cc1..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
+++ /dev/null
@@ -1,18236 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function1']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['Function2']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Pair']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['data']
-}
-
-DescriptorResolver@9 {
-    <name not found> = JetTypeImpl@10['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@11['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@12['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@13['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@14['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@15['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@16['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@17['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@18['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@19['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@20['Pair<2>']
-    <name not found> = JetTypeImpl@21['Pair<2>']
-}
-
-DeserializedClassDescriptor@2['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
-}
-
-DeserializedClassDescriptor@4['Function2'] {
-    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
-}
-
-DeserializedClassDescriptor@6['Pair'] {
-    classObjectDescriptor = null
-    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
-    defaultType = JetTypeImpl@23['Pair<2>']
-    primaryConstructor = ConstructorDescriptorImpl@24['<init>']
-}
-
-DeserializedClassDescriptor@8['data'] {
-    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
-    primaryConstructor = ConstructorDescriptorImpl@25['<init>']
-}
-
-DeserializedTypeParameterDescriptor@26['A'] {
-    defaultType = JetTypeImpl@27['A']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
-    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@31['A'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@34['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@35['B'] {
-    defaultType = JetTypeImpl@36['B']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@37
-    upperBounds = LinkedHashSet@38[1] { DeserializedType@39['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@40['B'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
-    upperBounds = LinkedHashSet@42[1] { DeserializedType@43['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@44['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
-    upperBounds = LinkedHashSet@46[1] { DeserializedType@47['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@48['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
-    upperBounds = LinkedHashSet@50[1] { DeserializedType@51['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@51['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@52['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@54[1] { DeserializedType@55['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@55['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@56['P2'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
-    upperBounds = LinkedHashSet@58[1] { DeserializedType@59['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@59['kotlin.Any']
-}
-
-DeserializedTypeParameterDescriptor@60['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
-    upperBounds = LinkedHashSet@62[1] { DeserializedType@63['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@64['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-    upperBounds = LinkedHashSet@66[1] { DeserializedType@67['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@68['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-    upperBounds = LinkedHashSet@70[1] { DeserializedType@71['kotlin.Any'] }
-}
-
-DeserializedType@72['A in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@32
-}
-
-DeserializedType@73['A in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@32
-}
-
-DeserializedType@74['A in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@28
-}
-
-DeserializedType@75['A in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@28
-}
-
-DeserializedType@76['B in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@77['B in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@41
-}
-
-DeserializedType@78['B in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@37
-}
-
-DeserializedType@79['B in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@37
-}
-
-DeserializedType@80['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@45
-}
-
-DeserializedType@81['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@45
-}
-
-DeserializedType@82['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@45
-}
-
-DeserializedType@83['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-DeserializedType@84['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-DeserializedType@85['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
-}
-
-DeserializedType@86['java.io.Serializable'] {
-    constructor = LazyJavaClassTypeConstructor@87['Serializable']
-}
-
-DeserializedType@88['java.util.HashMap'] {
-    constructor = LazyJavaClassTypeConstructor@89['HashMap']
-    memberScope = SubstitutingScope@90
-}
-
-DeserializedType@39['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@63['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@47['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@93['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@59['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@43['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@94['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@51['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@55['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@91
-    memberScope = DeserializedClassMemberScope@92
-}
-
-DeserializedType@95['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@96
-    memberScope = SubstitutingScope@97
-}
-
-DeserializedType@98['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@99
-    memberScope = SubstitutingScope@100
-}
-
-DeserializedType@101['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@99
-    memberScope = SubstitutingScope@102
-}
-
-DeserializedType@103['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@99
-    memberScope = SubstitutingScope@104
-}
-
-DeserializedType@105['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@99
-    memberScope = SubstitutingScope@106
-}
-
-LazyAnnotationDescriptor@107 {
-    resolutionResults = OverloadResolutionResultsImpl@108
-    type = JetTypeImpl@109['data']
-}
-
-LazyAnnotationDescriptor@110 {
-    resolutionResults = OverloadResolutionResultsImpl@111
-    type = JetTypeImpl@112['data']
-}
-
-LazyJavaClassDescriptor@113['HashMap'] {
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@89['HashMap']
-}
-
-LazyJavaClassDescriptor@114['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@87['Serializable']
-}
-
-LazyJavaClassTypeConstructor@89['HashMap'] {
-    parameters = ArrayList@115[2] { LazyJavaTypeParameterDescriptor@116['K'], LazyJavaTypeParameterDescriptor@117['V'] }
-}
-
-LazyJavaClassTypeConstructor@87['Serializable'] {
-    parameters = ArrayList@118[empty]
-    supertypes = ArrayList@119[1] { JetTypeImpl@120['Any'] }
-}
-
-LazyJavaClassifierType@121['Object'] {
-    classifier = JavaClassImpl@122['Object']
-    typeConstructor = DeserializedClassTypeConstructor@91
-}
-
-LazyJavaPackageFragmentProvider@123 {
-    packageFragments('<root>': FqName@124) = LazyJavaPackageFragment@125['<root>']
-    packageFragments('A': FqName@126) = null
-    packageFragments('ANY': FqName@127) = null
-    packageFragments('Any': FqName@128) = null
-    packageFragments('B': FqName@129) = null
-    packageFragments('BOOLEAN': FqName@130) = null
-    packageFragments('BYTE': FqName@131) = null
-    packageFragments('BigInteger': FqName@132) = null
-    packageFragments('BinaryOperationKey': FqName@133) = null
-    packageFragments('Boolean': FqName@134) = null
-    packageFragments('Byte': FqName@135) = null
-    packageFragments('CHAR': FqName@136) = null
-    packageFragments('Char': FqName@137) = null
-    packageFragments('CompileTimeType': FqName@138) = null
-    packageFragments('DOUBLE': FqName@139) = null
-    packageFragments('Double': FqName@140) = null
-    packageFragments('FLOAT': FqName@141) = null
-    packageFragments('Float': FqName@142) = null
-    packageFragments('Function1': FqName@143) = null
-    packageFragments('Function2': FqName@144) = null
-    packageFragments('HashMap': FqName@145) = null
-    packageFragments('INT': FqName@146) = null
-    packageFragments('Int': FqName@147) = null
-    packageFragments('LONG': FqName@148) = null
-    packageFragments('Long': FqName@149) = null
-    packageFragments('Pair': FqName@150) = null
-    packageFragments('SHORT': FqName@151) = null
-    packageFragments('STRING': FqName@152) = null
-    packageFragments('Short': FqName@153) = null
-    packageFragments('String': FqName@154) = null
-    packageFragments('UnaryOperationKey': FqName@155) = null
-    packageFragments('binaryOperations': FqName@156) = null
-    packageFragments('data': FqName@157) = null
-    packageFragments('emptyBinaryFun': FqName@158) = null
-    packageFragments('emptyUnaryFun': FqName@159) = null
-    packageFragments('java': FqName@160) = LazyJavaPackageFragment@161['java']
-    packageFragments('java.io': FqName@162) = LazyJavaPackageFragment@163['io']
-    packageFragments('java.lang': FqName@164) = LazyJavaPackageFragment@165['lang']
-    packageFragments('java.lang.A': FqName@166) = null
-    packageFragments('java.lang.Any': FqName@167) = null
-    packageFragments('java.lang.B': FqName@168) = null
-    packageFragments('java.lang.BigInteger': FqName@169) = null
-    packageFragments('java.lang.BinaryOperationKey': FqName@170) = null
-    packageFragments('java.lang.Boolean': FqName@171) = null
-    packageFragments('java.lang.Byte': FqName@172) = null
-    packageFragments('java.lang.Char': FqName@173) = null
-    packageFragments('java.lang.CompileTimeType': FqName@174) = null
-    packageFragments('java.lang.Double': FqName@175) = null
-    packageFragments('java.lang.Float': FqName@176) = null
-    packageFragments('java.lang.Function1': FqName@177) = null
-    packageFragments('java.lang.Function2': FqName@178) = null
-    packageFragments('java.lang.HashMap': FqName@179) = null
-    packageFragments('java.lang.Int': FqName@180) = null
-    packageFragments('java.lang.Long': FqName@181) = null
-    packageFragments('java.lang.Pair': FqName@182) = null
-    packageFragments('java.lang.Short': FqName@183) = null
-    packageFragments('java.lang.String': FqName@184) = null
-    packageFragments('java.lang.UnaryOperationKey': FqName@185) = null
-    packageFragments('java.lang.data': FqName@186) = null
-    packageFragments('java.util': FqName@187) = LazyJavaPackageFragment@188['util']
-    packageFragments('java.util.HashMap': FqName@189) = null
-    packageFragments('kotlin': FqName@190) = LazyJavaPackageFragment@22['kotlin']
-    packageFragments('kotlin.A': FqName@191) = null
-    packageFragments('kotlin.Any': FqName@192) = null
-    packageFragments('kotlin.B': FqName@193) = null
-    packageFragments('kotlin.BigInteger': FqName@194) = null
-    packageFragments('kotlin.BinaryOperationKey': FqName@195) = null
-    packageFragments('kotlin.Boolean': FqName@196) = null
-    packageFragments('kotlin.Byte': FqName@197) = null
-    packageFragments('kotlin.Char': FqName@198) = null
-    packageFragments('kotlin.CompileTimeType': FqName@199) = null
-    packageFragments('kotlin.Double': FqName@200) = null
-    packageFragments('kotlin.Float': FqName@201) = null
-    packageFragments('kotlin.Function1': FqName@202) = null
-    packageFragments('kotlin.Function2': FqName@203) = null
-    packageFragments('kotlin.HashMap': FqName@204) = null
-    packageFragments('kotlin.Int': FqName@205) = null
-    packageFragments('kotlin.Long': FqName@206) = null
-    packageFragments('kotlin.Pair': FqName@207) = null
-    packageFragments('kotlin.Short': FqName@208) = null
-    packageFragments('kotlin.String': FqName@209) = null
-    packageFragments('kotlin.UnaryOperationKey': FqName@210) = null
-    packageFragments('kotlin.data': FqName@211) = null
-    packageFragments('kotlin.io': FqName@212) = LazyJavaPackageFragment@213['io']
-    packageFragments('kotlin.io.A': FqName@214) = null
-    packageFragments('kotlin.io.Any': FqName@215) = null
-    packageFragments('kotlin.io.B': FqName@216) = null
-    packageFragments('kotlin.io.BigInteger': FqName@217) = null
-    packageFragments('kotlin.io.BinaryOperationKey': FqName@218) = null
-    packageFragments('kotlin.io.Boolean': FqName@219) = null
-    packageFragments('kotlin.io.Byte': FqName@220) = null
-    packageFragments('kotlin.io.Char': FqName@221) = null
-    packageFragments('kotlin.io.CompileTimeType': FqName@222) = null
-    packageFragments('kotlin.io.Double': FqName@223) = null
-    packageFragments('kotlin.io.Float': FqName@224) = null
-    packageFragments('kotlin.io.Function1': FqName@225) = null
-    packageFragments('kotlin.io.Function2': FqName@226) = null
-    packageFragments('kotlin.io.HashMap': FqName@227) = null
-    packageFragments('kotlin.io.Int': FqName@228) = null
-    packageFragments('kotlin.io.Long': FqName@229) = null
-    packageFragments('kotlin.io.Pair': FqName@230) = null
-    packageFragments('kotlin.io.Short': FqName@231) = null
-    packageFragments('kotlin.io.String': FqName@232) = null
-    packageFragments('kotlin.io.UnaryOperationKey': FqName@233) = null
-    packageFragments('kotlin.io.data': FqName@234) = null
-    packageFragments('kotlin.jvm': FqName@235) = LazyJavaPackageFragment@236['jvm']
-    packageFragments('kotlin.jvm.A': FqName@237) = null
-    packageFragments('kotlin.jvm.Any': FqName@238) = null
-    packageFragments('kotlin.jvm.B': FqName@239) = null
-    packageFragments('kotlin.jvm.BigInteger': FqName@240) = null
-    packageFragments('kotlin.jvm.BinaryOperationKey': FqName@241) = null
-    packageFragments('kotlin.jvm.Boolean': FqName@242) = null
-    packageFragments('kotlin.jvm.Byte': FqName@243) = null
-    packageFragments('kotlin.jvm.Char': FqName@244) = null
-    packageFragments('kotlin.jvm.CompileTimeType': FqName@245) = null
-    packageFragments('kotlin.jvm.Double': FqName@246) = null
-    packageFragments('kotlin.jvm.Float': FqName@247) = null
-    packageFragments('kotlin.jvm.Function1': FqName@248) = null
-    packageFragments('kotlin.jvm.Function2': FqName@249) = null
-    packageFragments('kotlin.jvm.HashMap': FqName@250) = null
-    packageFragments('kotlin.jvm.Int': FqName@251) = null
-    packageFragments('kotlin.jvm.Long': FqName@252) = null
-    packageFragments('kotlin.jvm.Pair': FqName@253) = null
-    packageFragments('kotlin.jvm.Short': FqName@254) = null
-    packageFragments('kotlin.jvm.String': FqName@255) = null
-    packageFragments('kotlin.jvm.UnaryOperationKey': FqName@256) = null
-    packageFragments('kotlin.jvm.data': FqName@257) = null
-    packageFragments('unaryOperations': FqName@258) = null
-    topLevelClasses(JavaClassImpl@259['HashMap']) = LazyJavaClassDescriptor@113['HashMap']
-    topLevelClasses(JavaClassImpl@260['Serializable']) = LazyJavaClassDescriptor@114['Serializable']
-}
-
-LazyJavaPackageFragment@125['<root>'] {
-    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('HashMap': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('java': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('java': Name@301) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    memberIndex = computeMemberIndex$1@302 // through LazyPackageFragmentScopeForJavaPackage@262
-}
-
-LazyJavaPackageFragment@213['io'] {
-    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@303
-    deserializedPackageScope = DeserializedPackageMemberScope@304 // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('to': Name@296) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
-    memberIndex = computeMemberIndex$1@305 // through LazyPackageFragmentScopeForJavaPackage@303
-    membersProtos = LinkedHashMap@306 // through DeserializedPackageMemberScope@304
-    properties('ANY': Name@261) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('BOOLEAN': Name@264) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('BYTE': Name@265) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('CHAR': Name@270) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('DOUBLE': Name@273) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('FLOAT': Name@275) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('INT': Name@280) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('LONG': Name@282) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('SHORT': Name@285) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('STRING': Name@286) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('emptyBinaryFun': Name@292) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('emptyUnaryFun': Name@293) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-    properties('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
-}
-
-LazyJavaPackageFragment@163['io'] {
-    classes('Serializable': Name@307) = LazyJavaClassDescriptor@114['Serializable'] // through LazyPackageFragmentScopeForJavaPackage@308
-}
-
-LazyJavaPackageFragment@161['java'] {
-    classes('lang': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@310
-    classes('util': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@310
-    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@310
-    functions('lang': Name@312) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@310
-    functions('util': Name@313) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@310
-    memberIndex = computeMemberIndex$1@314 // through LazyPackageFragmentScopeForJavaPackage@310
-}
-
-LazyJavaPackageFragment@236['jvm'] {
-    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@315
-    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
-    memberIndex = computeMemberIndex$1@316 // through LazyPackageFragmentScopeForJavaPackage@315
-}
-
-LazyJavaPackageFragment@22['kotlin'] {
-    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Array': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Function1': Name@277) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Function2': Name@278) = DeserializedClassDescriptor@4['Function2'] // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Pair': Name@284) = DeserializedClassDescriptor@6['Pair'] // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('data': Name@291) = DeserializedClassDescriptor@8['data'] // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('io': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('jvm': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@317
-    deserializedPackageScope = DeserializedPackageMemberScope@321 // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('hashMapOf': Name@294) = ArrayList@322[1] { DeserializedSimpleFunctionDescriptor@323['hashMapOf'] } // through DeserializedPackageMemberScope@321
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('io': Name@324) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('io': Name@324) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('jvm': Name@325) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('jvm': Name@325) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('to': Name@296) = ArrayList@326[1] { DeserializedSimpleFunctionDescriptor@327['to'] } // through DeserializedPackageMemberScope@321
-    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
-    memberIndex = computeMemberIndex$1@328 // through LazyPackageFragmentScopeForJavaPackage@317
-    membersProtos = LinkedHashMap@329 // through DeserializedPackageMemberScope@321
-    properties('ANY': Name@261) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('BOOLEAN': Name@264) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('BYTE': Name@265) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('CHAR': Name@270) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('DOUBLE': Name@273) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('FLOAT': Name@275) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('INT': Name@280) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('LONG': Name@282) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('SHORT': Name@285) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('STRING': Name@286) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('emptyBinaryFun': Name@292) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('emptyUnaryFun': Name@293) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('io': Name@324) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('jvm': Name@325) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-    properties('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
-}
-
-LazyJavaPackageFragment@165['lang'] {
-    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('Pair': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@330
-    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
-    memberIndex = computeMemberIndex$1@331 // through LazyPackageFragmentScopeForJavaPackage@330
-}
-
-LazyJavaPackageFragment@188['util'] {
-    classes('HashMap': Name@332) = LazyJavaClassDescriptor@113['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@333
-    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@333
-    functions('HashMap': Name@334) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@333
-    memberIndex = computeMemberIndex$1@335 // through LazyPackageFragmentScopeForJavaPackage@333
-}
-
-LazyJavaTypeParameterDescriptor@116['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@336
-    upperBounds = LinkedHashSet@337[1] { NullableType@338 }
-}
-
-LazyJavaTypeParameterDescriptor@117['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@339
-    upperBounds = LinkedHashSet@340[1] { NullableType@341 }
-}
-
-LazyJavaTypeParameterResolver@342 {
-    resolve(JavaTypeParameterImpl@343['K']) = LazyJavaTypeParameterDescriptor@116['K']
-    resolve(JavaTypeParameterImpl@344['V']) = LazyJavaTypeParameterDescriptor@117['V']
-}
-
-ResolutionTaskHolder@345 {
-    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@348 {
-    <name not found> = ArrayList@349[1] { ResolutionCandidate@350 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@351 {
-    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@354 {
-    <name not found> = ArrayList@355[1] { ResolutionCandidate@356 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@357 {
-    <name not found> = ArrayList@358[1] { ResolutionCandidate@359 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[1] { ResolutionCandidate@362 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@363 {
-    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@366 {
-    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@369 {
-    <name not found> = ArrayList@370[1] { ResolutionCandidate@371 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@372 {
-    <name not found> = ArrayList@373[1] { ResolutionCandidate@374 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[1] { ResolutionCandidate@377 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@378 {
-    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@381 {
-    <name not found> = ArrayList@382[1] { ResolutionCandidate@383 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@384 {
-    <name not found> = ArrayList@385[1] { ResolutionCandidate@386 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@387 {
-    <name not found> = ArrayList@388[1] { ResolutionCandidate@389 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@393 {
-    <name not found> = ArrayList@394[1] { ResolutionCandidate@395 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@396 {
-    <name not found> = ArrayList@397[1] { ResolutionCandidate@398 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@399 {
-    <name not found> = ArrayList@400[1] { ResolutionCandidate@401 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@402 {
-    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[1] { ResolutionCandidate@407 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@408 {
-    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@411 {
-    <name not found> = ArrayList@412[1] { ResolutionCandidate@413 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@414 {
-    <name not found> = ArrayList@415[1] { ResolutionCandidate@416 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@417 {
-    <name not found> = ArrayList@418[1] { ResolutionCandidate@419 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[1] { ResolutionCandidate@422 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@423 {
-    <name not found> = ArrayList@424[1] { ResolutionCandidate@425 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@426 {
-    <name not found> = ArrayList@427[1] { ResolutionCandidate@428 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@429 {
-    <name not found> = ArrayList@430[1] { ResolutionCandidate@431 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@432 {
-    <name not found> = ArrayList@433[1] { ResolutionCandidate@434 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[1] { ResolutionCandidate@437 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@438 {
-    <name not found> = ArrayList@439[1] { ResolutionCandidate@440 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@441 {
-    <name not found> = ArrayList@442[1] { ResolutionCandidate@443 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@444 {
-    <name not found> = ArrayList@445[1] { ResolutionCandidate@446 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@447 {
-    <name not found> = ArrayList@448[1] { ResolutionCandidate@449 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@450 {
-    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@453 {
-    <name not found> = ArrayList@454[1] { ResolutionCandidate@455 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@456 {
-    <name not found> = ArrayList@457[1] { ResolutionCandidate@458 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@459 {
-    <name not found> = ArrayList@460[1] { ResolutionCandidate@461 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@462 {
-    <name not found> = ArrayList@463[1] { ResolutionCandidate@464 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@465 {
-    <name not found> = ArrayList@466[1] { ResolutionCandidate@467 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@468 {
-    <name not found> = ArrayList@469[1] { ResolutionCandidate@470 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@471 {
-    <name not found> = ArrayList@472[1] { ResolutionCandidate@473 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@474 {
-    <name not found> = ArrayList@475[1] { ResolutionCandidate@476 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@477 {
-    <name not found> = ArrayList@478[1] { ResolutionCandidate@479 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@480 {
-    <name not found> = ArrayList@481[1] { ResolutionCandidate@482 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@483 {
-    <name not found> = ArrayList@484[1] { ResolutionCandidate@485 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@486 {
-    <name not found> = ArrayList@487[1] { ResolutionCandidate@488 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@489 {
-    <name not found> = ArrayList@490[1] { ResolutionCandidate@491 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@492 {
-    <name not found> = ArrayList@493[1] { ResolutionCandidate@494 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@495 {
-    <name not found> = ArrayList@496[1] { ResolutionCandidate@497 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@498 {
-    <name not found> = ArrayList@499[1] { ResolutionCandidate@500 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@501 {
-    <name not found> = ArrayList@502[1] { ResolutionCandidate@503 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@504 {
-    <name not found> = ArrayList@505[1] { ResolutionCandidate@506 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@507 {
-    <name not found> = ArrayList@508[1] { ResolutionCandidate@509 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@510 {
-    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@513 {
-    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@516 {
-    <name not found> = ArrayList@517[1] { ResolutionCandidate@518 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@519 {
-    <name not found> = ArrayList@520[1] { ResolutionCandidate@521 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@522 {
-    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@525 {
-    <name not found> = ArrayList@526[1] { ResolutionCandidate@527 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@528 {
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@530 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@531 {
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@533 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@534 {
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@537 {
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@539 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@540 {
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@542 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@543 {
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@545 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@546 {
-    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@549 {
-    <name not found> = ArrayList@550[1] { ResolutionCandidate@551 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@552 {
-    <name not found> = ArrayList@553[1] { ResolutionCandidate@554 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@555 {
-    <name not found> = ArrayList@556[1] { ResolutionCandidate@557 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@558 {
-    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@561 {
-    <name not found> = ArrayList@562[1] { ResolutionCandidate@563 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@564 {
-    <name not found> = ArrayList@565[1] { ResolutionCandidate@566 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@567 {
-    <name not found> = ArrayList@568[1] { ResolutionCandidate@569 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@570 {
-    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@573 {
-    <name not found> = ArrayList@574[1] { ResolutionCandidate@575 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@576 {
-    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@579 {
-    <name not found> = ArrayList@580[1] { ResolutionCandidate@581 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@582 {
-    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@585 {
-    <name not found> = ArrayList@586[1] { ResolutionCandidate@587 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@588 {
-    <name not found> = ArrayList@589[1] { ResolutionCandidate@590 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@591 {
-    <name not found> = ArrayList@592[1] { ResolutionCandidate@593 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@594 {
-    <name not found> = ArrayList@595[1] { ResolutionCandidate@596 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@597 {
-    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@600 {
-    <name not found> = ArrayList@601[1] { ResolutionCandidate@602 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@603 {
-    <name not found> = ArrayList@604[1] { ResolutionCandidate@605 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@606 {
-    <name not found> = ArrayList@607[1] { ResolutionCandidate@608 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@609 {
-    <name not found> = ArrayList@610[1] { ResolutionCandidate@611 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@612 {
-    <name not found> = ArrayList@613[1] { ResolutionCandidate@614 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@615 {
-    <name not found> = ArrayList@616[1] { ResolutionCandidate@617 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@618 {
-    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@621 {
-    <name not found> = ArrayList@622[1] { ResolutionCandidate@623 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@624 {
-    <name not found> = ArrayList@625[1] { ResolutionCandidate@626 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@627 {
-    <name not found> = ArrayList@628[1] { ResolutionCandidate@629 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@630 {
-    <name not found> = ArrayList@631[1] { ResolutionCandidate@632 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@633 {
-    <name not found> = ArrayList@634[1] { ResolutionCandidate@635 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@636 {
-    <name not found> = ArrayList@637[1] { ResolutionCandidate@638 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@639 {
-    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@642 {
-    <name not found> = ArrayList@643[1] { ResolutionCandidate@644 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@645 {
-    <name not found> = ArrayList@646[1] { ResolutionCandidate@647 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@648 {
-    <name not found> = ArrayList@649[1] { ResolutionCandidate@650 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@651 {
-    <name not found> = ArrayList@652[1] { ResolutionCandidate@653 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@654 {
-    <name not found> = ArrayList@655[1] { ResolutionCandidate@656 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@657 {
-    <name not found> = ArrayList@658[1] { ResolutionCandidate@659 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@660 {
-    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@663 {
-    <name not found> = ArrayList@664[1] { ResolutionCandidate@665 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@666 {
-    <name not found> = ArrayList@667[1] { ResolutionCandidate@668 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@669 {
-    <name not found> = ArrayList@670[1] { ResolutionCandidate@671 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@672 {
-    <name not found> = ArrayList@673[1] { ResolutionCandidate@674 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@675 {
-    <name not found> = ArrayList@676[1] { ResolutionCandidate@677 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@678 {
-    <name not found> = ArrayList@679[1] { ResolutionCandidate@680 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@681 {
-    <name not found> = ArrayList@682[1] { ResolutionCandidate@683 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@684 {
-    <name not found> = ArrayList@685[1] { ResolutionCandidate@686 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@687 {
-    <name not found> = ArrayList@688[1] { ResolutionCandidate@689 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@690 {
-    <name not found> = ArrayList@691[1] { ResolutionCandidate@692 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@693 {
-    <name not found> = ArrayList@694[1] { ResolutionCandidate@695 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@696 {
-    <name not found> = ArrayList@697[1] { ResolutionCandidate@698 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@699 {
-    <name not found> = ArrayList@700[1] { ResolutionCandidate@701 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@702 {
-    <name not found> = ArrayList@703[1] { ResolutionCandidate@704 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@705 {
-    <name not found> = ArrayList@706[1] { ResolutionCandidate@707 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@708 {
-    <name not found> = ArrayList@709[1] { ResolutionCandidate@710 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@711 {
-    <name not found> = ArrayList@712[1] { ResolutionCandidate@713 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@714 {
-    <name not found> = ArrayList@715[1] { ResolutionCandidate@716 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@717 {
-    <name not found> = ArrayList@718[1] { ResolutionCandidate@719 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@720 {
-    <name not found> = ArrayList@721[1] { ResolutionCandidate@722 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@723 {
-    <name not found> = ArrayList@724[1] { ResolutionCandidate@725 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@726 {
-    <name not found> = ArrayList@727[1] { ResolutionCandidate@728 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@729 {
-    <name not found> = ArrayList@730[1] { ResolutionCandidate@731 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@732 {
-    <name not found> = ArrayList@733[1] { ResolutionCandidate@734 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@735 {
-    <name not found> = ArrayList@736[1] { ResolutionCandidate@737 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@738 {
-    <name not found> = ArrayList@739[1] { ResolutionCandidate@740 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@741 {
-    <name not found> = ArrayList@742[1] { ResolutionCandidate@743 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@744 {
-    <name not found> = ArrayList@745[1] { ResolutionCandidate@746 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@747 {
-    <name not found> = ArrayList@748[1] { ResolutionCandidate@749 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@750 {
-    <name not found> = ArrayList@751[1] { ResolutionCandidate@752 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@753 {
-    <name not found> = ArrayList@754[1] { ResolutionCandidate@755 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@756 {
-    <name not found> = ArrayList@757[1] { ResolutionCandidate@758 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@759 {
-    <name not found> = ArrayList@760[1] { ResolutionCandidate@761 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@762 {
-    <name not found> = ArrayList@763[1] { ResolutionCandidate@764 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@765 {
-    <name not found> = ArrayList@766[1] { ResolutionCandidate@767 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@768 {
-    <name not found> = ArrayList@769[1] { ResolutionCandidate@770 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@771 {
-    <name not found> = ArrayList@772[1] { ResolutionCandidate@773 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@774 {
-    <name not found> = ArrayList@775[1] { ResolutionCandidate@776 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@777 {
-    <name not found> = ArrayList@778[1] { ResolutionCandidate@779 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@780 {
-    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@783 {
-    <name not found> = ArrayList@784[1] { ResolutionCandidate@785 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@786 {
-    <name not found> = ArrayList@787[1] { ResolutionCandidate@788 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@789 {
-    <name not found> = ArrayList@790[1] { ResolutionCandidate@791 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@792 {
-    <name not found> = ArrayList@793[1] { ResolutionCandidate@794 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@795 {
-    <name not found> = ArrayList@796[1] { ResolutionCandidate@797 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@798 {
-    <name not found> = ArrayList@799[1] { ResolutionCandidate@800 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@801 {
-    <name not found> = ArrayList@802[1] { ResolutionCandidate@803 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@804 {
-    <name not found> = ArrayList@805[1] { ResolutionCandidate@806 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@807 {
-    <name not found> = ArrayList@808[1] { ResolutionCandidate@809 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@810 {
-    <name not found> = ArrayList@811[1] { ResolutionCandidate@812 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@813 {
-    <name not found> = ArrayList@814[1] { ResolutionCandidate@815 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@816 {
-    <name not found> = ArrayList@817[1] { ResolutionCandidate@818 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@819 {
-    <name not found> = ArrayList@820[1] { ResolutionCandidate@821 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@822 {
-    <name not found> = ArrayList@823[1] { ResolutionCandidate@824 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@825 {
-    <name not found> = ArrayList@826[1] { ResolutionCandidate@827 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@828 {
-    <name not found> = ArrayList@829[1] { ResolutionCandidate@830 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@831 {
-    <name not found> = ArrayList@832[1] { ResolutionCandidate@833 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@834 {
-    <name not found> = ArrayList@835[1] { ResolutionCandidate@836 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@837 {
-    <name not found> = ArrayList@838[1] { ResolutionCandidate@839 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@840 {
-    <name not found> = ArrayList@841[1] { ResolutionCandidate@842 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@843 {
-    <name not found> = ArrayList@844[1] { ResolutionCandidate@845 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@846 {
-    <name not found> = ArrayList@847[1] { ResolutionCandidate@848 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@849 {
-    <name not found> = ArrayList@850[1] { ResolutionCandidate@851 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@852 {
-    <name not found> = ArrayList@853[1] { ResolutionCandidate@854 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@855 {
-    <name not found> = ArrayList@856[1] { ResolutionCandidate@857 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@858 {
-    <name not found> = ArrayList@859[1] { ResolutionCandidate@860 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@861 {
-    <name not found> = ArrayList@862[1] { ResolutionCandidate@863 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@864 {
-    <name not found> = ArrayList@865[1] { ResolutionCandidate@866 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@867 {
-    <name not found> = ArrayList@868[1] { ResolutionCandidate@869 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@870 {
-    <name not found> = ArrayList@871[1] { ResolutionCandidate@872 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@873 {
-    <name not found> = ArrayList@874[1] { ResolutionCandidate@875 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@876 {
-    <name not found> = ArrayList@877[1] { ResolutionCandidate@878 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@879 {
-    <name not found> = ArrayList@880[1] { ResolutionCandidate@881 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@882 {
-    <name not found> = ArrayList@883[1] { ResolutionCandidate@884 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@885 {
-    <name not found> = ArrayList@886[1] { ResolutionCandidate@887 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@888 {
-    <name not found> = ArrayList@889[1] { ResolutionCandidate@890 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@891 {
-    <name not found> = ArrayList@892[1] { ResolutionCandidate@893 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@894 {
-    <name not found> = ArrayList@895[1] { ResolutionCandidate@896 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@897 {
-    <name not found> = ArrayList@898[1] { ResolutionCandidate@899 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@900 {
-    <name not found> = ArrayList@901[1] { ResolutionCandidate@902 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@903 {
-    <name not found> = ArrayList@904[1] { ResolutionCandidate@905 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@906 {
-    <name not found> = ArrayList@907[1] { ResolutionCandidate@908 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@909 {
-    <name not found> = ArrayList@910[1] { ResolutionCandidate@911 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@912 {
-    <name not found> = ArrayList@913[1] { ResolutionCandidate@914 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@915 {
-    <name not found> = ArrayList@916[1] { ResolutionCandidate@917 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@918 {
-    <name not found> = ArrayList@919[1] { ResolutionCandidate@920 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@921 {
-    <name not found> = ArrayList@922[1] { ResolutionCandidate@923 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@924 {
-    <name not found> = ArrayList@925[1] { ResolutionCandidate@926 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@927 {
-    <name not found> = ArrayList@928[1] { ResolutionCandidate@929 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@930 {
-    <name not found> = ArrayList@931[1] { ResolutionCandidate@932 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@933 {
-    <name not found> = ArrayList@934[1] { ResolutionCandidate@935 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@936 {
-    <name not found> = ArrayList@937[1] { ResolutionCandidate@938 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@939 {
-    <name not found> = ArrayList@940[1] { ResolutionCandidate@941 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@942 {
-    <name not found> = ArrayList@943[1] { ResolutionCandidate@944 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@945 {
-    <name not found> = ArrayList@946[1] { ResolutionCandidate@947 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@948 {
-    <name not found> = ArrayList@949[1] { ResolutionCandidate@950 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@951 {
-    <name not found> = ArrayList@952[1] { ResolutionCandidate@953 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@954 {
-    <name not found> = ArrayList@955[1] { ResolutionCandidate@956 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@957 {
-    <name not found> = ArrayList@958[1] { ResolutionCandidate@959 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@960 {
-    <name not found> = ArrayList@961[1] { ResolutionCandidate@962 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@963 {
-    <name not found> = ArrayList@964[1] { ResolutionCandidate@965 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@966 {
-    <name not found> = ArrayList@967[1] { ResolutionCandidate@968 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@969 {
-    <name not found> = ArrayList@970[1] { ResolutionCandidate@971 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@972 {
-    <name not found> = ArrayList@973[1] { ResolutionCandidate@974 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@975 {
-    <name not found> = ArrayList@976[1] { ResolutionCandidate@977 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@978 {
-    <name not found> = ArrayList@979[1] { ResolutionCandidate@980 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@981 {
-    <name not found> = ArrayList@982[1] { ResolutionCandidate@983 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@984 {
-    <name not found> = ArrayList@985[1] { ResolutionCandidate@986 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@987 {
-    <name not found> = ArrayList@988[1] { ResolutionCandidate@989 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@990 {
-    <name not found> = ArrayList@991[1] { ResolutionCandidate@992 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@993 {
-    <name not found> = ArrayList@994[1] { ResolutionCandidate@995 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@996 {
-    <name not found> = ArrayList@997[1] { ResolutionCandidate@998 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@999 {
-    <name not found> = ArrayList@1000[1] { ResolutionCandidate@1001 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1002 {
-    <name not found> = ArrayList@1003[1] { ResolutionCandidate@1004 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1005 {
-    <name not found> = ArrayList@1006[1] { ResolutionCandidate@1007 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1008 {
-    <name not found> = ArrayList@1009[1] { ResolutionCandidate@1010 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1011 {
-    <name not found> = ArrayList@1012[1] { ResolutionCandidate@1013 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1014 {
-    <name not found> = ArrayList@1015[1] { ResolutionCandidate@1016 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1017 {
-    <name not found> = ArrayList@1018[1] { ResolutionCandidate@1019 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1020 {
-    <name not found> = ArrayList@1021[1] { ResolutionCandidate@1022 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1023 {
-    <name not found> = ArrayList@1024[1] { ResolutionCandidate@1025 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1026 {
-    <name not found> = ArrayList@1027[1] { ResolutionCandidate@1028 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1029 {
-    <name not found> = ArrayList@1030[1] { ResolutionCandidate@1031 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1032 {
-    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1035 {
-    <name not found> = ArrayList@1036[1] { ResolutionCandidate@1037 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1038 {
-    <name not found> = ArrayList@1039[1] { ResolutionCandidate@1040 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1041 {
-    <name not found> = ArrayList@1042[1] { ResolutionCandidate@1043 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1044 {
-    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1047 {
-    <name not found> = ArrayList@1048[1] { ResolutionCandidate@1049 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1050 {
-    <name not found> = ArrayList@1051[1] { ResolutionCandidate@1052 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1053 {
-    <name not found> = ArrayList@1054[1] { ResolutionCandidate@1055 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1056 {
-    <name not found> = ArrayList@1057[1] { ResolutionCandidate@1058 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1059 {
-    <name not found> = ArrayList@1060[1] { ResolutionCandidate@1061 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1062 {
-    <name not found> = ArrayList@1063[1] { ResolutionCandidate@1064 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1065 {
-    <name not found> = ArrayList@1066[1] { ResolutionCandidate@1067 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1068 {
-    <name not found> = ArrayList@1069[1] { ResolutionCandidate@1070 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1071 {
-    <name not found> = ArrayList@1072[1] { ResolutionCandidate@1073 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1074 {
-    <name not found> = ArrayList@1075[1] { ResolutionCandidate@1076 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1077 {
-    <name not found> = ArrayList@1078[1] { ResolutionCandidate@1079 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1080 {
-    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1083 {
-    <name not found> = ArrayList@1084[1] { ResolutionCandidate@1085 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1086 {
-    <name not found> = ArrayList@1087[1] { ResolutionCandidate@1088 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1089 {
-    <name not found> = ArrayList@1090[1] { ResolutionCandidate@1091 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1092 {
-    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1095 {
-    <name not found> = ArrayList@1096[1] { ResolutionCandidate@1097 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1098 {
-    <name not found> = ArrayList@1099[1] { ResolutionCandidate@1100 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1101 {
-    <name not found> = ArrayList@1102[1] { ResolutionCandidate@1103 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1104 {
-    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1107 {
-    <name not found> = ArrayList@1108[1] { ResolutionCandidate@1109 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1110 {
-    <name not found> = ArrayList@1111[1] { ResolutionCandidate@1112 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1113 {
-    <name not found> = ArrayList@1114[1] { ResolutionCandidate@1115 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1116 {
-    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1119 {
-    <name not found> = ArrayList@1120[1] { ResolutionCandidate@1121 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1122 {
-    <name not found> = ArrayList@1123[1] { ResolutionCandidate@1124 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1125 {
-    <name not found> = ArrayList@1126[1] { ResolutionCandidate@1127 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1128 {
-    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1131 {
-    <name not found> = ArrayList@1132[1] { ResolutionCandidate@1133 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1134 {
-    <name not found> = ArrayList@1135[1] { ResolutionCandidate@1136 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1137 {
-    <name not found> = ArrayList@1138[1] { ResolutionCandidate@1139 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1140 {
-    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1143 {
-    <name not found> = ArrayList@1144[1] { ResolutionCandidate@1145 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1146 {
-    <name not found> = ArrayList@1147[1] { ResolutionCandidate@1148 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1149 {
-    <name not found> = ArrayList@1150[1] { ResolutionCandidate@1151 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1152 {
-    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1155 {
-    <name not found> = ArrayList@1156[1] { ResolutionCandidate@1157 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1158 {
-    <name not found> = ArrayList@1159[1] { ResolutionCandidate@1160 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1161 {
-    <name not found> = ArrayList@1162[1] { ResolutionCandidate@1163 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1164 {
-    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1167 {
-    <name not found> = ArrayList@1168[1] { ResolutionCandidate@1169 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1170 {
-    <name not found> = ArrayList@1171[1] { ResolutionCandidate@1172 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1173 {
-    <name not found> = ArrayList@1174[1] { ResolutionCandidate@1175 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1176 {
-    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1179 {
-    <name not found> = ArrayList@1180[1] { ResolutionCandidate@1181 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1182 {
-    <name not found> = ArrayList@1183[1] { ResolutionCandidate@1184 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1185 {
-    <name not found> = ArrayList@1186[1] { ResolutionCandidate@1187 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1188 {
-    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1191 {
-    <name not found> = ArrayList@1192[1] { ResolutionCandidate@1193 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1194 {
-    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1197 {
-    <name not found> = ArrayList@1198[1] { ResolutionCandidate@1199 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1200 {
-    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1203 {
-    <name not found> = ArrayList@1204[1] { ResolutionCandidate@1205 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1206 {
-    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1208 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1209 {
-    <name not found> = ArrayList@1210[1] { ResolutionCandidate@1211 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1212 {
-    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1215 {
-    <name not found> = ArrayList@1216[1] { ResolutionCandidate@1217 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1218 {
-    <name not found> = ArrayList@1219[1] { ResolutionCandidate@1220 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1221 {
-    <name not found> = ArrayList@1222[1] { ResolutionCandidate@1223 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1224 {
-    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1227 {
-    <name not found> = ArrayList@1228[1] { ResolutionCandidate@1229 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1230 {
-    <name not found> = ArrayList@1231[1] { ResolutionCandidate@1232 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1233 {
-    <name not found> = ArrayList@1234[1] { ResolutionCandidate@1235 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1236 {
-    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1239 {
-    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1242 {
-    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1244 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1245 {
-    <name not found> = ArrayList@1246[1] { ResolutionCandidate@1247 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1248 {
-    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1251 {
-    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1253 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1254 {
-    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1256 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1257 {
-    <name not found> = ArrayList@1258[1] { ResolutionCandidate@1259 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1260 {
-    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1263 {
-    <name not found> = ArrayList@1264[1] { ResolutionCandidate@1265 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1266 {
-    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1268 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1269 {
-    <name not found> = ArrayList@1270[1] { ResolutionCandidate@1271 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1272 {
-    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1275 {
-    <name not found> = ArrayList@1276[1] { ResolutionCandidate@1277 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1278 {
-    <name not found> = ArrayList@1279[1] { ResolutionCandidate@1280 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1281 {
-    <name not found> = ArrayList@1282[1] { ResolutionCandidate@1283 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1284 {
-    <name not found> = ArrayList@1285[1] { ResolutionCandidate@1286 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1287 {
-    <name not found> = ArrayList@1288[1] { ResolutionCandidate@1289 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1290 {
-    <name not found> = ArrayList@1291[1] { ResolutionCandidate@1292 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1293 {
-    <name not found> = ArrayList@1294[1] { ResolutionCandidate@1295 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1296 {
-    <name not found> = ArrayList@1297[1] { ResolutionCandidate@1298 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1299 {
-    <name not found> = ArrayList@1300[1] { ResolutionCandidate@1301 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1302 {
-    <name not found> = ArrayList@1303[1] { ResolutionCandidate@1304 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1305 {
-    <name not found> = ArrayList@1306[1] { ResolutionCandidate@1307 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1308 {
-    <name not found> = ArrayList@1309[1] { ResolutionCandidate@1310 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1311 {
-    <name not found> = ArrayList@1312[1] { ResolutionCandidate@1313 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1314 {
-    <name not found> = ArrayList@1315[1] { ResolutionCandidate@1316 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1317 {
-    <name not found> = ArrayList@1318[1] { ResolutionCandidate@1319 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1320 {
-    <name not found> = ArrayList@1321[1] { ResolutionCandidate@1322 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1323 {
-    <name not found> = ArrayList@1324[1] { ResolutionCandidate@1325 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1326 {
-    <name not found> = ArrayList@1327[1] { ResolutionCandidate@1328 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1329 {
-    <name not found> = ArrayList@1330[1] { ResolutionCandidate@1331 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1332 {
-    <name not found> = ArrayList@1333[1] { ResolutionCandidate@1334 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1335 {
-    <name not found> = ArrayList@1336[1] { ResolutionCandidate@1337 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1338 {
-    <name not found> = ArrayList@1339[1] { ResolutionCandidate@1340 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1341 {
-    <name not found> = ArrayList@1342[1] { ResolutionCandidate@1343 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1344 {
-    <name not found> = ArrayList@1345[1] { ResolutionCandidate@1346 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1347 {
-    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1349 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1350 {
-    <name not found> = ArrayList@1351[1] { ResolutionCandidate@1352 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1353 {
-    <name not found> = ArrayList@1354[1] { ResolutionCandidate@1355 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1356 {
-    <name not found> = ArrayList@1357[1] { ResolutionCandidate@1358 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1359 {
-    <name not found> = ArrayList@1360[1] { ResolutionCandidate@1361 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1362 {
-    <name not found> = ArrayList@1363[1] { ResolutionCandidate@1364 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1365 {
-    <name not found> = ArrayList@1366[1] { ResolutionCandidate@1367 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1368 {
-    <name not found> = ArrayList@1369[1] { ResolutionCandidate@1370 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1371 {
-    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1373 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1374 {
-    <name not found> = ArrayList@1375[1] { ResolutionCandidate@1376 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1377 {
-    <name not found> = ArrayList@1378[1] { ResolutionCandidate@1379 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1380 {
-    <name not found> = ArrayList@1381[1] { ResolutionCandidate@1382 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1383 {
-    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1385 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1386 {
-    <name not found> = ArrayList@1387[1] { ResolutionCandidate@1388 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1389 {
-    <name not found> = ArrayList@1390[1] { ResolutionCandidate@1391 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1392 {
-    <name not found> = ArrayList@1393[1] { ResolutionCandidate@1394 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1395 {
-    <name not found> = ArrayList@1396[1] { ResolutionCandidate@1397 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1398 {
-    <name not found> = ArrayList@1399[1] { ResolutionCandidate@1400 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1401 {
-    <name not found> = ArrayList@1402[1] { ResolutionCandidate@1403 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1404 {
-    <name not found> = ArrayList@1405[1] { ResolutionCandidate@1406 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1407 {
-    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1409 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1410 {
-    <name not found> = ArrayList@1411[1] { ResolutionCandidate@1412 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1413 {
-    <name not found> = ArrayList@1414[1] { ResolutionCandidate@1415 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1416 {
-    <name not found> = ArrayList@1417[1] { ResolutionCandidate@1418 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1419 {
-    <name not found> = ArrayList@1420[1] { ResolutionCandidate@1421 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1422 {
-    <name not found> = ArrayList@1423[1] { ResolutionCandidate@1424 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1425 {
-    <name not found> = ArrayList@1426[1] { ResolutionCandidate@1427 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1428 {
-    <name not found> = ArrayList@1429[1] { ResolutionCandidate@1430 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1431 {
-    <name not found> = ArrayList@1432[1] { ResolutionCandidate@1433 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1434 {
-    <name not found> = ArrayList@1435[1] { ResolutionCandidate@1436 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1437 {
-    <name not found> = ArrayList@1438[1] { ResolutionCandidate@1439 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1440 {
-    <name not found> = ArrayList@1441[1] { ResolutionCandidate@1442 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1443 {
-    <name not found> = ArrayList@1444[1] { ResolutionCandidate@1445 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1446 {
-    <name not found> = ArrayList@1447[1] { ResolutionCandidate@1448 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1449 {
-    <name not found> = ArrayList@1450[1] { ResolutionCandidate@1451 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1452 {
-    <name not found> = ArrayList@1453[1] { ResolutionCandidate@1454 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1455 {
-    <name not found> = ArrayList@1456[1] { ResolutionCandidate@1457 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1458 {
-    <name not found> = ArrayList@1459[1] { ResolutionCandidate@1460 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1461 {
-    <name not found> = ArrayList@1462[1] { ResolutionCandidate@1463 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1464 {
-    <name not found> = ArrayList@1465[1] { ResolutionCandidate@1466 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1467 {
-    <name not found> = ArrayList@1468[1] { ResolutionCandidate@1469 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1470 {
-    <name not found> = ArrayList@1471[1] { ResolutionCandidate@1472 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1473 {
-    <name not found> = ArrayList@1474[1] { ResolutionCandidate@1475 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1476 {
-    <name not found> = ArrayList@1477[1] { ResolutionCandidate@1478 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1479 {
-    <name not found> = ArrayList@1480[1] { ResolutionCandidate@1481 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1482 {
-    <name not found> = ArrayList@1483[1] { ResolutionCandidate@1484 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1485 {
-    <name not found> = ArrayList@1486[1] { ResolutionCandidate@1487 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1488 {
-    <name not found> = ArrayList@1489[1] { ResolutionCandidate@1490 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1491 {
-    <name not found> = ArrayList@1492[1] { ResolutionCandidate@1493 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1494 {
-    <name not found> = ArrayList@1495[1] { ResolutionCandidate@1496 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1497 {
-    <name not found> = ArrayList@1498[1] { ResolutionCandidate@1499 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1500 {
-    <name not found> = ArrayList@1501[1] { ResolutionCandidate@1502 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1503 {
-    <name not found> = ArrayList@1504[1] { ResolutionCandidate@1505 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1506 {
-    <name not found> = ArrayList@1507[1] { ResolutionCandidate@1508 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1509 {
-    <name not found> = ArrayList@1510[1] { ResolutionCandidate@1511 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1512 {
-    <name not found> = ArrayList@1513[1] { ResolutionCandidate@1514 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1515 {
-    <name not found> = ArrayList@1516[1] { ResolutionCandidate@1517 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1518 {
-    <name not found> = ArrayList@1519[1] { ResolutionCandidate@1520 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1521 {
-    <name not found> = ArrayList@1522[1] { ResolutionCandidate@1523 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1524 {
-    <name not found> = ArrayList@1525[1] { ResolutionCandidate@1526 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1527 {
-    <name not found> = ArrayList@1528[1] { ResolutionCandidate@1529 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1530 {
-    <name not found> = ArrayList@1531[1] { ResolutionCandidate@1532 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1533 {
-    <name not found> = ArrayList@1534[1] { ResolutionCandidate@1535 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1536 {
-    <name not found> = ArrayList@1537[1] { ResolutionCandidate@1538 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1539 {
-    <name not found> = ArrayList@1540[1] { ResolutionCandidate@1541 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1542 {
-    <name not found> = ArrayList@1543[1] { ResolutionCandidate@1544 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1545 {
-    <name not found> = ArrayList@1546[1] { ResolutionCandidate@1547 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1548 {
-    <name not found> = ArrayList@1549[1] { ResolutionCandidate@1550 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1551 {
-    <name not found> = ArrayList@1552[1] { ResolutionCandidate@1553 }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1554 {
-    <name not found> = ArrayList@1555[1] { ResolutionCandidate@1556 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1557 {
-    <name not found> = ArrayList@1558[1] { ResolutionCandidate@1559 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1560 {
-    <name not found> = ArrayList@1561[1] { ResolutionCandidate@1562 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1563 {
-    <name not found> = ArrayList@1564[1] { ResolutionCandidate@1565 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1566 {
-    <name not found> = ArrayList@1567[1] { ResolutionCandidate@1568 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1569 {
-    <name not found> = ArrayList@1570[1] { ResolutionCandidate@1571 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1572 {
-    <name not found> = ArrayList@1573[1] { ResolutionCandidate@1574 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1575 {
-    <name not found> = ArrayList@1576[1] { ResolutionCandidate@1577 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1578 {
-    <name not found> = ArrayList@1579[1] { ResolutionCandidate@1580 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1581 {
-    <name not found> = ArrayList@1582[1] { ResolutionCandidate@1583 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1584 {
-    <name not found> = ArrayList@1585[1] { ResolutionCandidate@1586 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1587 {
-    <name not found> = ArrayList@1588[1] { ResolutionCandidate@1589 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1590 {
-    <name not found> = ArrayList@1591[1] { ResolutionCandidate@1592 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1593 {
-    <name not found> = ArrayList@1594[1] { ResolutionCandidate@1595 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1596 {
-    <name not found> = ArrayList@1597[1] { ResolutionCandidate@1598 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1599 {
-    <name not found> = ArrayList@1600[1] { ResolutionCandidate@1601 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1602 {
-    <name not found> = ArrayList@1603[1] { ResolutionCandidate@1604 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1605 {
-    <name not found> = ArrayList@1606[1] { ResolutionCandidate@1607 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1608 {
-    <name not found> = ArrayList@1609[1] { ResolutionCandidate@1610 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1611 {
-    <name not found> = ArrayList@1612[1] { ResolutionCandidate@1613 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1614 {
-    <name not found> = ArrayList@1615[1] { ResolutionCandidate@1616 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1617 {
-    <name not found> = ArrayList@1618[1] { ResolutionCandidate@1619 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1620 {
-    <name not found> = ArrayList@1621[1] { ResolutionCandidate@1622 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1623 {
-    <name not found> = ArrayList@1624[1] { ResolutionCandidate@1625 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1626 {
-    <name not found> = ArrayList@1627[1] { ResolutionCandidate@1628 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1629 {
-    <name not found> = ArrayList@1630[1] { ResolutionCandidate@1631 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1632 {
-    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1634 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1635 {
-    <name not found> = ArrayList@1636[1] { ResolutionCandidate@1637 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1638 {
-    <name not found> = ArrayList@1639[1] { ResolutionCandidate@1640 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1641 {
-    <name not found> = ArrayList@1642[1] { ResolutionCandidate@1643 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1644 {
-    <name not found> = ArrayList@1645[1] { ResolutionCandidate@1646 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1647 {
-    <name not found> = ArrayList@1648[1] { ResolutionCandidate@1649 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1650 {
-    <name not found> = ArrayList@1651[1] { ResolutionCandidate@1652 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1653 {
-    <name not found> = ArrayList@1654[1] { ResolutionCandidate@1655 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1656 {
-    <name not found> = ArrayList@1657[1] { ResolutionCandidate@1658 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1659 {
-    <name not found> = ArrayList@1660[1] { ResolutionCandidate@1661 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1662 {
-    <name not found> = ArrayList@1663[1] { ResolutionCandidate@1664 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1665 {
-    <name not found> = ArrayList@1666[1] { ResolutionCandidate@1667 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1668 {
-    <name not found> = ArrayList@1669[1] { ResolutionCandidate@1670 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1671 {
-    <name not found> = ArrayList@1672[1] { ResolutionCandidate@1673 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1674 {
-    <name not found> = ArrayList@1675[1] { ResolutionCandidate@1676 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1677 {
-    <name not found> = ArrayList@1678[1] { ResolutionCandidate@1679 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1680 {
-    <name not found> = ArrayList@1681[1] { ResolutionCandidate@1682 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1683 {
-    <name not found> = ArrayList@1684[1] { ResolutionCandidate@1685 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1686 {
-    <name not found> = ArrayList@1687[1] { ResolutionCandidate@1688 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1689 {
-    <name not found> = ArrayList@1690[1] { ResolutionCandidate@1691 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1692 {
-    <name not found> = ArrayList@1693[1] { ResolutionCandidate@1694 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1695 {
-    <name not found> = ArrayList@1696[1] { ResolutionCandidate@1697 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1698 {
-    <name not found> = ArrayList@1699[1] { ResolutionCandidate@1700 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1701 {
-    <name not found> = ArrayList@1702[1] { ResolutionCandidate@1703 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1704 {
-    <name not found> = ArrayList@1705[1] { ResolutionCandidate@1706 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1707 {
-    <name not found> = ArrayList@1708[1] { ResolutionCandidate@1709 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1710 {
-    <name not found> = ArrayList@1711[1] { ResolutionCandidate@1712 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1713 {
-    <name not found> = ArrayList@1714[1] { ResolutionCandidate@1715 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1716 {
-    <name not found> = ArrayList@1717[1] { ResolutionCandidate@1718 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1719 {
-    <name not found> = ArrayList@1720[1] { ResolutionCandidate@1721 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1722 {
-    <name not found> = ArrayList@1723[1] { ResolutionCandidate@1724 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1725 {
-    <name not found> = ArrayList@1726[1] { ResolutionCandidate@1727 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1728 {
-    <name not found> = ArrayList@1729[1] { ResolutionCandidate@1730 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1731 {
-    <name not found> = ArrayList@1732[1] { ResolutionCandidate@1733 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1734 {
-    <name not found> = ArrayList@1735[1] { ResolutionCandidate@1736 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1737 {
-    <name not found> = ArrayList@1738[1] { ResolutionCandidate@1739 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1740 {
-    <name not found> = ArrayList@1741[1] { ResolutionCandidate@1742 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1743 {
-    <name not found> = ArrayList@1744[1] { ResolutionCandidate@1745 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1746 {
-    <name not found> = ArrayList@1747[1] { ResolutionCandidate@1748 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1749 {
-    <name not found> = ArrayList@1750[1] { ResolutionCandidate@1751 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1752 {
-    <name not found> = ArrayList@1753[1] { ResolutionCandidate@1754 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1755 {
-    <name not found> = ArrayList@1756[1] { ResolutionCandidate@1757 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1758 {
-    <name not found> = ArrayList@1759[1] { ResolutionCandidate@1760 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1761 {
-    <name not found> = ArrayList@1762[1] { ResolutionCandidate@1763 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1764 {
-    <name not found> = ArrayList@1765[1] { ResolutionCandidate@1766 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1767 {
-    <name not found> = ArrayList@1768[1] { ResolutionCandidate@1769 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1770 {
-    <name not found> = ArrayList@1771[1] { ResolutionCandidate@1772 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1773 {
-    <name not found> = ArrayList@1774[1] { ResolutionCandidate@1775 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1776 {
-    <name not found> = ArrayList@1777[1] { ResolutionCandidate@1778 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1779 {
-    <name not found> = ArrayList@1780[1] { ResolutionCandidate@1781 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1782 {
-    <name not found> = ArrayList@1783[1] { ResolutionCandidate@1784 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1785 {
-    <name not found> = ArrayList@1786[1] { ResolutionCandidate@1787 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1788 {
-    <name not found> = ArrayList@1789[1] { ResolutionCandidate@1790 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1791 {
-    <name not found> = ArrayList@1792[1] { ResolutionCandidate@1793 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1794 {
-    <name not found> = ArrayList@1795[1] { ResolutionCandidate@1796 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1797 {
-    <name not found> = ArrayList@1798[1] { ResolutionCandidate@1799 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1800 {
-    <name not found> = ArrayList@1801[1] { ResolutionCandidate@1802 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1803 {
-    <name not found> = ArrayList@1804[1] { ResolutionCandidate@1805 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1806 {
-    <name not found> = ArrayList@1807[1] { ResolutionCandidate@1808 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1809 {
-    <name not found> = ArrayList@1810[1] { ResolutionCandidate@1811 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1812 {
-    <name not found> = ArrayList@1813[1] { ResolutionCandidate@1814 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1815 {
-    <name not found> = ArrayList@1816[1] { ResolutionCandidate@1817 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1818 {
-    <name not found> = ArrayList@1819[1] { ResolutionCandidate@1820 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1821 {
-    <name not found> = ArrayList@1822[1] { ResolutionCandidate@1823 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1824 {
-    <name not found> = ArrayList@1825[1] { ResolutionCandidate@1826 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1827 {
-    <name not found> = ArrayList@1828[1] { ResolutionCandidate@1829 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1830 {
-    <name not found> = ArrayList@1831[1] { ResolutionCandidate@1832 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1833 {
-    <name not found> = ArrayList@1834[1] { ResolutionCandidate@1835 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1836 {
-    <name not found> = ArrayList@1837[1] { ResolutionCandidate@1838 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1839 {
-    <name not found> = ArrayList@1840[1] { ResolutionCandidate@1841 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1842 {
-    <name not found> = ArrayList@1843[1] { ResolutionCandidate@1844 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1845 {
-    <name not found> = ArrayList@1846[1] { ResolutionCandidate@1847 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1848 {
-    <name not found> = ArrayList@1849[1] { ResolutionCandidate@1850 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1851 {
-    <name not found> = ArrayList@1852[1] { ResolutionCandidate@1853 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1854 {
-    <name not found> = ArrayList@1855[1] { ResolutionCandidate@1856 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1857 {
-    <name not found> = ArrayList@1858[1] { ResolutionCandidate@1859 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1860 {
-    <name not found> = ArrayList@1861[1] { ResolutionCandidate@1862 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1863 {
-    <name not found> = ArrayList@1864[1] { ResolutionCandidate@1865 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1866 {
-    <name not found> = ArrayList@1867[1] { ResolutionCandidate@1868 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1869 {
-    <name not found> = ArrayList@1870[1] { ResolutionCandidate@1871 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1872 {
-    <name not found> = ArrayList@1873[1] { ResolutionCandidate@1874 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1875 {
-    <name not found> = ArrayList@1876[1] { ResolutionCandidate@1877 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1878 {
-    <name not found> = ArrayList@1879[1] { ResolutionCandidate@1880 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1881 {
-    <name not found> = ArrayList@1882[1] { ResolutionCandidate@1883 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1884 {
-    <name not found> = ArrayList@1885[1] { ResolutionCandidate@1886 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1887 {
-    <name not found> = ArrayList@1888[1] { ResolutionCandidate@1889 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1890 {
-    <name not found> = ArrayList@1891[1] { ResolutionCandidate@1892 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1893 {
-    <name not found> = ArrayList@1894[1] { ResolutionCandidate@1895 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1896 {
-    <name not found> = ArrayList@1897[1] { ResolutionCandidate@1898 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1899 {
-    <name not found> = ArrayList@1900[1] { ResolutionCandidate@1901 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1902 {
-    <name not found> = ArrayList@1903[1] { ResolutionCandidate@1904 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1905 {
-    <name not found> = ArrayList@1906[1] { ResolutionCandidate@1907 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1908 {
-    <name not found> = ArrayList@1909[1] { ResolutionCandidate@1910 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1911 {
-    <name not found> = ArrayList@1912[1] { ResolutionCandidate@1913 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1914 {
-    <name not found> = ArrayList@1915[1] { ResolutionCandidate@1916 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1917 {
-    <name not found> = ArrayList@1918[1] { ResolutionCandidate@1919 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1920 {
-    <name not found> = ArrayList@1921[1] { ResolutionCandidate@1922 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1923 {
-    <name not found> = ArrayList@1924[1] { ResolutionCandidate@1925 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1926 {
-    <name not found> = ArrayList@1927[1] { ResolutionCandidate@1928 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1929 {
-    <name not found> = ArrayList@1930[1] { ResolutionCandidate@1931 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1932 {
-    <name not found> = ArrayList@1933[1] { ResolutionCandidate@1934 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1935 {
-    <name not found> = ArrayList@1936[1] { ResolutionCandidate@1937 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1938 {
-    <name not found> = ArrayList@1939[1] { ResolutionCandidate@1940 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1941 {
-    <name not found> = ArrayList@1942[1] { ResolutionCandidate@1943 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1944 {
-    <name not found> = ArrayList@1945[1] { ResolutionCandidate@1946 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1947 {
-    <name not found> = ArrayList@1948[1] { ResolutionCandidate@1949 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1950 {
-    <name not found> = ArrayList@1951[1] { ResolutionCandidate@1952 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1953 {
-    <name not found> = ArrayList@1954[1] { ResolutionCandidate@1955 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1956 {
-    <name not found> = ArrayList@1957[1] { ResolutionCandidate@1958 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1959 {
-    <name not found> = ArrayList@1960[1] { ResolutionCandidate@1961 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1962 {
-    <name not found> = ArrayList@1963[1] { ResolutionCandidate@1964 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1965 {
-    <name not found> = ArrayList@1966[1] { ResolutionCandidate@1967 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1968 {
-    <name not found> = ArrayList@1969[1] { ResolutionCandidate@1970 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1971 {
-    <name not found> = ArrayList@1972[1] { ResolutionCandidate@1973 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1974 {
-    <name not found> = ArrayList@1975[1] { ResolutionCandidate@1976 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1977 {
-    <name not found> = ArrayList@1978[1] { ResolutionCandidate@1979 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1980 {
-    <name not found> = ArrayList@1981[1] { ResolutionCandidate@1982 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1983 {
-    <name not found> = ArrayList@1984[1] { ResolutionCandidate@1985 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1986 {
-    <name not found> = ArrayList@1987[1] { ResolutionCandidate@1988 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1989 {
-    <name not found> = ArrayList@1990[1] { ResolutionCandidate@1991 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1992 {
-    <name not found> = ArrayList@1993[1] { ResolutionCandidate@1994 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1995 {
-    <name not found> = ArrayList@1996[1] { ResolutionCandidate@1997 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@1998 {
-    <name not found> = ArrayList@1999[1] { ResolutionCandidate@2000 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2001 {
-    <name not found> = ArrayList@2002[1] { ResolutionCandidate@2003 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2004 {
-    <name not found> = ArrayList@2005[1] { ResolutionCandidate@2006 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2007 {
-    <name not found> = ArrayList@2008[1] { ResolutionCandidate@2009 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2010 {
-    <name not found> = ArrayList@2011[1] { ResolutionCandidate@2012 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2013 {
-    <name not found> = ArrayList@2014[1] { ResolutionCandidate@2015 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2016 {
-    <name not found> = ArrayList@2017[1] { ResolutionCandidate@2018 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2019 {
-    <name not found> = ArrayList@2020[1] { ResolutionCandidate@2021 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2022 {
-    <name not found> = ArrayList@2023[1] { ResolutionCandidate@2024 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2025 {
-    <name not found> = ArrayList@2026[1] { ResolutionCandidate@2027 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2028 {
-    <name not found> = ArrayList@2029[1] { ResolutionCandidate@2030 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2031 {
-    <name not found> = ArrayList@2032[1] { ResolutionCandidate@2033 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2034 {
-    <name not found> = ArrayList@2035[1] { ResolutionCandidate@2036 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2037 {
-    <name not found> = ArrayList@2038[1] { ResolutionCandidate@2039 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2040 {
-    <name not found> = ArrayList@2041[1] { ResolutionCandidate@2042 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2043 {
-    <name not found> = ArrayList@2044[1] { ResolutionCandidate@2045 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2046 {
-    <name not found> = ArrayList@2047[1] { ResolutionCandidate@2048 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2049 {
-    <name not found> = ArrayList@2050[1] { ResolutionCandidate@2051 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2052 {
-    <name not found> = ArrayList@2053[1] { ResolutionCandidate@2054 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2055 {
-    <name not found> = ArrayList@2056[1] { ResolutionCandidate@2057 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2058 {
-    <name not found> = ArrayList@2059[1] { ResolutionCandidate@2060 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2061 {
-    <name not found> = ArrayList@2062[1] { ResolutionCandidate@2063 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2064 {
-    <name not found> = ArrayList@2065[1] { ResolutionCandidate@2066 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2067 {
-    <name not found> = ArrayList@2068[1] { ResolutionCandidate@2069 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2070 {
-    <name not found> = ArrayList@2071[1] { ResolutionCandidate@2072 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2073 {
-    <name not found> = ArrayList@2074[1] { ResolutionCandidate@2075 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2076 {
-    <name not found> = ArrayList@2077[1] { ResolutionCandidate@2078 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2079 {
-    <name not found> = ArrayList@2080[1] { ResolutionCandidate@2081 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2082 {
-    <name not found> = ArrayList@2083[1] { ResolutionCandidate@2084 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2085 {
-    <name not found> = ArrayList@2086[1] { ResolutionCandidate@2087 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2088 {
-    <name not found> = ArrayList@2089[1] { ResolutionCandidate@2090 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2091 {
-    <name not found> = ArrayList@2092[1] { ResolutionCandidate@2093 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2094 {
-    <name not found> = ArrayList@2095[1] { ResolutionCandidate@2096 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2097 {
-    <name not found> = ArrayList@2098[1] { ResolutionCandidate@2099 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2100 {
-    <name not found> = ArrayList@2101[1] { ResolutionCandidate@2102 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2103 {
-    <name not found> = ArrayList@2104[1] { ResolutionCandidate@2105 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2106 {
-    <name not found> = ArrayList@2107[1] { ResolutionCandidate@2108 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2109 {
-    <name not found> = ArrayList@2110[1] { ResolutionCandidate@2111 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2112 {
-    <name not found> = ArrayList@2113[1] { ResolutionCandidate@2114 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2115 {
-    <name not found> = ArrayList@2116[1] { ResolutionCandidate@2117 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2118 {
-    <name not found> = ArrayList@2119[1] { ResolutionCandidate@2120 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2121 {
-    <name not found> = ArrayList@2122[1] { ResolutionCandidate@2123 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2124 {
-    <name not found> = ArrayList@2125[1] { ResolutionCandidate@2126 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2127 {
-    <name not found> = ArrayList@2128[1] { ResolutionCandidate@2129 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2130 {
-    <name not found> = ArrayList@2131[1] { ResolutionCandidate@2132 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2133 {
-    <name not found> = ArrayList@2134[1] { ResolutionCandidate@2135 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2136 {
-    <name not found> = ArrayList@2137[1] { ResolutionCandidate@2138 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2139 {
-    <name not found> = ArrayList@2140[1] { ResolutionCandidate@2141 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2142 {
-    <name not found> = ArrayList@2143[1] { ResolutionCandidate@2144 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2145 {
-    <name not found> = ArrayList@2146[1] { ResolutionCandidate@2147 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2148 {
-    <name not found> = ArrayList@2149[1] { ResolutionCandidate@2150 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2151 {
-    <name not found> = ArrayList@2152[1] { ResolutionCandidate@2153 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2154 {
-    <name not found> = ArrayList@2155[1] { ResolutionCandidate@2156 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2157 {
-    <name not found> = ArrayList@2158[1] { ResolutionCandidate@2159 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2160 {
-    <name not found> = ArrayList@2161[1] { ResolutionCandidate@2162 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2163 {
-    <name not found> = ArrayList@2164[1] { ResolutionCandidate@2165 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2166 {
-    <name not found> = ArrayList@2167[1] { ResolutionCandidate@2168 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2169 {
-    <name not found> = ArrayList@2170[1] { ResolutionCandidate@2171 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2172 {
-    <name not found> = ArrayList@2173[1] { ResolutionCandidate@2174 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2175 {
-    <name not found> = ArrayList@2176[1] { ResolutionCandidate@2177 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2178 {
-    <name not found> = ArrayList@2179[1] { ResolutionCandidate@2180 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2181 {
-    <name not found> = ArrayList@2182[1] { ResolutionCandidate@2183 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2184 {
-    <name not found> = ArrayList@2185[1] { ResolutionCandidate@2186 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2187 {
-    <name not found> = ArrayList@2188[1] { ResolutionCandidate@2189 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2190 {
-    <name not found> = ArrayList@2191[1] { ResolutionCandidate@2192 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2193 {
-    <name not found> = ArrayList@2194[1] { ResolutionCandidate@2195 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2196 {
-    <name not found> = ArrayList@2197[1] { ResolutionCandidate@2198 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2199 {
-    <name not found> = ArrayList@2200[1] { ResolutionCandidate@2201 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2202 {
-    <name not found> = ArrayList@2203[1] { ResolutionCandidate@2204 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2205 {
-    <name not found> = ArrayList@2206[1] { ResolutionCandidate@2207 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2208 {
-    <name not found> = ArrayList@2209[1] { ResolutionCandidate@2210 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2211 {
-    <name not found> = ArrayList@2212[1] { ResolutionCandidate@2213 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2214 {
-    <name not found> = ArrayList@2215[1] { ResolutionCandidate@2216 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2217 {
-    <name not found> = ArrayList@2218[1] { ResolutionCandidate@2219 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2220 {
-    <name not found> = ArrayList@2221[1] { ResolutionCandidate@2222 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2223 {
-    <name not found> = ArrayList@2224[1] { ResolutionCandidate@2225 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2226 {
-    <name not found> = ArrayList@2227[1] { ResolutionCandidate@2228 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2229 {
-    <name not found> = ArrayList@2230[1] { ResolutionCandidate@2231 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2232 {
-    <name not found> = ArrayList@2233[1] { ResolutionCandidate@2234 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2235 {
-    <name not found> = ArrayList@2236[1] { ResolutionCandidate@2237 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2238 {
-    <name not found> = ArrayList@2239[1] { ResolutionCandidate@2240 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2241 {
-    <name not found> = ArrayList@2242[1] { ResolutionCandidate@2243 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2244 {
-    <name not found> = ArrayList@2245[1] { ResolutionCandidate@2246 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2247 {
-    <name not found> = ArrayList@2248[1] { ResolutionCandidate@2249 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2250 {
-    <name not found> = ArrayList@2251[1] { ResolutionCandidate@2252 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2253 {
-    <name not found> = ArrayList@2254[1] { ResolutionCandidate@2255 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2256 {
-    <name not found> = ArrayList@2257[1] { ResolutionCandidate@2258 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2259 {
-    <name not found> = ArrayList@2260[1] { ResolutionCandidate@2261 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2262 {
-    <name not found> = ArrayList@2263[1] { ResolutionCandidate@2264 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2265 {
-    <name not found> = ArrayList@2266[1] { ResolutionCandidate@2267 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2268 {
-    <name not found> = ArrayList@2269[1] { ResolutionCandidate@2270 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2271 {
-    <name not found> = ArrayList@2272[1] { ResolutionCandidate@2273 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2274 {
-    <name not found> = ArrayList@2275[1] { ResolutionCandidate@2276 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2277 {
-    <name not found> = ArrayList@2278[1] { ResolutionCandidate@2279 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2280 {
-    <name not found> = ArrayList@2281[1] { ResolutionCandidate@2282 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2283 {
-    <name not found> = ArrayList@2284[1] { ResolutionCandidate@2285 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2286 {
-    <name not found> = ArrayList@2287[1] { ResolutionCandidate@2288 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2289 {
-    <name not found> = ArrayList@2290[1] { ResolutionCandidate@2291 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2292 {
-    <name not found> = ArrayList@2293[1] { ResolutionCandidate@2294 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2295 {
-    <name not found> = ArrayList@2296[1] { ResolutionCandidate@2297 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2298 {
-    <name not found> = ArrayList@2299[1] { ResolutionCandidate@2300 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2301 {
-    <name not found> = ArrayList@2302[1] { ResolutionCandidate@2303 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2304 {
-    <name not found> = ArrayList@2305[1] { ResolutionCandidate@2306 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2307 {
-    <name not found> = ArrayList@2308[1] { ResolutionCandidate@2309 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2310 {
-    <name not found> = ArrayList@2311[1] { ResolutionCandidate@2312 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2313 {
-    <name not found> = ArrayList@2314[1] { ResolutionCandidate@2315 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2316 {
-    <name not found> = ArrayList@2317[1] { ResolutionCandidate@2318 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2319 {
-    <name not found> = ArrayList@2320[1] { ResolutionCandidate@2321 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2322 {
-    <name not found> = ArrayList@2323[1] { ResolutionCandidate@2324 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2325 {
-    <name not found> = ArrayList@2326[1] { ResolutionCandidate@2327 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2328 {
-    <name not found> = ArrayList@2329[1] { ResolutionCandidate@2330 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2331 {
-    <name not found> = ArrayList@2332[1] { ResolutionCandidate@2333 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2334 {
-    <name not found> = ArrayList@2335[1] { ResolutionCandidate@2336 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2337 {
-    <name not found> = ArrayList@2338[1] { ResolutionCandidate@2339 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2340 {
-    <name not found> = ArrayList@2341[1] { ResolutionCandidate@2342 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2343 {
-    <name not found> = ArrayList@2344[1] { ResolutionCandidate@2345 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2346 {
-    <name not found> = ArrayList@2347[1] { ResolutionCandidate@2348 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2349 {
-    <name not found> = ArrayList@2350[1] { ResolutionCandidate@2351 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2352 {
-    <name not found> = ArrayList@2353[1] { ResolutionCandidate@2354 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2355 {
-    <name not found> = ArrayList@2356[1] { ResolutionCandidate@2357 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2358 {
-    <name not found> = ArrayList@2359[1] { ResolutionCandidate@2360 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2361 {
-    <name not found> = ArrayList@2362[1] { ResolutionCandidate@2363 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2364 {
-    <name not found> = ArrayList@2365[1] { ResolutionCandidate@2366 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2367 {
-    <name not found> = ArrayList@2368[1] { ResolutionCandidate@2369 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2370 {
-    <name not found> = ArrayList@2371[1] { ResolutionCandidate@2372 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2373 {
-    <name not found> = ArrayList@2374[1] { ResolutionCandidate@2375 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2376 {
-    <name not found> = ArrayList@2377[1] { ResolutionCandidate@2378 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2379 {
-    <name not found> = ArrayList@2380[1] { ResolutionCandidate@2381 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2382 {
-    <name not found> = ArrayList@2383[1] { ResolutionCandidate@2384 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2385 {
-    <name not found> = ArrayList@2386[1] { ResolutionCandidate@2387 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2388 {
-    <name not found> = ArrayList@2389[1] { ResolutionCandidate@2390 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2391 {
-    <name not found> = ArrayList@2392[1] { ResolutionCandidate@2393 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2394 {
-    <name not found> = ArrayList@2395[1] { ResolutionCandidate@2396 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2397 {
-    <name not found> = ArrayList@2398[1] { ResolutionCandidate@2399 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2400 {
-    <name not found> = ArrayList@2401[1] { ResolutionCandidate@2402 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2403 {
-    <name not found> = ArrayList@2404[1] { ResolutionCandidate@2405 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2406 {
-    <name not found> = ArrayList@2407[1] { ResolutionCandidate@2408 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2409 {
-    <name not found> = ArrayList@2410[1] { ResolutionCandidate@2411 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2412 {
-    <name not found> = ArrayList@2413[1] { ResolutionCandidate@2414 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2415 {
-    <name not found> = ArrayList@2416[1] { ResolutionCandidate@2417 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2418 {
-    <name not found> = ArrayList@2419[1] { ResolutionCandidate@2420 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2421 {
-    <name not found> = ArrayList@2422[1] { ResolutionCandidate@2423 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2424 {
-    <name not found> = ArrayList@2425[1] { ResolutionCandidate@2426 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2427 {
-    <name not found> = ArrayList@2428[1] { ResolutionCandidate@2429 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2430 {
-    <name not found> = ArrayList@2431[1] { ResolutionCandidate@2432 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2433 {
-    <name not found> = ArrayList@2434[1] { ResolutionCandidate@2435 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2436 {
-    <name not found> = ArrayList@2437[1] { ResolutionCandidate@2438 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2439 {
-    <name not found> = ArrayList@2440[1] { ResolutionCandidate@2441 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2442 {
-    <name not found> = ArrayList@2443[1] { ResolutionCandidate@2444 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2445 {
-    <name not found> = ArrayList@2446[1] { ResolutionCandidate@2447 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2448 {
-    <name not found> = ArrayList@2449[1] { ResolutionCandidate@2450 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2451 {
-    <name not found> = ArrayList@2452[1] { ResolutionCandidate@2453 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2454 {
-    <name not found> = ArrayList@2455[1] { ResolutionCandidate@2456 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2457 {
-    <name not found> = ArrayList@2458[1] { ResolutionCandidate@2459 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2460 {
-    <name not found> = ArrayList@2461[1] { ResolutionCandidate@2462 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2463 {
-    <name not found> = ArrayList@2464[1] { ResolutionCandidate@2465 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2466 {
-    <name not found> = ArrayList@2467[1] { ResolutionCandidate@2468 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2469 {
-    <name not found> = ArrayList@2470[1] { ResolutionCandidate@2471 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2472 {
-    <name not found> = ArrayList@2473[1] { ResolutionCandidate@2474 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2475 {
-    <name not found> = ArrayList@2476[1] { ResolutionCandidate@2477 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2478 {
-    <name not found> = ArrayList@2479[1] { ResolutionCandidate@2480 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2481 {
-    <name not found> = ArrayList@2482[1] { ResolutionCandidate@2483 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2484 {
-    <name not found> = ArrayList@2485[1] { ResolutionCandidate@2486 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2487 {
-    <name not found> = ArrayList@2488[1] { ResolutionCandidate@2489 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2490 {
-    <name not found> = ArrayList@2491[1] { ResolutionCandidate@2492 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2493 {
-    <name not found> = ArrayList@2494[1] { ResolutionCandidate@2495 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2496 {
-    <name not found> = ArrayList@2497[1] { ResolutionCandidate@2498 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2499 {
-    <name not found> = ArrayList@2500[1] { ResolutionCandidate@2501 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2502 {
-    <name not found> = ArrayList@2503[1] { ResolutionCandidate@2504 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2505 {
-    <name not found> = ArrayList@2506[1] { ResolutionCandidate@2507 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2508 {
-    <name not found> = ArrayList@2509[1] { ResolutionCandidate@2510 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2511 {
-    <name not found> = ArrayList@2512[1] { ResolutionCandidate@2513 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2514 {
-    <name not found> = ArrayList@2515[1] { ResolutionCandidate@2516 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2517 {
-    <name not found> = ArrayList@2518[1] { ResolutionCandidate@2519 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2520 {
-    <name not found> = ArrayList@2521[1] { ResolutionCandidate@2522 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2523 {
-    <name not found> = ArrayList@2524[1] { ResolutionCandidate@2525 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2526 {
-    <name not found> = ArrayList@2527[1] { ResolutionCandidate@2528 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2529 {
-    <name not found> = ArrayList@2530[1] { ResolutionCandidate@2531 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2532 {
-    <name not found> = ArrayList@2533[1] { ResolutionCandidate@2534 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2535 {
-    <name not found> = ArrayList@2536[1] { ResolutionCandidate@2537 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2538 {
-    <name not found> = ArrayList@2539[1] { ResolutionCandidate@2540 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2541 {
-    <name not found> = ArrayList@2542[1] { ResolutionCandidate@2543 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2544 {
-    <name not found> = ArrayList@2545[1] { ResolutionCandidate@2546 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2547 {
-    <name not found> = ArrayList@2548[1] { ResolutionCandidate@2549 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2550 {
-    <name not found> = ArrayList@2551[1] { ResolutionCandidate@2552 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2553 {
-    <name not found> = ArrayList@2554[1] { ResolutionCandidate@2555 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2556 {
-    <name not found> = ArrayList@2557[1] { ResolutionCandidate@2558 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2559 {
-    <name not found> = ArrayList@2560[1] { ResolutionCandidate@2561 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2562 {
-    <name not found> = ArrayList@2563[1] { ResolutionCandidate@2564 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2565 {
-    <name not found> = ArrayList@2566[1] { ResolutionCandidate@2567 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2568 {
-    <name not found> = ArrayList@2569[1] { ResolutionCandidate@2570 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2571 {
-    <name not found> = ArrayList@2572[1] { ResolutionCandidate@2573 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2574 {
-    <name not found> = ArrayList@2575[1] { ResolutionCandidate@2576 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2577 {
-    <name not found> = ArrayList@2578[1] { ResolutionCandidate@2579 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2580 {
-    <name not found> = ArrayList@2581[1] { ResolutionCandidate@2582 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2583 {
-    <name not found> = ArrayList@2584[1] { ResolutionCandidate@2585 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2586 {
-    <name not found> = ArrayList@2587[1] { ResolutionCandidate@2588 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2589 {
-    <name not found> = ArrayList@2590[1] { ResolutionCandidate@2591 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2592 {
-    <name not found> = ArrayList@2593[1] { ResolutionCandidate@2594 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2595 {
-    <name not found> = ArrayList@2596[1] { ResolutionCandidate@2597 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2598 {
-    <name not found> = ArrayList@2599[1] { ResolutionCandidate@2600 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2601 {
-    <name not found> = ArrayList@2602[1] { ResolutionCandidate@2603 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2604 {
-    <name not found> = ArrayList@2605[1] { ResolutionCandidate@2606 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2607 {
-    <name not found> = ArrayList@2608[1] { ResolutionCandidate@2609 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2610 {
-    <name not found> = ArrayList@2611[1] { ResolutionCandidate@2612 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2613 {
-    <name not found> = ArrayList@2614[1] { ResolutionCandidate@2615 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2616 {
-    <name not found> = ArrayList@2617[1] { ResolutionCandidate@2618 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2619 {
-    <name not found> = ArrayList@2620[1] { ResolutionCandidate@2621 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2622 {
-    <name not found> = ArrayList@2623[1] { ResolutionCandidate@2624 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2625 {
-    <name not found> = ArrayList@2626[1] { ResolutionCandidate@2627 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2628 {
-    <name not found> = ArrayList@2629[1] { ResolutionCandidate@2630 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2631 {
-    <name not found> = ArrayList@2632[1] { ResolutionCandidate@2633 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2634 {
-    <name not found> = ArrayList@2635[1] { ResolutionCandidate@2636 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2637 {
-    <name not found> = ArrayList@2638[1] { ResolutionCandidate@2639 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2640 {
-    <name not found> = ArrayList@2641[1] { ResolutionCandidate@2642 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2643 {
-    <name not found> = ArrayList@2644[1] { ResolutionCandidate@2645 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2646 {
-    <name not found> = ArrayList@2647[1] { ResolutionCandidate@2648 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2649 {
-    <name not found> = ArrayList@2650[1] { ResolutionCandidate@2651 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2652 {
-    <name not found> = ArrayList@2653[1] { ResolutionCandidate@2654 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2655 {
-    <name not found> = ArrayList@2656[1] { ResolutionCandidate@2657 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2658 {
-    <name not found> = ArrayList@2659[1] { ResolutionCandidate@2660 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2661 {
-    <name not found> = ArrayList@2662[1] { ResolutionCandidate@2663 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2664 {
-    <name not found> = ArrayList@2665[1] { ResolutionCandidate@2666 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2667 {
-    <name not found> = ArrayList@2668[1] { ResolutionCandidate@2669 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2670 {
-    <name not found> = ArrayList@2671[1] { ResolutionCandidate@2672 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2673 {
-    <name not found> = ArrayList@2674[1] { ResolutionCandidate@2675 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2676 {
-    <name not found> = ArrayList@2677[1] { ResolutionCandidate@2678 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2679 {
-    <name not found> = ArrayList@2680[1] { ResolutionCandidate@2681 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2682 {
-    <name not found> = ArrayList@2683[1] { ResolutionCandidate@2684 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2685 {
-    <name not found> = ArrayList@2686[1] { ResolutionCandidate@2687 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2688 {
-    <name not found> = ArrayList@2689[1] { ResolutionCandidate@2690 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2691 {
-    <name not found> = ArrayList@2692[1] { ResolutionCandidate@2693 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2694 {
-    <name not found> = ArrayList@2695[1] { ResolutionCandidate@2696 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2697 {
-    <name not found> = ArrayList@2698[1] { ResolutionCandidate@2699 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2700 {
-    <name not found> = ArrayList@2701[1] { ResolutionCandidate@2702 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2703 {
-    <name not found> = ArrayList@2704[1] { ResolutionCandidate@2705 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2706 {
-    <name not found> = ArrayList@2707[1] { ResolutionCandidate@2708 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2709 {
-    <name not found> = ArrayList@2710[1] { ResolutionCandidate@2711 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2712 {
-    <name not found> = ArrayList@2713[1] { ResolutionCandidate@2714 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2715 {
-    <name not found> = ArrayList@2716[1] { ResolutionCandidate@2717 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2718 {
-    <name not found> = ArrayList@2719[1] { ResolutionCandidate@2720 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2721 {
-    <name not found> = ArrayList@2722[1] { ResolutionCandidate@2723 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2724 {
-    <name not found> = ArrayList@2725[1] { ResolutionCandidate@2726 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2727 {
-    <name not found> = ArrayList@2728[1] { ResolutionCandidate@2729 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2730 {
-    <name not found> = ArrayList@2731[1] { ResolutionCandidate@2732 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2733 {
-    <name not found> = ArrayList@2734[1] { ResolutionCandidate@2735 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2736 {
-    <name not found> = ArrayList@2737[1] { ResolutionCandidate@2738 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2739 {
-    <name not found> = ArrayList@2740[1] { ResolutionCandidate@2741 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2742 {
-    <name not found> = ArrayList@2743[1] { ResolutionCandidate@2744 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2745 {
-    <name not found> = ArrayList@2746[1] { ResolutionCandidate@2747 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2748 {
-    <name not found> = ArrayList@2749[1] { ResolutionCandidate@2750 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2751 {
-    <name not found> = ArrayList@2752[1] { ResolutionCandidate@2753 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2754 {
-    <name not found> = ArrayList@2755[1] { ResolutionCandidate@2756 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2757 {
-    <name not found> = ArrayList@2758[1] { ResolutionCandidate@2759 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2760 {
-    <name not found> = ArrayList@2761[1] { ResolutionCandidate@2762 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2763 {
-    <name not found> = ArrayList@2764[1] { ResolutionCandidate@2765 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2766 {
-    <name not found> = ArrayList@2767[1] { ResolutionCandidate@2768 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2769 {
-    <name not found> = ArrayList@2770[1] { ResolutionCandidate@2771 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2772 {
-    <name not found> = ArrayList@2773[1] { ResolutionCandidate@2774 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2775 {
-    <name not found> = ArrayList@2776[1] { ResolutionCandidate@2777 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2778 {
-    <name not found> = ArrayList@2779[1] { ResolutionCandidate@2780 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2781 {
-    <name not found> = ArrayList@2782[1] { ResolutionCandidate@2783 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2784 {
-    <name not found> = ArrayList@2785[1] { ResolutionCandidate@2786 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2787 {
-    <name not found> = ArrayList@2788[1] { ResolutionCandidate@2789 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2790 {
-    <name not found> = ArrayList@2791[1] { ResolutionCandidate@2792 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2793 {
-    <name not found> = ArrayList@2794[1] { ResolutionCandidate@2795 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2796 {
-    <name not found> = ArrayList@2797[1] { ResolutionCandidate@2798 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2799 {
-    <name not found> = ArrayList@2800[1] { ResolutionCandidate@2801 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2802 {
-    <name not found> = ArrayList@2803[1] { ResolutionCandidate@2804 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2805 {
-    <name not found> = ArrayList@2806[1] { ResolutionCandidate@2807 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2808 {
-    <name not found> = ArrayList@2809[1] { ResolutionCandidate@2810 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2811 {
-    <name not found> = ArrayList@2812[1] { ResolutionCandidate@2813 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2814 {
-    <name not found> = ArrayList@2815[1] { ResolutionCandidate@2816 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2817 {
-    <name not found> = ArrayList@2818[1] { ResolutionCandidate@2819 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2820 {
-    <name not found> = ArrayList@2821[1] { ResolutionCandidate@2822 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2823 {
-    <name not found> = ArrayList@2824[1] { ResolutionCandidate@2825 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2826 {
-    <name not found> = ArrayList@2827[1] { ResolutionCandidate@2828 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2829 {
-    <name not found> = ArrayList@2830[1] { ResolutionCandidate@2831 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2832 {
-    <name not found> = ArrayList@2833[1] { ResolutionCandidate@2834 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2835 {
-    <name not found> = ArrayList@2836[1] { ResolutionCandidate@2837 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2838 {
-    <name not found> = ArrayList@2839[1] { ResolutionCandidate@2840 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2841 {
-    <name not found> = ArrayList@2842[1] { ResolutionCandidate@2843 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2844 {
-    <name not found> = ArrayList@2845[1] { ResolutionCandidate@2846 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2847 {
-    <name not found> = ArrayList@2848[1] { ResolutionCandidate@2849 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2850 {
-    <name not found> = ArrayList@2851[1] { ResolutionCandidate@2852 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2853 {
-    <name not found> = ArrayList@2854[1] { ResolutionCandidate@2855 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2856 {
-    <name not found> = ArrayList@2857[1] { ResolutionCandidate@2858 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2859 {
-    <name not found> = ArrayList@2860[1] { ResolutionCandidate@2861 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2862 {
-    <name not found> = ArrayList@2863[1] { ResolutionCandidate@2864 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2865 {
-    <name not found> = ArrayList@2866[1] { ResolutionCandidate@2867 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2868 {
-    <name not found> = ArrayList@2869[1] { ResolutionCandidate@2870 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2871 {
-    <name not found> = ArrayList@2872[1] { ResolutionCandidate@2873 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2874 {
-    <name not found> = ArrayList@2875[1] { ResolutionCandidate@2876 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2877 {
-    <name not found> = ArrayList@2878[1] { ResolutionCandidate@2879 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2880 {
-    <name not found> = ArrayList@2881[1] { ResolutionCandidate@2882 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2883 {
-    <name not found> = ArrayList@2884[1] { ResolutionCandidate@2885 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2886 {
-    <name not found> = ArrayList@2887[1] { ResolutionCandidate@2888 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2889 {
-    <name not found> = ArrayList@2890[1] { ResolutionCandidate@2891 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2892 {
-    <name not found> = ArrayList@2893[1] { ResolutionCandidate@2894 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2895 {
-    <name not found> = ArrayList@2896[1] { ResolutionCandidate@2897 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2898 {
-    <name not found> = ArrayList@2899[1] { ResolutionCandidate@2900 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2901 {
-    <name not found> = ArrayList@2902[1] { ResolutionCandidate@2903 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2904 {
-    <name not found> = ArrayList@2905[1] { ResolutionCandidate@2906 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2907 {
-    <name not found> = ArrayList@2908[1] { ResolutionCandidate@2909 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2910 {
-    <name not found> = ArrayList@2911[1] { ResolutionCandidate@2912 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2913 {
-    <name not found> = ArrayList@2914[1] { ResolutionCandidate@2915 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2916 {
-    <name not found> = ArrayList@2917[1] { ResolutionCandidate@2918 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2919 {
-    <name not found> = ArrayList@2920[1] { ResolutionCandidate@2921 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2922 {
-    <name not found> = ArrayList@2923[1] { ResolutionCandidate@2924 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2925 {
-    <name not found> = ArrayList@2926[1] { ResolutionCandidate@2927 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2928 {
-    <name not found> = ArrayList@2929[1] { ResolutionCandidate@2930 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2931 {
-    <name not found> = ArrayList@2932[1] { ResolutionCandidate@2933 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2934 {
-    <name not found> = ArrayList@2935[1] { ResolutionCandidate@2936 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2937 {
-    <name not found> = ArrayList@2938[1] { ResolutionCandidate@2939 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2940 {
-    <name not found> = ArrayList@2941[1] { ResolutionCandidate@2942 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2943 {
-    <name not found> = ArrayList@2944[1] { ResolutionCandidate@2945 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2946 {
-    <name not found> = ArrayList@2947[1] { ResolutionCandidate@2948 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2949 {
-    <name not found> = ArrayList@2950[1] { ResolutionCandidate@2951 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2952 {
-    <name not found> = ArrayList@2953[1] { ResolutionCandidate@2954 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2955 {
-    <name not found> = ArrayList@2956[1] { ResolutionCandidate@2957 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2958 {
-    <name not found> = ArrayList@2959[1] { ResolutionCandidate@2960 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2961 {
-    <name not found> = ArrayList@2962[1] { ResolutionCandidate@2963 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2964 {
-    <name not found> = ArrayList@2965[1] { ResolutionCandidate@2966 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2967 {
-    <name not found> = ArrayList@2968[1] { ResolutionCandidate@2969 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2970 {
-    <name not found> = ArrayList@2971[1] { ResolutionCandidate@2972 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2973 {
-    <name not found> = ArrayList@2974[1] { ResolutionCandidate@2975 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2976 {
-    <name not found> = ArrayList@2977[1] { ResolutionCandidate@2978 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2979 {
-    <name not found> = ArrayList@2980[1] { ResolutionCandidate@2981 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2982 {
-    <name not found> = ArrayList@2983[1] { ResolutionCandidate@2984 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2985 {
-    <name not found> = ArrayList@2986[1] { ResolutionCandidate@2987 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2988 {
-    <name not found> = ArrayList@2989[1] { ResolutionCandidate@2990 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2991 {
-    <name not found> = ArrayList@2992[1] { ResolutionCandidate@2993 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2994 {
-    <name not found> = ArrayList@2995[1] { ResolutionCandidate@2996 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@2997 {
-    <name not found> = ArrayList@2998[1] { ResolutionCandidate@2999 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3000 {
-    <name not found> = ArrayList@3001[1] { ResolutionCandidate@3002 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3003 {
-    <name not found> = ArrayList@3004[1] { ResolutionCandidate@3005 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3006 {
-    <name not found> = ArrayList@3007[1] { ResolutionCandidate@3008 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3009 {
-    <name not found> = ArrayList@3010[1] { ResolutionCandidate@3011 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3012 {
-    <name not found> = ArrayList@3013[1] { ResolutionCandidate@3014 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3015 {
-    <name not found> = ArrayList@3016[1] { ResolutionCandidate@3017 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3018 {
-    <name not found> = ArrayList@3019[1] { ResolutionCandidate@3020 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3021 {
-    <name not found> = ArrayList@3022[1] { ResolutionCandidate@3023 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3024 {
-    <name not found> = ArrayList@3025[1] { ResolutionCandidate@3026 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3027 {
-    <name not found> = ArrayList@3028[1] { ResolutionCandidate@3029 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3030 {
-    <name not found> = ArrayList@3031[1] { ResolutionCandidate@3032 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3033 {
-    <name not found> = ArrayList@3034[1] { ResolutionCandidate@3035 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3036 {
-    <name not found> = ArrayList@3037[1] { ResolutionCandidate@3038 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3039 {
-    <name not found> = ArrayList@3040[1] { ResolutionCandidate@3041 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3042 {
-    <name not found> = ArrayList@3043[1] { ResolutionCandidate@3044 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3045 {
-    <name not found> = ArrayList@3046[1] { ResolutionCandidate@3047 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3048 {
-    <name not found> = ArrayList@3049[1] { ResolutionCandidate@3050 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3051 {
-    <name not found> = ArrayList@3052[1] { ResolutionCandidate@3053 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3054 {
-    <name not found> = ArrayList@3055[1] { ResolutionCandidate@3056 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3057 {
-    <name not found> = ArrayList@3058[1] { ResolutionCandidate@3059 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3060 {
-    <name not found> = ArrayList@3061[1] { ResolutionCandidate@3062 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3063 {
-    <name not found> = ArrayList@3064[1] { ResolutionCandidate@3065 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3066 {
-    <name not found> = ArrayList@3067[1] { ResolutionCandidate@3068 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3069 {
-    <name not found> = ArrayList@3070[1] { ResolutionCandidate@3071 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3072 {
-    <name not found> = ArrayList@3073[1] { ResolutionCandidate@3074 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3075 {
-    <name not found> = ArrayList@3076[1] { ResolutionCandidate@3077 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3078 {
-    <name not found> = ArrayList@3079[1] { ResolutionCandidate@3080 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3081 {
-    <name not found> = ArrayList@3082[1] { ResolutionCandidate@3083 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3084 {
-    <name not found> = ArrayList@3085[1] { ResolutionCandidate@3086 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3087 {
-    <name not found> = ArrayList@3088[1] { ResolutionCandidate@3089 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3090 {
-    <name not found> = ArrayList@3091[1] { ResolutionCandidate@3092 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3093 {
-    <name not found> = ArrayList@3094[1] { ResolutionCandidate@3095 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3096 {
-    <name not found> = ArrayList@3097[1] { ResolutionCandidate@3098 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3099 {
-    <name not found> = ArrayList@3100[1] { ResolutionCandidate@3101 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3102 {
-    <name not found> = ArrayList@3103[1] { ResolutionCandidate@3104 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3105 {
-    <name not found> = ArrayList@3106[1] { ResolutionCandidate@3107 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3108 {
-    <name not found> = ArrayList@3109[1] { ResolutionCandidate@3110 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3111 {
-    <name not found> = ArrayList@3112[1] { ResolutionCandidate@3113 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3114 {
-    <name not found> = ArrayList@3115[1] { ResolutionCandidate@3116 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3117 {
-    <name not found> = ArrayList@3118[1] { ResolutionCandidate@3119 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3120 {
-    <name not found> = ArrayList@3121[1] { ResolutionCandidate@3122 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3123 {
-    <name not found> = ArrayList@3124[1] { ResolutionCandidate@3125 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3126 {
-    <name not found> = ArrayList@3127[1] { ResolutionCandidate@3128 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3129 {
-    <name not found> = ArrayList@3130[1] { ResolutionCandidate@3131 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3132 {
-    <name not found> = ArrayList@3133[1] { ResolutionCandidate@3134 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3135 {
-    <name not found> = ArrayList@3136[1] { ResolutionCandidate@3137 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3138 {
-    <name not found> = ArrayList@3139[1] { ResolutionCandidate@3140 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3141 {
-    <name not found> = ArrayList@3142[1] { ResolutionCandidate@3143 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3144 {
-    <name not found> = ArrayList@3145[1] { ResolutionCandidate@3146 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3147 {
-    <name not found> = ArrayList@3148[1] { ResolutionCandidate@3149 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3150 {
-    <name not found> = ArrayList@3151[1] { ResolutionCandidate@3152 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3153 {
-    <name not found> = ArrayList@3154[1] { ResolutionCandidate@3155 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3156 {
-    <name not found> = ArrayList@3157[1] { ResolutionCandidate@3158 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3159 {
-    <name not found> = ArrayList@3160[1] { ResolutionCandidate@3161 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3162 {
-    <name not found> = ArrayList@3163[1] { ResolutionCandidate@3164 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3165 {
-    <name not found> = ArrayList@3166[1] { ResolutionCandidate@3167 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3168 {
-    <name not found> = ArrayList@3169[1] { ResolutionCandidate@3170 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3171 {
-    <name not found> = ArrayList@3172[1] { ResolutionCandidate@3173 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3174 {
-    <name not found> = ArrayList@3175[1] { ResolutionCandidate@3176 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3177 {
-    <name not found> = ArrayList@3178[1] { ResolutionCandidate@3179 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3180 {
-    <name not found> = ArrayList@3181[1] { ResolutionCandidate@3182 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3183 {
-    <name not found> = ArrayList@3184[1] { ResolutionCandidate@3185 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3186 {
-    <name not found> = ArrayList@3187[1] { ResolutionCandidate@3188 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3189 {
-    <name not found> = ArrayList@3190[1] { ResolutionCandidate@3191 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3192 {
-    <name not found> = ArrayList@3193[1] { ResolutionCandidate@3194 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3195 {
-    <name not found> = ArrayList@3196[1] { ResolutionCandidate@3197 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3198 {
-    <name not found> = ArrayList@3199[1] { ResolutionCandidate@3200 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3201 {
-    <name not found> = ArrayList@3202[1] { ResolutionCandidate@3203 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3204 {
-    <name not found> = ArrayList@3205[1] { ResolutionCandidate@3206 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3207 {
-    <name not found> = ArrayList@3208[1] { ResolutionCandidate@3209 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3210 {
-    <name not found> = ArrayList@3211[1] { ResolutionCandidate@3212 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3213 {
-    <name not found> = ArrayList@3214[1] { ResolutionCandidate@3215 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3216 {
-    <name not found> = ArrayList@3217[1] { ResolutionCandidate@3218 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3219 {
-    <name not found> = ArrayList@3220[1] { ResolutionCandidate@3221 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3222 {
-    <name not found> = ArrayList@3223[1] { ResolutionCandidate@3224 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3225 {
-    <name not found> = ArrayList@3226[1] { ResolutionCandidate@3227 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3228 {
-    <name not found> = ArrayList@3229[1] { ResolutionCandidate@3230 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3231 {
-    <name not found> = ArrayList@3232[1] { ResolutionCandidate@3233 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3234 {
-    <name not found> = ArrayList@3235[1] { ResolutionCandidate@3236 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3237 {
-    <name not found> = ArrayList@3238[1] { ResolutionCandidate@3239 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3240 {
-    <name not found> = ArrayList@3241[1] { ResolutionCandidate@3242 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3243 {
-    <name not found> = ArrayList@3244[1] { ResolutionCandidate@3245 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3246 {
-    <name not found> = ArrayList@3247[1] { ResolutionCandidate@3248 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3249 {
-    <name not found> = ArrayList@3250[1] { ResolutionCandidate@3251 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3252 {
-    <name not found> = ArrayList@3253[1] { ResolutionCandidate@3254 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3255 {
-    <name not found> = ArrayList@3256[1] { ResolutionCandidate@3257 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3258 {
-    <name not found> = ArrayList@3259[1] { ResolutionCandidate@3260 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3261 {
-    <name not found> = ArrayList@3262[1] { ResolutionCandidate@3263 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3264 {
-    <name not found> = ArrayList@3265[1] { ResolutionCandidate@3266 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3267 {
-    <name not found> = ArrayList@3268[1] { ResolutionCandidate@3269 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3270 {
-    <name not found> = ArrayList@3271[1] { ResolutionCandidate@3272 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3273 {
-    <name not found> = ArrayList@3274[1] { ResolutionCandidate@3275 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3276 {
-    <name not found> = ArrayList@3277[1] { ResolutionCandidate@3278 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3279 {
-    <name not found> = ArrayList@3280[1] { ResolutionCandidate@3281 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3282 {
-    <name not found> = ArrayList@3283[1] { ResolutionCandidate@3284 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3285 {
-    <name not found> = ArrayList@3286[1] { ResolutionCandidate@3287 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3288 {
-    <name not found> = ArrayList@3289[1] { ResolutionCandidate@3290 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3291 {
-    <name not found> = ArrayList@3292[1] { ResolutionCandidate@3293 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3294 {
-    <name not found> = ArrayList@3295[1] { ResolutionCandidate@3296 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3297 {
-    <name not found> = ArrayList@3298[1] { ResolutionCandidate@3299 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3300 {
-    <name not found> = ArrayList@3301[1] { ResolutionCandidate@3302 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3303 {
-    <name not found> = ArrayList@3304[1] { ResolutionCandidate@3305 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3306 {
-    <name not found> = ArrayList@3307[1] { ResolutionCandidate@3308 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3309 {
-    <name not found> = ArrayList@3310[1] { ResolutionCandidate@3311 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3312 {
-    <name not found> = ArrayList@3313[1] { ResolutionCandidate@3314 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3315 {
-    <name not found> = ArrayList@3316[1] { ResolutionCandidate@3317 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3318 {
-    <name not found> = ArrayList@3319[1] { ResolutionCandidate@3320 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3321 {
-    <name not found> = ArrayList@3322[1] { ResolutionCandidate@3323 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3324 {
-    <name not found> = ArrayList@3325[1] { ResolutionCandidate@3326 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3327 {
-    <name not found> = ArrayList@3328[1] { ResolutionCandidate@3329 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3330 {
-    <name not found> = ArrayList@3331[1] { ResolutionCandidate@3332 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3333 {
-    <name not found> = ArrayList@3334[1] { ResolutionCandidate@3335 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3336 {
-    <name not found> = ArrayList@3337[1] { ResolutionCandidate@3338 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3339 {
-    <name not found> = ArrayList@3340[1] { ResolutionCandidate@3341 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3342 {
-    <name not found> = ArrayList@3343[1] { ResolutionCandidate@3344 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3345 {
-    <name not found> = ArrayList@3346[1] { ResolutionCandidate@3347 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3348 {
-    <name not found> = ArrayList@3349[1] { ResolutionCandidate@3350 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3351 {
-    <name not found> = ArrayList@3352[1] { ResolutionCandidate@3353 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3354 {
-    <name not found> = ArrayList@3355[1] { ResolutionCandidate@3356 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3357 {
-    <name not found> = ArrayList@3358[1] { ResolutionCandidate@3359 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3360 {
-    <name not found> = ArrayList@3361[1] { ResolutionCandidate@3362 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3363 {
-    <name not found> = ArrayList@3364[1] { ResolutionCandidate@3365 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3366 {
-    <name not found> = ArrayList@3367[1] { ResolutionCandidate@3368 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3369 {
-    <name not found> = ArrayList@3370[1] { ResolutionCandidate@3371 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3372 {
-    <name not found> = ArrayList@3373[1] { ResolutionCandidate@3374 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3375 {
-    <name not found> = ArrayList@3376[1] { ResolutionCandidate@3377 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3378 {
-    <name not found> = ArrayList@3379[1] { ResolutionCandidate@3380 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3381 {
-    <name not found> = ArrayList@3382[1] { ResolutionCandidate@3383 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3384 {
-    <name not found> = ArrayList@3385[1] { ResolutionCandidate@3386 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3387 {
-    <name not found> = ArrayList@3388[1] { ResolutionCandidate@3389 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3390 {
-    <name not found> = ArrayList@3391[1] { ResolutionCandidate@3392 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3393 {
-    <name not found> = ArrayList@3394[1] { ResolutionCandidate@3395 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3396 {
-    <name not found> = ArrayList@3397[1] { ResolutionCandidate@3398 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3399 {
-    <name not found> = ArrayList@3400[1] { ResolutionCandidate@3401 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3402 {
-    <name not found> = ArrayList@3403[1] { ResolutionCandidate@3404 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3405 {
-    <name not found> = ArrayList@3406[1] { ResolutionCandidate@3407 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3408 {
-    <name not found> = ArrayList@3409[1] { ResolutionCandidate@3410 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3411 {
-    <name not found> = ArrayList@3412[1] { ResolutionCandidate@3413 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3414 {
-    <name not found> = ArrayList@3415[1] { ResolutionCandidate@3416 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3417 {
-    <name not found> = ArrayList@3418[1] { ResolutionCandidate@3419 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3420 {
-    <name not found> = ArrayList@3421[1] { ResolutionCandidate@3422 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3423 {
-    <name not found> = ArrayList@3424[1] { ResolutionCandidate@3425 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3426 {
-    <name not found> = ArrayList@3427[1] { ResolutionCandidate@3428 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3429 {
-    <name not found> = ArrayList@3430[1] { ResolutionCandidate@3431 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3432 {
-    <name not found> = ArrayList@3433[1] { ResolutionCandidate@3434 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3435 {
-    <name not found> = ArrayList@3436[1] { ResolutionCandidate@3437 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3438 {
-    <name not found> = ArrayList@3439[1] { ResolutionCandidate@3440 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3441 {
-    <name not found> = ArrayList@3442[1] { ResolutionCandidate@3443 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3444 {
-    <name not found> = ArrayList@3445[1] { ResolutionCandidate@3446 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3447 {
-    <name not found> = ArrayList@3448[1] { ResolutionCandidate@3449 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3450 {
-    <name not found> = ArrayList@3451[1] { ResolutionCandidate@3452 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3453 {
-    <name not found> = ArrayList@3454[1] { ResolutionCandidate@3455 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3456 {
-    <name not found> = ArrayList@3457[1] { ResolutionCandidate@3458 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3459 {
-    <name not found> = ArrayList@3460[1] { ResolutionCandidate@3461 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3462 {
-    <name not found> = ArrayList@3463[1] { ResolutionCandidate@3464 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3465 {
-    <name not found> = ArrayList@3466[1] { ResolutionCandidate@3467 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3468 {
-    <name not found> = ArrayList@3469[1] { ResolutionCandidate@3470 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3471 {
-    <name not found> = ArrayList@3472[1] { ResolutionCandidate@3473 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3474 {
-    <name not found> = ArrayList@3475[1] { ResolutionCandidate@3476 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3477 {
-    <name not found> = ArrayList@3478[1] { ResolutionCandidate@3479 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3480 {
-    <name not found> = ArrayList@3481[1] { ResolutionCandidate@3482 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3483 {
-    <name not found> = ArrayList@3484[1] { ResolutionCandidate@3485 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3486 {
-    <name not found> = ArrayList@3487[1] { ResolutionCandidate@3488 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3489 {
-    <name not found> = ArrayList@3490[1] { ResolutionCandidate@3491 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3492 {
-    <name not found> = ArrayList@3493[1] { ResolutionCandidate@3494 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3495 {
-    <name not found> = ArrayList@3496[1] { ResolutionCandidate@3497 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3498 {
-    <name not found> = ArrayList@3499[1] { ResolutionCandidate@3500 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3501 {
-    <name not found> = ArrayList@3502[1] { ResolutionCandidate@3503 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3504 {
-    <name not found> = ArrayList@3505[1] { ResolutionCandidate@3506 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3507 {
-    <name not found> = ArrayList@3508[1] { ResolutionCandidate@3509 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3510 {
-    <name not found> = ArrayList@3511[1] { ResolutionCandidate@3512 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3513 {
-    <name not found> = ArrayList@3514[1] { ResolutionCandidate@3515 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3516 {
-    <name not found> = ArrayList@3517[1] { ResolutionCandidate@3518 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3519 {
-    <name not found> = ArrayList@3520[1] { ResolutionCandidate@3521 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3522 {
-    <name not found> = ArrayList@3523[1] { ResolutionCandidate@3524 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3525 {
-    <name not found> = ArrayList@3526[1] { ResolutionCandidate@3527 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3528 {
-    <name not found> = ArrayList@3529[1] { ResolutionCandidate@3530 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3531 {
-    <name not found> = ArrayList@3532[1] { ResolutionCandidate@3533 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3534 {
-    <name not found> = ArrayList@3535[1] { ResolutionCandidate@3536 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3537 {
-    <name not found> = ArrayList@3538[1] { ResolutionCandidate@3539 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3540 {
-    <name not found> = ArrayList@3541[1] { ResolutionCandidate@3542 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3543 {
-    <name not found> = ArrayList@3544[1] { ResolutionCandidate@3545 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3546 {
-    <name not found> = ArrayList@3547[1] { ResolutionCandidate@3548 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3549 {
-    <name not found> = ArrayList@3550[1] { ResolutionCandidate@3551 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3552 {
-    <name not found> = ArrayList@3553[1] { ResolutionCandidate@3554 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3555 {
-    <name not found> = ArrayList@3556[1] { ResolutionCandidate@3557 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3558 {
-    <name not found> = ArrayList@3559[1] { ResolutionCandidate@3560 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3561 {
-    <name not found> = ArrayList@3562[1] { ResolutionCandidate@3563 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3564 {
-    <name not found> = ArrayList@3565[1] { ResolutionCandidate@3566 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3567 {
-    <name not found> = ArrayList@3568[1] { ResolutionCandidate@3569 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3570 {
-    <name not found> = ArrayList@3571[1] { ResolutionCandidate@3572 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3573 {
-    <name not found> = ArrayList@3574[1] { ResolutionCandidate@3575 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3576 {
-    <name not found> = ArrayList@3577[1] { ResolutionCandidate@3578 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3579 {
-    <name not found> = ArrayList@3580[1] { ResolutionCandidate@3581 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3582 {
-    <name not found> = ArrayList@3583[1] { ResolutionCandidate@3584 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3585 {
-    <name not found> = ArrayList@3586[1] { ResolutionCandidate@3587 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3588 {
-    <name not found> = ArrayList@3589[1] { ResolutionCandidate@3590 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3591 {
-    <name not found> = ArrayList@3592[1] { ResolutionCandidate@3593 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3594 {
-    <name not found> = ArrayList@3595[1] { ResolutionCandidate@3596 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3597 {
-    <name not found> = ArrayList@3598[1] { ResolutionCandidate@3599 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3600 {
-    <name not found> = ArrayList@3601[1] { ResolutionCandidate@3602 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3603 {
-    <name not found> = ArrayList@3604[1] { ResolutionCandidate@3605 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3606 {
-    <name not found> = ArrayList@3607[1] { ResolutionCandidate@3608 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3609 {
-    <name not found> = ArrayList@3610[1] { ResolutionCandidate@3611 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3612 {
-    <name not found> = ArrayList@3613[1] { ResolutionCandidate@3614 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3615 {
-    <name not found> = ArrayList@3616[1] { ResolutionCandidate@3617 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3618 {
-    <name not found> = ArrayList@3619[1] { ResolutionCandidate@3620 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3621 {
-    <name not found> = ArrayList@3622[1] { ResolutionCandidate@3623 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3624 {
-    <name not found> = ArrayList@3625[1] { ResolutionCandidate@3626 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3627 {
-    <name not found> = ArrayList@3628[1] { ResolutionCandidate@3629 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3630 {
-    <name not found> = ArrayList@3631[1] { ResolutionCandidate@3632 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3633 {
-    <name not found> = ArrayList@3634[1] { ResolutionCandidate@3635 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3636 {
-    <name not found> = ArrayList@3637[1] { ResolutionCandidate@3638 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3639 {
-    <name not found> = ArrayList@3640[1] { ResolutionCandidate@3641 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3642 {
-    <name not found> = ArrayList@3643[1] { ResolutionCandidate@3644 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3645 {
-    <name not found> = ArrayList@3646[1] { ResolutionCandidate@3647 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3648 {
-    <name not found> = ArrayList@3649[1] { ResolutionCandidate@3650 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3651 {
-    <name not found> = ArrayList@3652[1] { ResolutionCandidate@3653 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3654 {
-    <name not found> = ArrayList@3655[1] { ResolutionCandidate@3656 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3657 {
-    <name not found> = ArrayList@3658[1] { ResolutionCandidate@3659 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3660 {
-    <name not found> = ArrayList@3661[1] { ResolutionCandidate@3662 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3663 {
-    <name not found> = ArrayList@3664[1] { ResolutionCandidate@3665 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3666 {
-    <name not found> = ArrayList@3667[1] { ResolutionCandidate@3668 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3669 {
-    <name not found> = ArrayList@3670[1] { ResolutionCandidate@3671 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3672 {
-    <name not found> = ArrayList@3673[1] { ResolutionCandidate@3674 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3675 {
-    <name not found> = ArrayList@3676[1] { ResolutionCandidate@3677 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3678 {
-    <name not found> = ArrayList@3679[1] { ResolutionCandidate@3680 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3681 {
-    <name not found> = ArrayList@3682[1] { ResolutionCandidate@3683 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3684 {
-    <name not found> = ArrayList@3685[1] { ResolutionCandidate@3686 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3687 {
-    <name not found> = ArrayList@3688[1] { ResolutionCandidate@3689 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3690 {
-    <name not found> = ArrayList@3691[1] { ResolutionCandidate@3692 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3693 {
-    <name not found> = ArrayList@3694[1] { ResolutionCandidate@3695 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3696 {
-    <name not found> = ArrayList@3697[1] { ResolutionCandidate@3698 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3699 {
-    <name not found> = ArrayList@3700[1] { ResolutionCandidate@3701 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3702 {
-    <name not found> = ArrayList@3703[1] { ResolutionCandidate@3704 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3705 {
-    <name not found> = ArrayList@3706[1] { ResolutionCandidate@3707 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3708 {
-    <name not found> = ArrayList@3709[1] { ResolutionCandidate@3710 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3711 {
-    <name not found> = ArrayList@3712[1] { ResolutionCandidate@3713 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3714 {
-    <name not found> = ArrayList@3715[1] { ResolutionCandidate@3716 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3717 {
-    <name not found> = ArrayList@3718[1] { ResolutionCandidate@3719 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3720 {
-    <name not found> = ArrayList@3721[1] { ResolutionCandidate@3722 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3723 {
-    <name not found> = ArrayList@3724[1] { ResolutionCandidate@3725 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3726 {
-    <name not found> = ArrayList@3727[1] { ResolutionCandidate@3728 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3729 {
-    <name not found> = ArrayList@3730[1] { ResolutionCandidate@3731 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3732 {
-    <name not found> = ArrayList@3733[1] { ResolutionCandidate@3734 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3735 {
-    <name not found> = ArrayList@3736[1] { ResolutionCandidate@3737 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3738 {
-    <name not found> = ArrayList@3739[1] { ResolutionCandidate@3740 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3741 {
-    <name not found> = ArrayList@3742[1] { ResolutionCandidate@3743 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3744 {
-    <name not found> = ArrayList@3745[1] { ResolutionCandidate@3746 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3747 {
-    <name not found> = ArrayList@3748[1] { ResolutionCandidate@3749 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3750 {
-    <name not found> = ArrayList@3751[1] { ResolutionCandidate@3752 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3753 {
-    <name not found> = ArrayList@3754[1] { ResolutionCandidate@3755 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3756 {
-    <name not found> = ArrayList@3757[1] { ResolutionCandidate@3758 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3759 {
-    <name not found> = ArrayList@3760[1] { ResolutionCandidate@3761 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3762 {
-    <name not found> = ArrayList@3763[1] { ResolutionCandidate@3764 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3765 {
-    <name not found> = ArrayList@3766[1] { ResolutionCandidate@3767 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3768 {
-    <name not found> = ArrayList@3769[1] { ResolutionCandidate@3770 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3771 {
-    <name not found> = ArrayList@3772[1] { ResolutionCandidate@3773 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3774 {
-    <name not found> = ArrayList@3775[1] { ResolutionCandidate@3776 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3777 {
-    <name not found> = ArrayList@3778[1] { ResolutionCandidate@3779 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3780 {
-    <name not found> = ArrayList@3781[1] { ResolutionCandidate@3782 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3783 {
-    <name not found> = ArrayList@3784[1] { ResolutionCandidate@3785 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3786 {
-    <name not found> = ArrayList@3787[1] { ResolutionCandidate@3788 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3789 {
-    <name not found> = ArrayList@3790[1] { ResolutionCandidate@3791 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3792 {
-    <name not found> = ArrayList@3793[1] { ResolutionCandidate@3794 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3795 {
-    <name not found> = ArrayList@3796[1] { ResolutionCandidate@3797 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3798 {
-    <name not found> = ArrayList@3799[1] { ResolutionCandidate@3800 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3801 {
-    <name not found> = ArrayList@3802[1] { ResolutionCandidate@3803 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3804 {
-    <name not found> = ArrayList@3805[1] { ResolutionCandidate@3806 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3807 {
-    <name not found> = ArrayList@3808[1] { ResolutionCandidate@3809 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3810 {
-    <name not found> = ArrayList@3811[1] { ResolutionCandidate@3812 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3813 {
-    <name not found> = ArrayList@3814[1] { ResolutionCandidate@3815 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3816 {
-    <name not found> = ArrayList@3817[1] { ResolutionCandidate@3818 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3819 {
-    <name not found> = ArrayList@3820[1] { ResolutionCandidate@3821 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3822 {
-    <name not found> = ArrayList@3823[1] { ResolutionCandidate@3824 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3825 {
-    <name not found> = ArrayList@3826[1] { ResolutionCandidate@3827 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3828 {
-    <name not found> = ArrayList@3829[1] { ResolutionCandidate@3830 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3831 {
-    <name not found> = ArrayList@3832[1] { ResolutionCandidate@3833 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3834 {
-    <name not found> = ArrayList@3835[1] { ResolutionCandidate@3836 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3837 {
-    <name not found> = ArrayList@3838[1] { ResolutionCandidate@3839 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3840 {
-    <name not found> = ArrayList@3841[1] { ResolutionCandidate@3842 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3843 {
-    <name not found> = ArrayList@3844[1] { ResolutionCandidate@3845 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3846 {
-    <name not found> = ArrayList@3847[1] { ResolutionCandidate@3848 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3849 {
-    <name not found> = ArrayList@3850[1] { ResolutionCandidate@3851 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3852 {
-    <name not found> = ArrayList@3853[1] { ResolutionCandidate@3854 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3855 {
-    <name not found> = ArrayList@3856[1] { ResolutionCandidate@3857 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3858 {
-    <name not found> = ArrayList@3859[1] { ResolutionCandidate@3860 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3861 {
-    <name not found> = ArrayList@3862[1] { ResolutionCandidate@3863 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3864 {
-    <name not found> = ArrayList@3865[1] { ResolutionCandidate@3866 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3867 {
-    <name not found> = ArrayList@3868[1] { ResolutionCandidate@3869 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3870 {
-    <name not found> = ArrayList@3871[1] { ResolutionCandidate@3872 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3873 {
-    <name not found> = ArrayList@3874[1] { ResolutionCandidate@3875 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3876 {
-    <name not found> = ArrayList@3877[1] { ResolutionCandidate@3878 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3879 {
-    <name not found> = ArrayList@3880[1] { ResolutionCandidate@3881 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3882 {
-    <name not found> = ArrayList@3883[1] { ResolutionCandidate@3884 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3885 {
-    <name not found> = ArrayList@3886[1] { ResolutionCandidate@3887 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3888 {
-    <name not found> = ArrayList@3889[1] { ResolutionCandidate@3890 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3891 {
-    <name not found> = ArrayList@3892[1] { ResolutionCandidate@3893 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3894 {
-    <name not found> = ArrayList@3895[1] { ResolutionCandidate@3896 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3897 {
-    <name not found> = ArrayList@3898[1] { ResolutionCandidate@3899 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3900 {
-    <name not found> = ArrayList@3901[1] { ResolutionCandidate@3902 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3903 {
-    <name not found> = ArrayList@3904[1] { ResolutionCandidate@3905 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3906 {
-    <name not found> = ArrayList@3907[1] { ResolutionCandidate@3908 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3909 {
-    <name not found> = ArrayList@3910[1] { ResolutionCandidate@3911 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3912 {
-    <name not found> = ArrayList@3913[1] { ResolutionCandidate@3914 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3915 {
-    <name not found> = ArrayList@3916[1] { ResolutionCandidate@3917 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3918 {
-    <name not found> = ArrayList@3919[1] { ResolutionCandidate@3920 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3921 {
-    <name not found> = ArrayList@3922[1] { ResolutionCandidate@3923 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3924 {
-    <name not found> = ArrayList@3925[1] { ResolutionCandidate@3926 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3927 {
-    <name not found> = ArrayList@3928[1] { ResolutionCandidate@3929 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3930 {
-    <name not found> = ArrayList@3931[1] { ResolutionCandidate@3932 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3933 {
-    <name not found> = ArrayList@3934[1] { ResolutionCandidate@3935 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3936 {
-    <name not found> = ArrayList@3937[1] { ResolutionCandidate@3938 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3939 {
-    <name not found> = ArrayList@3940[1] { ResolutionCandidate@3941 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3942 {
-    <name not found> = ArrayList@3943[1] { ResolutionCandidate@3944 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3945 {
-    <name not found> = ArrayList@3946[1] { ResolutionCandidate@3947 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3948 {
-    <name not found> = ArrayList@3949[1] { ResolutionCandidate@3950 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3951 {
-    <name not found> = ArrayList@3952[1] { ResolutionCandidate@3953 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3954 {
-    <name not found> = ArrayList@3955[1] { ResolutionCandidate@3956 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3957 {
-    <name not found> = ArrayList@3958[1] { ResolutionCandidate@3959 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3960 {
-    <name not found> = ArrayList@3961[1] { ResolutionCandidate@3962 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3963 {
-    <name not found> = ArrayList@3964[1] { ResolutionCandidate@3965 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3966 {
-    <name not found> = ArrayList@3967[1] { ResolutionCandidate@3968 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3969 {
-    <name not found> = ArrayList@3970[1] { ResolutionCandidate@3971 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3972 {
-    <name not found> = ArrayList@3973[1] { ResolutionCandidate@3974 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3975 {
-    <name not found> = ArrayList@3976[1] { ResolutionCandidate@3977 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3978 {
-    <name not found> = ArrayList@3979[1] { ResolutionCandidate@3980 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3981 {
-    <name not found> = ArrayList@3982[1] { ResolutionCandidate@3983 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3984 {
-    <name not found> = ArrayList@3985[1] { ResolutionCandidate@3986 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3987 {
-    <name not found> = ArrayList@3988[1] { ResolutionCandidate@3989 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3990 {
-    <name not found> = ArrayList@3991[1] { ResolutionCandidate@3992 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3993 {
-    <name not found> = ArrayList@3994[1] { ResolutionCandidate@3995 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3996 {
-    <name not found> = ArrayList@3997[1] { ResolutionCandidate@3998 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@3999 {
-    <name not found> = ArrayList@4000[1] { ResolutionCandidate@4001 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4002 {
-    <name not found> = ArrayList@4003[1] { ResolutionCandidate@4004 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4005 {
-    <name not found> = ArrayList@4006[1] { ResolutionCandidate@4007 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4008 {
-    <name not found> = ArrayList@4009[1] { ResolutionCandidate@4010 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4011 {
-    <name not found> = ArrayList@4012[1] { ResolutionCandidate@4013 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4014 {
-    <name not found> = ArrayList@4015[1] { ResolutionCandidate@4016 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4017 {
-    <name not found> = ArrayList@4018[1] { ResolutionCandidate@4019 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4020 {
-    <name not found> = ArrayList@4021[1] { ResolutionCandidate@4022 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4023 {
-    <name not found> = ArrayList@4024[1] { ResolutionCandidate@4025 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4026 {
-    <name not found> = ArrayList@4027[1] { ResolutionCandidate@4028 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4029 {
-    <name not found> = ArrayList@4030[1] { ResolutionCandidate@4031 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4032 {
-    <name not found> = ArrayList@4033[1] { ResolutionCandidate@4034 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4035 {
-    <name not found> = ArrayList@4036[1] { ResolutionCandidate@4037 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4038 {
-    <name not found> = ArrayList@4039[1] { ResolutionCandidate@4040 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4041 {
-    <name not found> = ArrayList@4042[1] { ResolutionCandidate@4043 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4044 {
-    <name not found> = ArrayList@4045[1] { ResolutionCandidate@4046 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4047 {
-    <name not found> = ArrayList@4048[1] { ResolutionCandidate@4049 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4050 {
-    <name not found> = ArrayList@4051[1] { ResolutionCandidate@4052 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4053 {
-    <name not found> = ArrayList@4054[1] { ResolutionCandidate@4055 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4056 {
-    <name not found> = ArrayList@4057[1] { ResolutionCandidate@4058 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4059 {
-    <name not found> = ArrayList@4060[1] { ResolutionCandidate@4061 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4062 {
-    <name not found> = ArrayList@4063[1] { ResolutionCandidate@4064 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4065 {
-    <name not found> = ArrayList@4066[1] { ResolutionCandidate@4067 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4068 {
-    <name not found> = ArrayList@4069[1] { ResolutionCandidate@4070 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4071 {
-    <name not found> = ArrayList@4072[1] { ResolutionCandidate@4073 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4074 {
-    <name not found> = ArrayList@4075[1] { ResolutionCandidate@4076 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4077 {
-    <name not found> = ArrayList@4078[1] { ResolutionCandidate@4079 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4080 {
-    <name not found> = ArrayList@4081[1] { ResolutionCandidate@4082 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4083 {
-    <name not found> = ArrayList@4084[1] { ResolutionCandidate@4085 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4086 {
-    <name not found> = ArrayList@4087[1] { ResolutionCandidate@4088 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4089 {
-    <name not found> = ArrayList@4090[1] { ResolutionCandidate@4091 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4092 {
-    <name not found> = ArrayList@4093[1] { ResolutionCandidate@4094 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4095 {
-    <name not found> = ArrayList@4096[1] { ResolutionCandidate@4097 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4098 {
-    <name not found> = ArrayList@4099[1] { ResolutionCandidate@4100 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4101 {
-    <name not found> = ArrayList@4102[1] { ResolutionCandidate@4103 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4104 {
-    <name not found> = ArrayList@4105[1] { ResolutionCandidate@4106 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4107 {
-    <name not found> = ArrayList@4108[1] { ResolutionCandidate@4109 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4110 {
-    <name not found> = ArrayList@4111[1] { ResolutionCandidate@4112 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4113 {
-    <name not found> = ArrayList@4114[1] { ResolutionCandidate@4115 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4116 {
-    <name not found> = ArrayList@4117[1] { ResolutionCandidate@4118 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4119 {
-    <name not found> = ArrayList@4120[1] { ResolutionCandidate@4121 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4122 {
-    <name not found> = ArrayList@4123[1] { ResolutionCandidate@4124 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4125 {
-    <name not found> = ArrayList@4126[1] { ResolutionCandidate@4127 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4128 {
-    <name not found> = ArrayList@4129[1] { ResolutionCandidate@4130 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4131 {
-    <name not found> = ArrayList@4132[1] { ResolutionCandidate@4133 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4134 {
-    <name not found> = ArrayList@4135[1] { ResolutionCandidate@4136 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4137 {
-    <name not found> = ArrayList@4138[1] { ResolutionCandidate@4139 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4140 {
-    <name not found> = ArrayList@4141[1] { ResolutionCandidate@4142 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4143 {
-    <name not found> = ArrayList@4144[1] { ResolutionCandidate@4145 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4146 {
-    <name not found> = ArrayList@4147[1] { ResolutionCandidate@4148 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4149 {
-    <name not found> = ArrayList@4150[1] { ResolutionCandidate@4151 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4152 {
-    <name not found> = ArrayList@4153[1] { ResolutionCandidate@4154 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4155 {
-    <name not found> = ArrayList@4156[1] { ResolutionCandidate@4157 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4158 {
-    <name not found> = ArrayList@4159[1] { ResolutionCandidate@4160 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4161 {
-    <name not found> = ArrayList@4162[1] { ResolutionCandidate@4163 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4164 {
-    <name not found> = ArrayList@4165[1] { ResolutionCandidate@4166 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4167 {
-    <name not found> = ArrayList@4168[1] { ResolutionCandidate@4169 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4170 {
-    <name not found> = ArrayList@4171[1] { ResolutionCandidate@4172 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4173 {
-    <name not found> = ArrayList@4174[1] { ResolutionCandidate@4175 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4176 {
-    <name not found> = ArrayList@4177[1] { ResolutionCandidate@4178 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4179 {
-    <name not found> = ArrayList@4180[1] { ResolutionCandidate@4181 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4182 {
-    <name not found> = ArrayList@4183[1] { ResolutionCandidate@4184 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4185 {
-    <name not found> = ArrayList@4186[1] { ResolutionCandidate@4187 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4188 {
-    <name not found> = ArrayList@4189[1] { ResolutionCandidate@4190 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4191 {
-    <name not found> = ArrayList@4192[1] { ResolutionCandidate@4193 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4194 {
-    <name not found> = ArrayList@4195[1] { ResolutionCandidate@4196 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4197 {
-    <name not found> = ArrayList@4198[1] { ResolutionCandidate@4199 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4200 {
-    <name not found> = ArrayList@4201[1] { ResolutionCandidate@4202 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4203 {
-    <name not found> = ArrayList@4204[1] { ResolutionCandidate@4205 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4206 {
-    <name not found> = ArrayList@4207[1] { ResolutionCandidate@4208 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4209 {
-    <name not found> = ArrayList@4210[1] { ResolutionCandidate@4211 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4212 {
-    <name not found> = ArrayList@4213[1] { ResolutionCandidate@4214 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4215 {
-    <name not found> = ArrayList@4216[1] { ResolutionCandidate@4217 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4218 {
-    <name not found> = ArrayList@4219[1] { ResolutionCandidate@4220 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4221 {
-    <name not found> = ArrayList@4222[1] { ResolutionCandidate@4223 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4224 {
-    <name not found> = ArrayList@4225[1] { ResolutionCandidate@4226 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4227 {
-    <name not found> = ArrayList@4228[1] { ResolutionCandidate@4229 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4230 {
-    <name not found> = ArrayList@4231[1] { ResolutionCandidate@4232 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4233 {
-    <name not found> = ArrayList@4234[1] { ResolutionCandidate@4235 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4236 {
-    <name not found> = ArrayList@4237[1] { ResolutionCandidate@4238 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4239 {
-    <name not found> = ArrayList@4240[1] { ResolutionCandidate@4241 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4242 {
-    <name not found> = ArrayList@4243[1] { ResolutionCandidate@4244 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4245 {
-    <name not found> = ArrayList@4246[1] { ResolutionCandidate@4247 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4248 {
-    <name not found> = ArrayList@4249[1] { ResolutionCandidate@4250 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4251 {
-    <name not found> = ArrayList@4252[1] { ResolutionCandidate@4253 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4254 {
-    <name not found> = ArrayList@4255[1] { ResolutionCandidate@4256 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4257 {
-    <name not found> = ArrayList@4258[1] { ResolutionCandidate@4259 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4260 {
-    <name not found> = ArrayList@4261[1] { ResolutionCandidate@4262 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4263 {
-    <name not found> = ArrayList@4264[1] { ResolutionCandidate@4265 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4266 {
-    <name not found> = ArrayList@4267[1] { ResolutionCandidate@4268 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4269 {
-    <name not found> = ArrayList@4270[1] { ResolutionCandidate@4271 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4272 {
-    <name not found> = ArrayList@4273[1] { ResolutionCandidate@4274 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4275 {
-    <name not found> = ArrayList@4276[1] { ResolutionCandidate@4277 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4278 {
-    <name not found> = ArrayList@4279[1] { ResolutionCandidate@4280 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4281 {
-    <name not found> = ArrayList@4282[1] { ResolutionCandidate@4283 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4284 {
-    <name not found> = ArrayList@4285[1] { ResolutionCandidate@4286 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4287 {
-    <name not found> = ArrayList@4288[1] { ResolutionCandidate@4289 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4290 {
-    <name not found> = ArrayList@4291[1] { ResolutionCandidate@4292 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4293 {
-    <name not found> = ArrayList@4294[1] { ResolutionCandidate@4295 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4296 {
-    <name not found> = ArrayList@4297[1] { ResolutionCandidate@4298 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4299 {
-    <name not found> = ArrayList@4300[1] { ResolutionCandidate@4301 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4302 {
-    <name not found> = ArrayList@4303[1] { ResolutionCandidate@4304 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4305 {
-    <name not found> = ArrayList@4306[1] { ResolutionCandidate@4307 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4308 {
-    <name not found> = ArrayList@4309[1] { ResolutionCandidate@4310 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4311 {
-    <name not found> = ArrayList@4312[1] { ResolutionCandidate@4313 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4314 {
-    <name not found> = ArrayList@4315[1] { ResolutionCandidate@4316 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4317 {
-    <name not found> = ArrayList@4318[1] { ResolutionCandidate@4319 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4320 {
-    <name not found> = ArrayList@4321[1] { ResolutionCandidate@4322 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4323 {
-    <name not found> = ArrayList@4324[1] { ResolutionCandidate@4325 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4326 {
-    <name not found> = ArrayList@4327[1] { ResolutionCandidate@4328 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4329 {
-    <name not found> = ArrayList@4330[1] { ResolutionCandidate@4331 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4332 {
-    <name not found> = ArrayList@4333[1] { ResolutionCandidate@4334 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4335 {
-    <name not found> = ArrayList@4336[1] { ResolutionCandidate@4337 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4338 {
-    <name not found> = ArrayList@4339[1] { ResolutionCandidate@4340 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4341 {
-    <name not found> = ArrayList@4342[1] { ResolutionCandidate@4343 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4344 {
-    <name not found> = ArrayList@4345[1] { ResolutionCandidate@4346 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4347 {
-    <name not found> = ArrayList@4348[1] { ResolutionCandidate@4349 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4350 {
-    <name not found> = ArrayList@4351[1] { ResolutionCandidate@4352 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4353 {
-    <name not found> = ArrayList@4354[1] { ResolutionCandidate@4355 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4356 {
-    <name not found> = ArrayList@4357[1] { ResolutionCandidate@4358 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4359 {
-    <name not found> = ArrayList@4360[1] { ResolutionCandidate@4361 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4362 {
-    <name not found> = ArrayList@4363[1] { ResolutionCandidate@4364 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4365 {
-    <name not found> = ArrayList@4366[1] { ResolutionCandidate@4367 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4368 {
-    <name not found> = ArrayList@4369[1] { ResolutionCandidate@4370 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4371 {
-    <name not found> = ArrayList@4372[1] { ResolutionCandidate@4373 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4374 {
-    <name not found> = ArrayList@4375[1] { ResolutionCandidate@4376 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4377 {
-    <name not found> = ArrayList@4378[1] { ResolutionCandidate@4379 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4380 {
-    <name not found> = ArrayList@4381[1] { ResolutionCandidate@4382 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4383 {
-    <name not found> = ArrayList@4384[1] { ResolutionCandidate@4385 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4386 {
-    <name not found> = ArrayList@4387[1] { ResolutionCandidate@4388 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4389 {
-    <name not found> = ArrayList@4390[1] { ResolutionCandidate@4391 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4392 {
-    <name not found> = ArrayList@4393[1] { ResolutionCandidate@4394 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4395 {
-    <name not found> = ArrayList@4396[1] { ResolutionCandidate@4397 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4398 {
-    <name not found> = ArrayList@4399[1] { ResolutionCandidate@4400 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4401 {
-    <name not found> = ArrayList@4402[1] { ResolutionCandidate@4403 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4404 {
-    <name not found> = ArrayList@4405[1] { ResolutionCandidate@4406 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4407 {
-    <name not found> = ArrayList@4408[1] { ResolutionCandidate@4409 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4410 {
-    <name not found> = ArrayList@4411[1] { ResolutionCandidate@4412 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4413 {
-    <name not found> = ArrayList@4414[1] { ResolutionCandidate@4415 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4416 {
-    <name not found> = ArrayList@4417[1] { ResolutionCandidate@4418 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4419 {
-    <name not found> = ArrayList@4420[1] { ResolutionCandidate@4421 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4422 {
-    <name not found> = ArrayList@4423[1] { ResolutionCandidate@4424 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4425 {
-    <name not found> = ArrayList@4426[1] { ResolutionCandidate@4427 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4428 {
-    <name not found> = ArrayList@4429[1] { ResolutionCandidate@4430 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4431 {
-    <name not found> = ArrayList@4432[1] { ResolutionCandidate@4433 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4434 {
-    <name not found> = ArrayList@4435[1] { ResolutionCandidate@4436 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4437 {
-    <name not found> = ArrayList@4438[1] { ResolutionCandidate@4439 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4440 {
-    <name not found> = ArrayList@4441[1] { ResolutionCandidate@4442 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4443 {
-    <name not found> = ArrayList@4444[1] { ResolutionCandidate@4445 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4446 {
-    <name not found> = ArrayList@4447[1] { ResolutionCandidate@4448 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4449 {
-    <name not found> = ArrayList@4450[1] { ResolutionCandidate@4451 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4452 {
-    <name not found> = ArrayList@4453[1] { ResolutionCandidate@4454 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4455 {
-    <name not found> = ArrayList@4456[1] { ResolutionCandidate@4457 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4458 {
-    <name not found> = ArrayList@4459[1] { ResolutionCandidate@4460 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4461 {
-    <name not found> = ArrayList@4462[1] { ResolutionCandidate@4463 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4464 {
-    <name not found> = ArrayList@4465[1] { ResolutionCandidate@4466 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4467 {
-    <name not found> = ArrayList@4468[1] { ResolutionCandidate@4469 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4470 {
-    <name not found> = ArrayList@4471[1] { ResolutionCandidate@4472 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4473 {
-    <name not found> = ArrayList@4474[1] { ResolutionCandidate@4475 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4476 {
-    <name not found> = ArrayList@4477[1] { ResolutionCandidate@4478 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4479 {
-    <name not found> = ArrayList@4480[1] { ResolutionCandidate@4481 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4482 {
-    <name not found> = ArrayList@4483[1] { ResolutionCandidate@4484 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4485 {
-    <name not found> = ArrayList@4486[1] { ResolutionCandidate@4487 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4488 {
-    <name not found> = ArrayList@4489[1] { ResolutionCandidate@4490 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4491 {
-    <name not found> = ArrayList@4492[1] { ResolutionCandidate@4493 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4494 {
-    <name not found> = ArrayList@4495[1] { ResolutionCandidate@4496 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4497 {
-    <name not found> = ArrayList@4498[1] { ResolutionCandidate@4499 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4500 {
-    <name not found> = ArrayList@4501[1] { ResolutionCandidate@4502 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4503 {
-    <name not found> = ArrayList@4504[1] { ResolutionCandidate@4505 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4506 {
-    <name not found> = ArrayList@4507[1] { ResolutionCandidate@4508 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4509 {
-    <name not found> = ArrayList@4510[1] { ResolutionCandidate@4511 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4512 {
-    <name not found> = ArrayList@4513[1] { ResolutionCandidate@4514 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4515 {
-    <name not found> = ArrayList@4516[1] { ResolutionCandidate@4517 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4518 {
-    <name not found> = ArrayList@4519[1] { ResolutionCandidate@4520 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4521 {
-    <name not found> = ArrayList@4522[1] { ResolutionCandidate@4523 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4524 {
-    <name not found> = ArrayList@4525[1] { ResolutionCandidate@4526 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4527 {
-    <name not found> = ArrayList@4528[1] { ResolutionCandidate@4529 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4530 {
-    <name not found> = ArrayList@4531[1] { ResolutionCandidate@4532 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4533 {
-    <name not found> = ArrayList@4534[1] { ResolutionCandidate@4535 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4536 {
-    <name not found> = ArrayList@4537[1] { ResolutionCandidate@4538 }
-    <name not found> = EmptyList@299[empty]
-}
-
-ResolutionTaskHolder@4539 {
-    <name not found> = ArrayList@4540[1] { ResolutionCandidate@4541 }
-}
-
-ResolutionTaskHolder@4542 {
-    <name not found> = ArrayList@4543[1] { ResolutionCandidate@4544 }
-}
-
-ResolutionTaskHolder@4545 {
-    <name not found> = ArrayList@4546[1] { ResolutionCandidate@4547 }
-}
-
-ResolutionTaskHolder@4548 {
-    <name not found> = ArrayList@4549[1] { ResolutionCandidate@4550 }
-}
-
-ResolutionTaskHolder@4551 {
-    <name not found> = ArrayList@4552[1] { ResolutionCandidate@4553 }
-}
-
-ResolutionTaskHolder@4554 {
-    <name not found> = ArrayList@4555[1] { ResolutionCandidate@4556 }
-}
-
-ResolutionTaskHolder@4557 {
-    <name not found> = ArrayList@4558[1] { ResolutionCandidate@4559 }
-}
-
-ResolutionTaskHolder@4560 {
-    <name not found> = ArrayList@4561[1] { ResolutionCandidate@4562 }
-}
-
-ResolutionTaskHolder@4563 {
-    <name not found> = ArrayList@4564[1] { ResolutionCandidate@4565 }
-}
-
-ResolutionTaskHolder@4566 {
-    <name not found> = ArrayList@4567[1] { ResolutionCandidate@4568 }
-}
-
-ResolutionTaskHolder@4569 {
-    <name not found> = ArrayList@4570[1] { ResolutionCandidate@4571 }
-}
-
-ResolutionTaskHolder@4572 {
-    <name not found> = ArrayList@4573[1] { ResolutionCandidate@4574 }
-}
-
-ResolutionTaskHolder@4575 {
-    <name not found> = ArrayList@4576[1] { ResolutionCandidate@4577 }
-}
-
-ResolutionTaskHolder@4578 {
-    <name not found> = ArrayList@4579[1] { ResolutionCandidate@4580 }
-}
-
-ResolutionTaskHolder@4581 {
-    <name not found> = ArrayList@4582[1] { ResolutionCandidate@4583 }
-}
-
-ResolutionTaskHolder@4584 {
-    <name not found> = ArrayList@4585[1] { ResolutionCandidate@4586 }
-}
-
-ResolutionTaskHolder@4587 {
-    <name not found> = ArrayList@4588[1] { ResolutionCandidate@4589 }
-}
-
-ResolutionTaskHolder@4590 {
-    <name not found> = ArrayList@4591[1] { ResolutionCandidate@4592 }
-}
-
-ResolutionTaskHolder@4593 {
-    <name not found> = ArrayList@4594[1] { ResolutionCandidate@4595 }
-}
-
-ResolutionTaskHolder@4596 {
-    <name not found> = ArrayList@4597[1] { ResolutionCandidate@4598 }
-}
-
-ResolutionTaskHolder@4599 {
-    <name not found> = ArrayList@4600[1] { ResolutionCandidate@4601 }
-}
-
-ResolutionTaskHolder@4602 {
-    <name not found> = ArrayList@4603[1] { ResolutionCandidate@4604 }
-}
-
-ResolutionTaskHolder@4605 {
-    <name not found> = ArrayList@4606[1] { ResolutionCandidate@4607 }
-}
-
-ResolutionTaskHolder@4608 {
-    <name not found> = ArrayList@4609[1] { ResolutionCandidate@4610 }
-}
-
-ResolutionTaskHolder@4611 {
-    <name not found> = ArrayList@4612[1] { ResolutionCandidate@4613 }
-}
-
-ResolutionTaskHolder@4614 {
-    <name not found> = ArrayList@4615[1] { ResolutionCandidate@4616 }
-}
-
-ResolutionTaskHolder@4617 {
-    <name not found> = ArrayList@4618[1] { ResolutionCandidate@4619 }
-}
-
-ResolutionTaskHolder@4620 {
-    <name not found> = ArrayList@4621[1] { ResolutionCandidate@4622 }
-}
-
-ResolutionTaskHolder@4623 {
-    <name not found> = ArrayList@4624[1] { ResolutionCandidate@4625 }
-}
-
-ResolutionTaskHolder@4626 {
-    <name not found> = ArrayList@4627[1] { ResolutionCandidate@4628 }
-}
-
-ResolutionTaskHolder@4629 {
-    <name not found> = ArrayList@4630[1] { ResolutionCandidate@4631 }
-}
-
-ResolutionTaskHolder@4632 {
-    <name not found> = ArrayList@4633[1] { ResolutionCandidate@4634 }
-}
-
-ResolutionTaskHolder@4635 {
-    <name not found> = ArrayList@4636[1] { ResolutionCandidate@4637 }
-}
-
-ResolutionTaskHolder@4638 {
-    <name not found> = ArrayList@4639[1] { ResolutionCandidate@4640 }
-}
-
-ResolutionTaskHolder@4641 {
-    <name not found> = ArrayList@4642[1] { ResolutionCandidate@4643 }
-}
-
-ResolutionTaskHolder@4644 {
-    <name not found> = ArrayList@4645[1] { ResolutionCandidate@4646 }
-}
-
-ResolutionTaskHolder@4647 {
-    <name not found> = ArrayList@4648[1] { ResolutionCandidate@4649 }
-}
-
-ResolutionTaskHolder@4650 {
-    <name not found> = ArrayList@4651[1] { ResolutionCandidate@4652 }
-}
-
-ResolutionTaskHolder@4653 {
-    <name not found> = ArrayList@4654[1] { ResolutionCandidate@4655 }
-}
-
-ResolutionTaskHolder@4656 {
-    <name not found> = ArrayList@4657[1] { ResolutionCandidate@4658 }
-}
-
-ResolutionTaskHolder@4659 {
-    <name not found> = ArrayList@4660[1] { ResolutionCandidate@4661 }
-}
-
-ResolutionTaskHolder@4662 {
-    <name not found> = ArrayList@4663[1] { ResolutionCandidate@4664 }
-}
-
-ResolutionTaskHolder@4665 {
-    <name not found> = ArrayList@4666[1] { ResolutionCandidate@4667 }
-}
-
-ResolutionTaskHolder@4668 {
-    <name not found> = ArrayList@4669[1] { ResolutionCandidate@4670 }
-}
-
-ResolutionTaskHolder@4671 {
-    <name not found> = ArrayList@4672[1] { ResolutionCandidate@4673 }
-}
-
-ResolutionTaskHolder@4674 {
-    <name not found> = ArrayList@4675[1] { ResolutionCandidate@4676 }
-}
-
-ResolutionTaskHolder@4677 {
-    <name not found> = ArrayList@4678[1] { ResolutionCandidate@4679 }
-}
-
-ResolutionTaskHolder@4680 {
-    <name not found> = ArrayList@4681[1] { ResolutionCandidate@4682 }
-}
-
-ResolutionTaskHolder@4683 {
-    <name not found> = ArrayList@4684[1] { ResolutionCandidate@4685 }
-}
-
-ResolutionTaskHolder@4686 {
-    <name not found> = ArrayList@4687[1] { ResolutionCandidate@4688 }
-}
-
-ResolutionTaskHolder@4689 {
-    <name not found> = ArrayList@4690[1] { ResolutionCandidate@4691 }
-}
-
-ResolutionTaskHolder@4692 {
-    <name not found> = ArrayList@4693[1] { ResolutionCandidate@4694 }
-}
-
-ResolutionTaskHolder@4695 {
-    <name not found> = ArrayList@4696[1] { ResolutionCandidate@4697 }
-}
-
-ResolutionTaskHolder@4698 {
-    <name not found> = ArrayList@4699[1] { ResolutionCandidate@4700 }
-}
-
-ResolutionTaskHolder@4701 {
-    <name not found> = ArrayList@4702[1] { ResolutionCandidate@4703 }
-}
-
-ResolutionTaskHolder@4704 {
-    <name not found> = ArrayList@4705[1] { ResolutionCandidate@4706 }
-}
-
-ResolutionTaskHolder@4707 {
-    <name not found> = ArrayList@4708[1] { ResolutionCandidate@4709 }
-}
-
-ResolutionTaskHolder@4710 {
-    <name not found> = ArrayList@4711[1] { ResolutionCandidate@4712 }
-}
-
-ResolutionTaskHolder@4713 {
-    <name not found> = ArrayList@4714[1] { ResolutionCandidate@4715 }
-}
-
-ResolutionTaskHolder@4716 {
-    <name not found> = ArrayList@4717[1] { ResolutionCandidate@4718 }
-}
-
-ResolutionTaskHolder@4719 {
-    <name not found> = ArrayList@4720[1] { ResolutionCandidate@4721 }
-}
-
-ResolutionTaskHolder@4722 {
-    <name not found> = ArrayList@4723[1] { ResolutionCandidate@4724 }
-}
-
-ResolutionTaskHolder@4725 {
-    <name not found> = ArrayList@4726[1] { ResolutionCandidate@4727 }
-}
-
-ResolutionTaskHolder@4728 {
-    <name not found> = ArrayList@4729[1] { ResolutionCandidate@4730 }
-}
-
-ResolutionTaskHolder@4731 {
-    <name not found> = ArrayList@4732[1] { ResolutionCandidate@4733 }
-}
-
-ResolutionTaskHolder@4734 {
-    <name not found> = ArrayList@4735[1] { ResolutionCandidate@4736 }
-}
-
-ResolutionTaskHolder@4737 {
-    <name not found> = ArrayList@4738[1] { ResolutionCandidate@4739 }
-}
-
-ResolutionTaskHolder@4740 {
-    <name not found> = ArrayList@4741[1] { ResolutionCandidate@4742 }
-}
-
-ResolutionTaskHolder@4743 {
-    <name not found> = ArrayList@4744[1] { ResolutionCandidate@4745 }
-}
-
-ResolutionTaskHolder@4746 {
-    <name not found> = ArrayList@4747[1] { ResolutionCandidate@4748 }
-}
-
-ResolutionTaskHolder@4749 {
-    <name not found> = ArrayList@4750[1] { ResolutionCandidate@4751 }
-}
-
-ResolutionTaskHolder@4752 {
-    <name not found> = ArrayList@4753[1] { ResolutionCandidate@4754 }
-}
-
-ResolutionTaskHolder@4755 {
-    <name not found> = ArrayList@4756[1] { ResolutionCandidate@4757 }
-}
-
-ResolutionTaskHolder@4758 {
-    <name not found> = ArrayList@4759[1] { ResolutionCandidate@4760 }
-}
-
-ResolutionTaskHolder@4761 {
-    <name not found> = ArrayList@4762[1] { ResolutionCandidate@4763 }
-}
-
-ResolutionTaskHolder@4764 {
-    <name not found> = ArrayList@4765[1] { ResolutionCandidate@4766 }
-}
-
-ResolutionTaskHolder@4767 {
-    <name not found> = ArrayList@4768[1] { ResolutionCandidate@4769 }
-}
-
-ResolutionTaskHolder@4770 {
-    <name not found> = ArrayList@4771[1] { ResolutionCandidate@4772 }
-}
-
-ResolutionTaskHolder@4773 {
-    <name not found> = ArrayList@4774[1] { ResolutionCandidate@4775 }
-}
-
-ResolutionTaskHolder@4776 {
-    <name not found> = ArrayList@4777[1] { ResolutionCandidate@4778 }
-}
-
-ResolutionTaskHolder@4779 {
-    <name not found> = ArrayList@4780[1] { ResolutionCandidate@4781 }
-}
-
-ResolutionTaskHolder@4782 {
-    <name not found> = ArrayList@4783[1] { ResolutionCandidate@4784 }
-}
-
-ResolutionTaskHolder@4785 {
-    <name not found> = ArrayList@4786[1] { ResolutionCandidate@4787 }
-}
-
-ResolutionTaskHolder@4788 {
-    <name not found> = ArrayList@4789[1] { ResolutionCandidate@4790 }
-}
-
-ResolutionTaskHolder@4791 {
-    <name not found> = ArrayList@4792[1] { ResolutionCandidate@4793 }
-}
-
-ResolutionTaskHolder@4794 {
-    <name not found> = ArrayList@4795[1] { ResolutionCandidate@4796 }
-}
-
-ResolutionTaskHolder@4797 {
-    <name not found> = ArrayList@4798[1] { ResolutionCandidate@4799 }
-}
-
-ResolutionTaskHolder@4800 {
-    <name not found> = ArrayList@4801[1] { ResolutionCandidate@4802 }
-}
-
-ResolutionTaskHolder@4803 {
-    <name not found> = ArrayList@4804[1] { ResolutionCandidate@4805 }
-}
-
-ResolutionTaskHolder@4806 {
-    <name not found> = ArrayList@4807[1] { ResolutionCandidate@4808 }
-}
-
-ResolutionTaskHolder@4809 {
-    <name not found> = ArrayList@4810[1] { ResolutionCandidate@4811 }
-}
-
-ResolutionTaskHolder@4812 {
-    <name not found> = ArrayList@4813[1] { ResolutionCandidate@4814 }
-}
-
-ResolutionTaskHolder@4815 {
-    <name not found> = ArrayList@4816[1] { ResolutionCandidate@4817 }
-}
-
-ResolutionTaskHolder@4818 {
-    <name not found> = ArrayList@4819[1] { ResolutionCandidate@4820 }
-}
-
-ResolutionTaskHolder@4821 {
-    <name not found> = ArrayList@4822[1] { ResolutionCandidate@4823 }
-}
-
-ResolutionTaskHolder@4824 {
-    <name not found> = ArrayList@4825[1] { ResolutionCandidate@4826 }
-}
-
-ResolutionTaskHolder@4827 {
-    <name not found> = ArrayList@4828[1] { ResolutionCandidate@4829 }
-}
-
-ResolutionTaskHolder@4830 {
-    <name not found> = ArrayList@4831[1] { ResolutionCandidate@4832 }
-}
-
-ResolutionTaskHolder@4833 {
-    <name not found> = ArrayList@4834[1] { ResolutionCandidate@4835 }
-}
-
-ResolutionTaskHolder@4836 {
-    <name not found> = ArrayList@4837[1] { ResolutionCandidate@4838 }
-}
-
-ResolutionTaskHolder@4839 {
-    <name not found> = ArrayList@4840[1] { ResolutionCandidate@4841 }
-}
-
-ResolutionTaskHolder@4842 {
-    <name not found> = ArrayList@4843[1] { ResolutionCandidate@4844 }
-}
-
-ResolutionTaskHolder@4845 {
-    <name not found> = ArrayList@4846[1] { ResolutionCandidate@4847 }
-}
-
-ResolutionTaskHolder@4848 {
-    <name not found> = ArrayList@4849[1] { ResolutionCandidate@4850 }
-}
-
-ResolutionTaskHolder@4851 {
-    <name not found> = ArrayList@4852[1] { ResolutionCandidate@4853 }
-}
-
-ResolutionTaskHolder@4854 {
-    <name not found> = ArrayList@4855[1] { ResolutionCandidate@4856 }
-}
-
-ResolutionTaskHolder@4857 {
-    <name not found> = ArrayList@4858[1] { ResolutionCandidate@4859 }
-}
-
-ResolutionTaskHolder@4860 {
-    <name not found> = ArrayList@4861[1] { ResolutionCandidate@4862 }
-}
-
-ResolutionTaskHolder@4863 {
-    <name not found> = ArrayList@4864[1] { ResolutionCandidate@4865 }
-}
-
-ResolutionTaskHolder@4866 {
-    <name not found> = ArrayList@4867[1] { ResolutionCandidate@4868 }
-}
-
-ResolutionTaskHolder@4869 {
-    <name not found> = ArrayList@4870[1] { ResolutionCandidate@4871 }
-}
-
-ResolutionTaskHolder@4872 {
-    <name not found> = ArrayList@4873[1] { ResolutionCandidate@4874 }
-}
-
-ResolutionTaskHolder@4875 {
-    <name not found> = ArrayList@4876[1] { ResolutionCandidate@4877 }
-}
-
-ResolutionTaskHolder@4878 {
-    <name not found> = ArrayList@4879[1] { ResolutionCandidate@4880 }
-}
-
-ResolutionTaskHolder@4881 {
-    <name not found> = ArrayList@4882[1] { ResolutionCandidate@4883 }
-}
-
-ResolutionTaskHolder@4884 {
-    <name not found> = ArrayList@4885[1] { ResolutionCandidate@4886 }
-}
-
-ResolutionTaskHolder@4887 {
-    <name not found> = ArrayList@4888[1] { ResolutionCandidate@4889 }
-}
-
-ResolutionTaskHolder@4890 {
-    <name not found> = ArrayList@4891[1] { ResolutionCandidate@4892 }
-}
-
-ResolutionTaskHolder@4893 {
-    <name not found> = ArrayList@4894[1] { ResolutionCandidate@4895 }
-}
-
-ResolutionTaskHolder@4896 {
-    <name not found> = ArrayList@4897[1] { ResolutionCandidate@4898 }
-}
-
-ResolutionTaskHolder@4899 {
-    <name not found> = ArrayList@4900[1] { ResolutionCandidate@4901 }
-}
-
-ResolutionTaskHolder@4902 {
-    <name not found> = ArrayList@4903[1] { ResolutionCandidate@4904 }
-}
-
-ResolutionTaskHolder@4905 {
-    <name not found> = ArrayList@4906[1] { ResolutionCandidate@4907 }
-}
-
-ResolutionTaskHolder@4908 {
-    <name not found> = ArrayList@4909[1] { ResolutionCandidate@4910 }
-}
-
-ResolutionTaskHolder@4911 {
-    <name not found> = ArrayList@4912[1] { ResolutionCandidate@4913 }
-}
-
-ResolutionTaskHolder@4914 {
-    <name not found> = ArrayList@4915[1] { ResolutionCandidate@4916 }
-}
-
-ResolutionTaskHolder@4917 {
-    <name not found> = ArrayList@4918[1] { ResolutionCandidate@4919 }
-}
-
-ResolutionTaskHolder@4920 {
-    <name not found> = ArrayList@4921[1] { ResolutionCandidate@4922 }
-}
-
-ResolutionTaskHolder@4923 {
-    <name not found> = ArrayList@4924[1] { ResolutionCandidate@4925 }
-}
-
-ResolutionTaskHolder@4926 {
-    <name not found> = ArrayList@4927[1] { ResolutionCandidate@4928 }
-}
-
-ResolutionTaskHolder@4929 {
-    <name not found> = ArrayList@4930[1] { ResolutionCandidate@4931 }
-}
-
-ResolutionTaskHolder@4932 {
-    <name not found> = ArrayList@4933[1] { ResolutionCandidate@4934 }
-}
-
-ResolutionTaskHolder@4935 {
-    <name not found> = ArrayList@4936[1] { ResolutionCandidate@4937 }
-}
-
-ResolutionTaskHolder@4938 {
-    <name not found> = ArrayList@4939[1] { ResolutionCandidate@4940 }
-}
-
-ResolutionTaskHolder@4941 {
-    <name not found> = ArrayList@4942[1] { ResolutionCandidate@4943 }
-}
-
-ResolutionTaskHolder@4944 {
-    <name not found> = ArrayList@4945[1] { ResolutionCandidate@4946 }
-}
-
-ResolutionTaskHolder@4947 {
-    <name not found> = ArrayList@4948[1] { ResolutionCandidate@4949 }
-}
-
-ResolutionTaskHolder@4950 {
-    <name not found> = ArrayList@4951[1] { ResolutionCandidate@4952 }
-}
-
-ResolutionTaskHolder@4953 {
-    <name not found> = ArrayList@4954[1] { ResolutionCandidate@4955 }
-}
-
-ResolutionTaskHolder@4956 {
-    <name not found> = ArrayList@4957[1] { ResolutionCandidate@4958 }
-}
-
-ResolutionTaskHolder@4959 {
-    <name not found> = ArrayList@4960[1] { ResolutionCandidate@4961 }
-}
-
-ResolutionTaskHolder@4962 {
-    <name not found> = ArrayList@4963[1] { ResolutionCandidate@4964 }
-}
-
-ResolutionTaskHolder@4965 {
-    <name not found> = ArrayList@4966[1] { ResolutionCandidate@4967 }
-}
-
-ResolutionTaskHolder@4968 {
-    <name not found> = ArrayList@4969[1] { ResolutionCandidate@4970 }
-}
-
-ResolutionTaskHolder@4971 {
-    <name not found> = ArrayList@4972[1] { ResolutionCandidate@4973 }
-}
-
-ResolutionTaskHolder@4974 {
-    <name not found> = ArrayList@4975[1] { ResolutionCandidate@4976 }
-}
-
-ResolutionTaskHolder@4977 {
-    <name not found> = ArrayList@4978[1] { ResolutionCandidate@4979 }
-}
-
-ResolutionTaskHolder@4980 {
-    <name not found> = ArrayList@4981[1] { ResolutionCandidate@4982 }
-}
-
-ResolutionTaskHolder@4983 {
-    <name not found> = ArrayList@4984[1] { ResolutionCandidate@4985 }
-}
-
-ResolutionTaskHolder@4986 {
-    <name not found> = ArrayList@4987[1] { ResolutionCandidate@4988 }
-}
-
-ResolutionTaskHolder@4989 {
-    <name not found> = ArrayList@4990[1] { ResolutionCandidate@4991 }
-}
-
-ResolutionTaskHolder@4992 {
-    <name not found> = ArrayList@4993[1] { ResolutionCandidate@4994 }
-}
-
-ResolutionTaskHolder@4995 {
-    <name not found> = ArrayList@4996[1] { ResolutionCandidate@4997 }
-}
-
-ResolutionTaskHolder@4998 {
-    <name not found> = ArrayList@4999[1] { ResolutionCandidate@5000 }
-}
-
-ResolutionTaskHolder@5001 {
-    <name not found> = ArrayList@5002[1] { ResolutionCandidate@5003 }
-}
-
-ResolutionTaskHolder@5004 {
-    <name not found> = ArrayList@5005[1] { ResolutionCandidate@5006 }
-}
-
-ResolutionTaskHolder@5007 {
-    <name not found> = ArrayList@5008[1] { ResolutionCandidate@5009 }
-}
-
-ResolutionTaskHolder@5010 {
-    <name not found> = ArrayList@5011[1] { ResolutionCandidate@5012 }
-}
-
-ResolutionTaskHolder@5013 {
-    <name not found> = ArrayList@5014[1] { ResolutionCandidate@5015 }
-}
-
-ResolutionTaskHolder@5016 {
-    <name not found> = ArrayList@5017[1] { ResolutionCandidate@5018 }
-}
-
-ResolutionTaskHolder@5019 {
-    <name not found> = ArrayList@5020[1] { ResolutionCandidate@5021 }
-}
-
-ResolutionTaskHolder@5022 {
-    <name not found> = ArrayList@5023[1] { ResolutionCandidate@5024 }
-}
-
-ResolutionTaskHolder@5025 {
-    <name not found> = ArrayList@5026[1] { ResolutionCandidate@5027 }
-}
-
-ResolutionTaskHolder@5028 {
-    <name not found> = ArrayList@5029[1] { ResolutionCandidate@5030 }
-}
-
-ResolutionTaskHolder@5031 {
-    <name not found> = ArrayList@5032[1] { ResolutionCandidate@5033 }
-}
-
-ResolutionTaskHolder@5034 {
-    <name not found> = ArrayList@5035[1] { ResolutionCandidate@5036 }
-}
-
-ResolutionTaskHolder@5037 {
-    <name not found> = ArrayList@5038[1] { ResolutionCandidate@5039 }
-}
-
-ResolutionTaskHolder@5040 {
-    <name not found> = ArrayList@5041[1] { ResolutionCandidate@5042 }
-}
-
-ResolutionTaskHolder@5043 {
-    <name not found> = ArrayList@5044[1] { ResolutionCandidate@5045 }
-}
-
-ResolutionTaskHolder@5046 {
-    <name not found> = ArrayList@5047[1] { ResolutionCandidate@5048 }
-}
-
-ResolutionTaskHolder@5049 {
-    <name not found> = ArrayList@5050[1] { ResolutionCandidate@5051 }
-}
-
-ResolutionTaskHolder@5052 {
-    <name not found> = ArrayList@5053[1] { ResolutionCandidate@5054 }
-}
-
-ResolutionTaskHolder@5055 {
-    <name not found> = ArrayList@5056[1] { ResolutionCandidate@5057 }
-}
-
-ResolutionTaskHolder@5058 {
-    <name not found> = ArrayList@5059[1] { ResolutionCandidate@5060 }
-}
-
-ResolutionTaskHolder@5061 {
-    <name not found> = ArrayList@5062[1] { ResolutionCandidate@5063 }
-}
-
-ResolutionTaskHolder@5064 {
-    <name not found> = ArrayList@5065[1] { ResolutionCandidate@5066 }
-}
-
-ResolutionTaskHolder@5067 {
-    <name not found> = ArrayList@5068[1] { ResolutionCandidate@5069 }
-}
-
-ResolutionTaskHolder@5070 {
-    <name not found> = ArrayList@5071[1] { ResolutionCandidate@5072 }
-}
-
-ResolutionTaskHolder@5073 {
-    <name not found> = ArrayList@5074[1] { ResolutionCandidate@5075 }
-}
-
-ResolutionTaskHolder@5076 {
-    <name not found> = ArrayList@5077[1] { ResolutionCandidate@5078 }
-}
-
-ResolutionTaskHolder@5079 {
-    <name not found> = ArrayList@5080[1] { ResolutionCandidate@5081 }
-}
-
-ResolutionTaskHolder@5082 {
-    <name not found> = ArrayList@5083[1] { ResolutionCandidate@5084 }
-}
-
-ResolutionTaskHolder@5085 {
-    <name not found> = ArrayList@5086[1] { ResolutionCandidate@5087 }
-}
-
-ResolutionTaskHolder@5088 {
-    <name not found> = ArrayList@5089[1] { ResolutionCandidate@5090 }
-}
-
-ResolutionTaskHolder@5091 {
-    <name not found> = ArrayList@5092[1] { ResolutionCandidate@5093 }
-}
-
-ResolutionTaskHolder@5094 {
-    <name not found> = ArrayList@5095[1] { ResolutionCandidate@5096 }
-}
-
-ResolutionTaskHolder@5097 {
-    <name not found> = ArrayList@5098[1] { ResolutionCandidate@5099 }
-}
-
-ResolutionTaskHolder@5100 {
-    <name not found> = ArrayList@5101[1] { ResolutionCandidate@5102 }
-}
-
-ResolutionTaskHolder@5103 {
-    <name not found> = ArrayList@5104[1] { ResolutionCandidate@5105 }
-}
-
-ResolutionTaskHolder@5106 {
-    <name not found> = ArrayList@5107[1] { ResolutionCandidate@5108 }
-}
-
-ResolutionTaskHolder@5109 {
-    <name not found> = ArrayList@5110[1] { ResolutionCandidate@5111 }
-}
-
-ResolutionTaskHolder@5112 {
-    <name not found> = ArrayList@5113[1] { ResolutionCandidate@5114 }
-}
-
-ResolutionTaskHolder@5115 {
-    <name not found> = ArrayList@5116[1] { ResolutionCandidate@5117 }
-}
-
-ResolutionTaskHolder@5118 {
-    <name not found> = ArrayList@5119[1] { ResolutionCandidate@5120 }
-}
-
-ResolutionTaskHolder@5121 {
-    <name not found> = ArrayList@5122[1] { ResolutionCandidate@5123 }
-}
-
-ResolutionTaskHolder@5124 {
-    <name not found> = ArrayList@5125[1] { ResolutionCandidate@5126 }
-}
-
-ResolutionTaskHolder@5127 {
-    <name not found> = ArrayList@5128[1] { ResolutionCandidate@5129 }
-}
-
-ResolutionTaskHolder@5130 {
-    <name not found> = ArrayList@5131[1] { ResolutionCandidate@5132 }
-}
-
-ResolutionTaskHolder@5133 {
-    <name not found> = ArrayList@5134[1] { ResolutionCandidate@5135 }
-}
-
-ResolutionTaskHolder@5136 {
-    <name not found> = ArrayList@5137[1] { ResolutionCandidate@5138 }
-}
-
-ResolutionTaskHolder@5139 {
-    <name not found> = ArrayList@5140[1] { ResolutionCandidate@5141 }
-}
-
-ResolutionTaskHolder@5142 {
-    <name not found> = ArrayList@5143[1] { ResolutionCandidate@5144 }
-}
-
-ResolutionTaskHolder@5145 {
-    <name not found> = ArrayList@5146[1] { ResolutionCandidate@5147 }
-}
-
-ResolutionTaskHolder@5148 {
-    <name not found> = ArrayList@5149[1] { ResolutionCandidate@5150 }
-}
-
-ResolutionTaskHolder@5151 {
-    <name not found> = ArrayList@5152[1] { ResolutionCandidate@5153 }
-}
-
-ResolutionTaskHolder@5154 {
-    <name not found> = ArrayList@5155[1] { ResolutionCandidate@5156 }
-}
-
-ResolutionTaskHolder@5157 {
-    <name not found> = ArrayList@5158[1] { ResolutionCandidate@5159 }
-}
-
-ResolutionTaskHolder@5160 {
-    <name not found> = ArrayList@5161[1] { ResolutionCandidate@5162 }
-}
-
-ResolutionTaskHolder@5163 {
-    <name not found> = ArrayList@5164[1] { ResolutionCandidate@5165 }
-}
-
-ResolutionTaskHolder@5166 {
-    <name not found> = ArrayList@5167[1] { ResolutionCandidate@5168 }
-}
-
-ResolutionTaskHolder@5169 {
-    <name not found> = ArrayList@5170[1] { ResolutionCandidate@5171 }
-}
-
-ResolutionTaskHolder@5172 {
-    <name not found> = ArrayList@5173[1] { ResolutionCandidate@5174 }
-}
-
-ResolutionTaskHolder@5175 {
-    <name not found> = ArrayList@5176[1] { ResolutionCandidate@5177 }
-}
-
-ResolutionTaskHolder@5178 {
-    <name not found> = ArrayList@5179[1] { ResolutionCandidate@5180 }
-}
-
-ResolutionTaskHolder@5181 {
-    <name not found> = ArrayList@5182[1] { ResolutionCandidate@5183 }
-}
-
-ResolutionTaskHolder@5184 {
-    <name not found> = ArrayList@5185[1] { ResolutionCandidate@5186 }
-}
-
-ResolutionTaskHolder@5187 {
-    <name not found> = ArrayList@5188[1] { ResolutionCandidate@5189 }
-}
-
-ResolutionTaskHolder@5190 {
-    <name not found> = ArrayList@5191[1] { ResolutionCandidate@5192 }
-}
-
-ResolutionTaskHolder@5193 {
-    <name not found> = ArrayList@5194[1] { ResolutionCandidate@5195 }
-}
-
-ResolutionTaskHolder@5196 {
-    <name not found> = ArrayList@5197[1] { ResolutionCandidate@5198 }
-}
-
-ResolutionTaskHolder@5199 {
-    <name not found> = ArrayList@5200[1] { ResolutionCandidate@5201 }
-}
-
-ResolutionTaskHolder@5202 {
-    <name not found> = ArrayList@5203[1] { ResolutionCandidate@5204 }
-}
-
-ResolutionTaskHolder@5205 {
-    <name not found> = ArrayList@5206[1] { ResolutionCandidate@5207 }
-}
-
-ResolutionTaskHolder@5208 {
-    <name not found> = ArrayList@5209[1] { ResolutionCandidate@5210 }
-}
-
-ResolutionTaskHolder@5211 {
-    <name not found> = ArrayList@5212[1] { ResolutionCandidate@5213 }
-}
-
-ResolutionTaskHolder@5214 {
-    <name not found> = ArrayList@5215[1] { ResolutionCandidate@5216 }
-}
-
-ResolutionTaskHolder@5217 {
-    <name not found> = ArrayList@5218[1] { ResolutionCandidate@5219 }
-}
-
-ResolutionTaskHolder@5220 {
-    <name not found> = ArrayList@5221[1] { ResolutionCandidate@5222 }
-}
-
-ResolutionTaskHolder@5223 {
-    <name not found> = ArrayList@5224[1] { ResolutionCandidate@5225 }
-}
-
-ResolutionTaskHolder@5226 {
-    <name not found> = ArrayList@5227[1] { ResolutionCandidate@5228 }
-}
-
-ResolutionTaskHolder@5229 {
-    <name not found> = ArrayList@5230[1] { ResolutionCandidate@5231 }
-}
-
-ResolutionTaskHolder@5232 {
-    <name not found> = ArrayList@5233[1] { ResolutionCandidate@5234 }
-}
-
-ResolutionTaskHolder@5235 {
-    <name not found> = ArrayList@5236[1] { ResolutionCandidate@5237 }
-}
-
-ResolutionTaskHolder@5238 {
-    <name not found> = ArrayList@5239[1] { ResolutionCandidate@5240 }
-}
-
-ResolutionTaskHolder@5241 {
-    <name not found> = ArrayList@5242[1] { ResolutionCandidate@5243 }
-}
-
-ResolutionTaskHolder@5244 {
-    <name not found> = ArrayList@5245[1] { ResolutionCandidate@5246 }
-}
-
-ResolutionTaskHolder@5247 {
-    <name not found> = ArrayList@5248[1] { ResolutionCandidate@5249 }
-}
-
-ResolutionTaskHolder@5250 {
-    <name not found> = ArrayList@5251[1] { ResolutionCandidate@5252 }
-}
-
-ResolutionTaskHolder@5253 {
-    <name not found> = ArrayList@5254[1] { ResolutionCandidate@5255 }
-}
-
-ResolutionTaskHolder@5256 {
-    <name not found> = ArrayList@5257[1] { ResolutionCandidate@5258 }
-}
-
-ResolutionTaskHolder@5259 {
-    <name not found> = ArrayList@5260[1] { ResolutionCandidate@5261 }
-}
-
-ResolutionTaskHolder@5262 {
-    <name not found> = ArrayList@5263[1] { ResolutionCandidate@5264 }
-}
-
-ResolutionTaskHolder@5265 {
-    <name not found> = ArrayList@5266[1] { ResolutionCandidate@5267 }
-}
-
-ResolutionTaskHolder@5268 {
-    <name not found> = ArrayList@5269[1] { ResolutionCandidate@5270 }
-}
-
-ResolutionTaskHolder@5271 {
-    <name not found> = ArrayList@5272[1] { ResolutionCandidate@5273 }
-}
-
-ResolutionTaskHolder@5274 {
-    <name not found> = ArrayList@5275[1] { ResolutionCandidate@5276 }
-}
-
-ResolutionTaskHolder@5277 {
-    <name not found> = ArrayList@5278[1] { ResolutionCandidate@5279 }
-}
-
-ResolutionTaskHolder@5280 {
-    <name not found> = ArrayList@5281[1] { ResolutionCandidate@5282 }
-}
-
-ResolutionTaskHolder@5283 {
-    <name not found> = ArrayList@5284[1] { ResolutionCandidate@5285 }
-}
-
-ResolutionTaskHolder@5286 {
-    <name not found> = ArrayList@5287[1] { ResolutionCandidate@5288 }
-}
-
-ResolutionTaskHolder@5289 {
-    <name not found> = ArrayList@5290[1] { ResolutionCandidate@5291 }
-}
-
-ResolutionTaskHolder@5292 {
-    <name not found> = ArrayList@5293[1] { ResolutionCandidate@5294 }
-}
-
-ResolutionTaskHolder@5295 {
-    <name not found> = ArrayList@5296[1] { ResolutionCandidate@5297 }
-}
-
-ResolutionTaskHolder@5298 {
-    <name not found> = ArrayList@5299[1] { ResolutionCandidate@5300 }
-}
-
-ResolutionTaskHolder@5301 {
-    <name not found> = ArrayList@5302[1] { ResolutionCandidate@5303 }
-}
-
-ResolutionTaskHolder@5304 {
-    <name not found> = ArrayList@5305[1] { ResolutionCandidate@5306 }
-}
-
-ResolutionTaskHolder@5307 {
-    <name not found> = ArrayList@5308[1] { ResolutionCandidate@5309 }
-}
-
-ResolutionTaskHolder@5310 {
-    <name not found> = ArrayList@5311[1] { ResolutionCandidate@5312 }
-}
-
-ResolutionTaskHolder@5313 {
-    <name not found> = ArrayList@5314[1] { ResolutionCandidate@5315 }
-}
-
-ResolutionTaskHolder@5316 {
-    <name not found> = ArrayList@5317[1] { ResolutionCandidate@5318 }
-}
-
-ResolutionTaskHolder@5319 {
-    <name not found> = ArrayList@5320[1] { ResolutionCandidate@5321 }
-}
-
-ResolutionTaskHolder@5322 {
-    <name not found> = ArrayList@5323[1] { ResolutionCandidate@5324 }
-}
-
-ResolutionTaskHolder@5325 {
-    <name not found> = ArrayList@5326[1] { ResolutionCandidate@5327 }
-}
-
-ResolutionTaskHolder@5328 {
-    <name not found> = ArrayList@5329[1] { ResolutionCandidate@5330 }
-}
-
-ResolutionTaskHolder@5331 {
-    <name not found> = ArrayList@5332[1] { ResolutionCandidate@5333 }
-}
-
-ResolutionTaskHolder@5334 {
-    <name not found> = ArrayList@5335[1] { ResolutionCandidate@5336 }
-}
-
-ResolutionTaskHolder@5337 {
-    <name not found> = ArrayList@5338[1] { ResolutionCandidate@5339 }
-}
-
-ResolutionTaskHolder@5340 {
-    <name not found> = ArrayList@5341[1] { ResolutionCandidate@5342 }
-}
-
-ResolutionTaskHolder@5343 {
-    <name not found> = ArrayList@5344[1] { ResolutionCandidate@5345 }
-}
-
-ResolutionTaskHolder@5346 {
-    <name not found> = ArrayList@5347[1] { ResolutionCandidate@5348 }
-}
-
-ResolutionTaskHolder@5349 {
-    <name not found> = ArrayList@5350[1] { ResolutionCandidate@5351 }
-}
-
-ResolutionTaskHolder@5352 {
-    <name not found> = ArrayList@5353[1] { ResolutionCandidate@5354 }
-}
-
-ResolutionTaskHolder@5355 {
-    <name not found> = ArrayList@5356[1] { ResolutionCandidate@5357 }
-}
-
-ResolutionTaskHolder@5358 {
-    <name not found> = ArrayList@5359[1] { ResolutionCandidate@5360 }
-}
-
-ResolutionTaskHolder@5361 {
-    <name not found> = ArrayList@5362[1] { ResolutionCandidate@5363 }
-}
-
-ResolutionTaskHolder@5364 {
-    <name not found> = ArrayList@5365[1] { ResolutionCandidate@5366 }
-}
-
-ResolutionTaskHolder@5367 {
-    <name not found> = ArrayList@5368[1] { ResolutionCandidate@5369 }
-}
-
-ResolutionTaskHolder@5370 {
-    <name not found> = ArrayList@5371[1] { ResolutionCandidate@5372 }
-}
-
-ResolutionTaskHolder@5373 {
-    <name not found> = ArrayList@5374[1] { ResolutionCandidate@5375 }
-}
-
-ResolutionTaskHolder@5376 {
-    <name not found> = ArrayList@5377[1] { ResolutionCandidate@5378 }
-}
-
-ResolutionTaskHolder@5379 {
-    <name not found> = ArrayList@5380[1] { ResolutionCandidate@5381 }
-}
-
-ResolutionTaskHolder@5382 {
-    <name not found> = ArrayList@5383[1] { ResolutionCandidate@5384 }
-}
-
-ResolutionTaskHolder@5385 {
-    <name not found> = ArrayList@5386[1] { ResolutionCandidate@5387 }
-}
-
-ResolutionTaskHolder@5388 {
-    <name not found> = ArrayList@5389[1] { ResolutionCandidate@5390 }
-}
-
-ResolutionTaskHolder@5391 {
-    <name not found> = ArrayList@5392[1] { ResolutionCandidate@5393 }
-}
-
-ResolutionTaskHolder@5394 {
-    <name not found> = ArrayList@5395[1] { ResolutionCandidate@5396 }
-}
-
-ResolutionTaskHolder@5397 {
-    <name not found> = ArrayList@5398[1] { ResolutionCandidate@5399 }
-}
-
-ResolutionTaskHolder@5400 {
-    <name not found> = ArrayList@5401[1] { ResolutionCandidate@5402 }
-}
-
-ResolutionTaskHolder@5403 {
-    <name not found> = ArrayList@5404[1] { ResolutionCandidate@5405 }
-}
-
-ResolutionTaskHolder@5406 {
-    <name not found> = ArrayList@5407[1] { ResolutionCandidate@5408 }
-}
-
-ResolutionTaskHolder@5409 {
-    <name not found> = ArrayList@5410[1] { ResolutionCandidate@5411 }
-}
-
-ResolutionTaskHolder@5412 {
-    <name not found> = ArrayList@5413[1] { ResolutionCandidate@5414 }
-}
-
-ResolutionTaskHolder@5415 {
-    <name not found> = ArrayList@5416[1] { ResolutionCandidate@5417 }
-}
-
-ResolutionTaskHolder@5418 {
-    <name not found> = ArrayList@5419[1] { ResolutionCandidate@5420 }
-}
-
-ResolutionTaskHolder@5421 {
-    <name not found> = ArrayList@5422[1] { ResolutionCandidate@5423 }
-}
-
-ResolutionTaskHolder@5424 {
-    <name not found> = ArrayList@5425[1] { ResolutionCandidate@5426 }
-}
-
-ResolutionTaskHolder@5427 {
-    <name not found> = ArrayList@5428[1] { ResolutionCandidate@5429 }
-}
-
-ResolutionTaskHolder@5430 {
-    <name not found> = ArrayList@5431[1] { ResolutionCandidate@5432 }
-}
-
-ResolutionTaskHolder@5433 {
-    <name not found> = ArrayList@5434[1] { ResolutionCandidate@5435 }
-}
-
-ResolutionTaskHolder@5436 {
-    <name not found> = ArrayList@5437[1] { ResolutionCandidate@5438 }
-}
-
-ResolutionTaskHolder@5439 {
-    <name not found> = ArrayList@5440[1] { ResolutionCandidate@5441 }
-}
-
-ResolutionTaskHolder@5442 {
-    <name not found> = ArrayList@5443[1] { ResolutionCandidate@5444 }
-}
-
-ResolutionTaskHolder@5445 {
-    <name not found> = ArrayList@5446[1] { ResolutionCandidate@5447 }
-}
-
-ResolutionTaskHolder@5448 {
-    <name not found> = ArrayList@5449[1] { ResolutionCandidate@5450 }
-}
-
-ResolutionTaskHolder@5451 {
-    <name not found> = ArrayList@5452[1] { ResolutionCandidate@5453 }
-}
-
-ResolutionTaskHolder@5454 {
-    <name not found> = ArrayList@5455[1] { ResolutionCandidate@5456 }
-}
-
-ResolutionTaskHolder@5457 {
-    <name not found> = ArrayList@5458[1] { ResolutionCandidate@5459 }
-}
-
-ResolutionTaskHolder@5460 {
-    <name not found> = ArrayList@5461[1] { ResolutionCandidate@5462 }
-}
-
-ResolutionTaskHolder@5463 {
-    <name not found> = ArrayList@5464[1] { ResolutionCandidate@5465 }
-}
-
-ResolutionTaskHolder@5466 {
-    <name not found> = ArrayList@5467[1] { ResolutionCandidate@5468 }
-}
-
-ResolutionTaskHolder@5469 {
-    <name not found> = ArrayList@5470[1] { ResolutionCandidate@5471 }
-}
-
-ResolutionTaskHolder@5472 {
-    <name not found> = ArrayList@5473[1] { ResolutionCandidate@5474 }
-}
-
-ResolutionTaskHolder@5475 {
-    <name not found> = ArrayList@5476[1] { ResolutionCandidate@5477 }
-}
-
-ResolutionTaskHolder@5478 {
-    <name not found> = ArrayList@5479[1] { ResolutionCandidate@5480 }
-}
-
-ResolutionTaskHolder@5481 {
-    <name not found> = ArrayList@5482[1] { ResolutionCandidate@5483 }
-}
-
-ResolutionTaskHolder@5484 {
-    <name not found> = ArrayList@5485[1] { ResolutionCandidate@5486 }
-}
-
-ResolutionTaskHolder@5487 {
-    <name not found> = ArrayList@5488[1] { ResolutionCandidate@5489 }
-}
-
-ResolutionTaskHolder@5490 {
-    <name not found> = ArrayList@5491[1] { ResolutionCandidate@5492 }
-}
-
-ResolutionTaskHolder@5493 {
-    <name not found> = ArrayList@5494[1] { ResolutionCandidate@5495 }
-}
-
-ResolutionTaskHolder@5496 {
-    <name not found> = ArrayList@5497[1] { ResolutionCandidate@5498 }
-}
-
-ResolutionTaskHolder@5499 {
-    <name not found> = ArrayList@5500[1] { ResolutionCandidate@5501 }
-}
-
-ResolutionTaskHolder@5502 {
-    <name not found> = ArrayList@5503[1] { ResolutionCandidate@5504 }
-}
-
-ResolutionTaskHolder@5505 {
-    <name not found> = ArrayList@5506[1] { ResolutionCandidate@5507 }
-}
-
-ResolutionTaskHolder@5508 {
-    <name not found> = ArrayList@5509[1] { ResolutionCandidate@5510 }
-}
-
-ResolutionTaskHolder@5511 {
-    <name not found> = ArrayList@5512[1] { ResolutionCandidate@5513 }
-}
-
-ResolutionTaskHolder@5514 {
-    <name not found> = ArrayList@5515[1] { ResolutionCandidate@5516 }
-}
-
-ResolutionTaskHolder@5517 {
-    <name not found> = ArrayList@5518[1] { ResolutionCandidate@5519 }
-}
-
-ResolutionTaskHolder@5520 {
-    <name not found> = ArrayList@5521[1] { ResolutionCandidate@5522 }
-}
-
-ResolutionTaskHolder@5523 {
-    <name not found> = ArrayList@5524[1] { ResolutionCandidate@5525 }
-}
-
-ResolutionTaskHolder@5526 {
-    <name not found> = ArrayList@5527[1] { ResolutionCandidate@5528 }
-}
-
-ResolutionTaskHolder@5529 {
-    <name not found> = ArrayList@5530[1] { ResolutionCandidate@5531 }
-}
-
-ResolutionTaskHolder@5532 {
-    <name not found> = ArrayList@5533[1] { ResolutionCandidate@5534 }
-}
-
-ResolutionTaskHolder@5535 {
-    <name not found> = ArrayList@5536[1] { ResolutionCandidate@5537 }
-}
-
-ResolutionTaskHolder@5538 {
-    <name not found> = ArrayList@5539[1] { ResolutionCandidate@5540 }
-}
-
-ResolutionTaskHolder@5541 {
-    <name not found> = ArrayList@5542[1] { ResolutionCandidate@5543 }
-}
-
-ResolutionTaskHolder@5544 {
-    <name not found> = ArrayList@5545[1] { ResolutionCandidate@5546 }
-}
-
-ResolutionTaskHolder@5547 {
-    <name not found> = ArrayList@5548[1] { ResolutionCandidate@5549 }
-}
-
-ResolutionTaskHolder@5550 {
-    <name not found> = ArrayList@5551[1] { ResolutionCandidate@5552 }
-}
-
-ResolutionTaskHolder@5553 {
-    <name not found> = ArrayList@5554[1] { ResolutionCandidate@5555 }
-}
-
-ResolutionTaskHolder@5556 {
-    <name not found> = ArrayList@5557[1] { ResolutionCandidate@5558 }
-}
-
-ResolutionTaskHolder@5559 {
-    <name not found> = ArrayList@5560[1] { ResolutionCandidate@5561 }
-}
-
-ResolutionTaskHolder@5562 {
-    <name not found> = ArrayList@5563[1] { ResolutionCandidate@5564 }
-}
-
-ResolutionTaskHolder@5565 {
-    <name not found> = ArrayList@5566[1] { ResolutionCandidate@5567 }
-}
-
-ResolutionTaskHolder@5568 {
-    <name not found> = ArrayList@5569[1] { ResolutionCandidate@5570 }
-}
-
-ResolutionTaskHolder@5571 {
-    <name not found> = ArrayList@5572[1] { ResolutionCandidate@5573 }
-}
-
-ResolutionTaskHolder@5574 {
-    <name not found> = ArrayList@5575[1] { ResolutionCandidate@5576 }
-}
-
-ResolutionTaskHolder@5577 {
-    <name not found> = ArrayList@5578[1] { ResolutionCandidate@5579 }
-}
-
-ResolutionTaskHolder@5580 {
-    <name not found> = ArrayList@5581[1] { ResolutionCandidate@5582 }
-}
-
-ResolutionTaskHolder@5583 {
-    <name not found> = ArrayList@5584[1] { ResolutionCandidate@5585 }
-}
-
-ResolutionTaskHolder@5586 {
-    <name not found> = ArrayList@5587[1] { ResolutionCandidate@5588 }
-}
-
-ResolutionTaskHolder@5589 {
-    <name not found> = ArrayList@5590[1] { ResolutionCandidate@5591 }
-}
-
-ResolutionTaskHolder@5592 {
-    <name not found> = ArrayList@5593[1] { ResolutionCandidate@5594 }
-}
-
-ResolutionTaskHolder@5595 {
-    <name not found> = ArrayList@5596[1] { ResolutionCandidate@5597 }
-}
-
-ResolutionTaskHolder@5598 {
-    <name not found> = ArrayList@5599[1] { ResolutionCandidate@5600 }
-}
-
-ResolutionTaskHolder@5601 {
-    <name not found> = ArrayList@5602[1] { ResolutionCandidate@5603 }
-}
-
-ResolutionTaskHolder@5604 {
-    <name not found> = ArrayList@5605[1] { ResolutionCandidate@5606 }
-}
-
-ResolutionTaskHolder@5607 {
-    <name not found> = ArrayList@5608[1] { ResolutionCandidate@5609 }
-}
-
-ResolutionTaskHolder@5610 {
-    <name not found> = ArrayList@5611[1] { ResolutionCandidate@5612 }
-}
-
-ResolutionTaskHolder@5613 {
-    <name not found> = ArrayList@5614[1] { ResolutionCandidate@5615 }
-}
-
-ResolutionTaskHolder@5616 {
-    <name not found> = ArrayList@5617[1] { ResolutionCandidate@5618 }
-}
-
-ResolutionTaskHolder@5619 {
-    <name not found> = ArrayList@5620[1] { ResolutionCandidate@5621 }
-}
-
-ResolutionTaskHolder@5622 {
-    <name not found> = ArrayList@5623[1] { ResolutionCandidate@5624 }
-}
-
-ResolutionTaskHolder@5625 {
-    <name not found> = ArrayList@5626[1] { ResolutionCandidate@5627 }
-}
-
-ResolutionTaskHolder@5628 {
-    <name not found> = ArrayList@5629[1] { ResolutionCandidate@5630 }
-}
-
-ResolutionTaskHolder@5631 {
-    <name not found> = ArrayList@5632[1] { ResolutionCandidate@5633 }
-}
-
-ResolutionTaskHolder@5634 {
-    <name not found> = ArrayList@5635[1] { ResolutionCandidate@5636 }
-}
-
-ResolutionTaskHolder@5637 {
-    <name not found> = ArrayList@5638[1] { ResolutionCandidate@5639 }
-}
-
-ResolutionTaskHolder@5640 {
-    <name not found> = ArrayList@5641[1] { ResolutionCandidate@5642 }
-}
-
-ResolutionTaskHolder@5643 {
-    <name not found> = ArrayList@5644[1] { ResolutionCandidate@5645 }
-}
-
-ResolutionTaskHolder@5646 {
-    <name not found> = ArrayList@5647[1] { ResolutionCandidate@5648 }
-}
-
-ResolutionTaskHolder@5649 {
-    <name not found> = ArrayList@5650[1] { ResolutionCandidate@5651 }
-}
-
-ResolutionTaskHolder@5652 {
-    <name not found> = ArrayList@5653[1] { ResolutionCandidate@5654 }
-}
-
-ResolutionTaskHolder@5655 {
-    <name not found> = ArrayList@5656[1] { ResolutionCandidate@5657 }
-}
-
-ResolutionTaskHolder@5658 {
-    <name not found> = ArrayList@5659[1] { ResolutionCandidate@5660 }
-}
-
-ResolutionTaskHolder@5661 {
-    <name not found> = ArrayList@5662[1] { ResolutionCandidate@5663 }
-}
-
-ResolutionTaskHolder@5664 {
-    <name not found> = ArrayList@5665[1] { ResolutionCandidate@5666 }
-}
-
-ResolutionTaskHolder@5667 {
-    <name not found> = ArrayList@5668[1] { ResolutionCandidate@5669 }
-}
-
-ResolutionTaskHolder@5670 {
-    <name not found> = ArrayList@5671[1] { ResolutionCandidate@5672 }
-}
-
-ResolutionTaskHolder@5673 {
-    <name not found> = ArrayList@5674[1] { ResolutionCandidate@5675 }
-}
-
-ResolutionTaskHolder@5676 {
-    <name not found> = ArrayList@5677[1] { ResolutionCandidate@5678 }
-}
-
-ResolutionTaskHolder@5679 {
-    <name not found> = ArrayList@5680[1] { ResolutionCandidate@5681 }
-}
-
-ResolutionTaskHolder@5682 {
-    <name not found> = ArrayList@5683[1] { ResolutionCandidate@5684 }
-}
-
-ResolutionTaskHolder@5685 {
-    <name not found> = ArrayList@5686[1] { ResolutionCandidate@5687 }
-}
-
-ResolutionTaskHolder@5688 {
-    <name not found> = ArrayList@5689[1] { ResolutionCandidate@5690 }
-}
-
-ResolutionTaskHolder@5691 {
-    <name not found> = ArrayList@5692[1] { ResolutionCandidate@5693 }
-}
-
-ResolutionTaskHolder@5694 {
-    <name not found> = ArrayList@5695[1] { ResolutionCandidate@5696 }
-}
-
-ResolutionTaskHolder@5697 {
-    <name not found> = ArrayList@5698[1] { ResolutionCandidate@5699 }
-}
-
-ResolutionTaskHolder@5700 {
-    <name not found> = ArrayList@5701[1] { ResolutionCandidate@5702 }
-}
-
-ResolutionTaskHolder@5703 {
-    <name not found> = ArrayList@5704[1] { ResolutionCandidate@5705 }
-}
-
-ResolutionTaskHolder@5706 {
-    <name not found> = ArrayList@5707[1] { ResolutionCandidate@5708 }
-}
-
-ResolutionTaskHolder@5709 {
-    <name not found> = ArrayList@5710[1] { ResolutionCandidate@5711 }
-}
-
-ResolutionTaskHolder@5712 {
-    <name not found> = ArrayList@5713[1] { ResolutionCandidate@5714 }
-}
-
-ResolutionTaskHolder@5715 {
-    <name not found> = ArrayList@5716[1] { ResolutionCandidate@5717 }
-}
-
-ResolutionTaskHolder@5718 {
-    <name not found> = ArrayList@5719[1] { ResolutionCandidate@5720 }
-}
-
-ResolutionTaskHolder@5721 {
-    <name not found> = ArrayList@5722[1] { ResolutionCandidate@5723 }
-}
-
-ResolutionTaskHolder@5724 {
-    <name not found> = ArrayList@5725[1] { ResolutionCandidate@5726 }
-}
-
-ResolutionTaskHolder@5727 {
-    <name not found> = ArrayList@5728[1] { ResolutionCandidate@5729 }
-}
-
-ResolutionTaskHolder@5730 {
-    <name not found> = ArrayList@5731[1] { ResolutionCandidate@5732 }
-}
-
-ResolutionTaskHolder@5733 {
-    <name not found> = ArrayList@5734[1] { ResolutionCandidate@5735 }
-}
-
-ResolutionTaskHolder@5736 {
-    <name not found> = ArrayList@5737[1] { ResolutionCandidate@5738 }
-}
-
-ResolutionTaskHolder@5739 {
-    <name not found> = ArrayList@5740[1] { ResolutionCandidate@5741 }
-}
-
-ResolutionTaskHolder@5742 {
-    <name not found> = ArrayList@5743[1] { ResolutionCandidate@5744 }
-}
-
-ResolutionTaskHolder@5745 {
-    <name not found> = ArrayList@5746[1] { ResolutionCandidate@5747 }
-}
-
-ResolutionTaskHolder@5748 {
-    <name not found> = ArrayList@5749[1] { ResolutionCandidate@5750 }
-}
-
-ResolutionTaskHolder@5751 {
-    <name not found> = ArrayList@5752[1] { ResolutionCandidate@5753 }
-}
-
-ResolutionTaskHolder@5754 {
-    <name not found> = ArrayList@5755[1] { ResolutionCandidate@5756 }
-}
-
-ResolutionTaskHolder@5757 {
-    <name not found> = ArrayList@5758[1] { ResolutionCandidate@5759 }
-}
-
-ResolutionTaskHolder@5760 {
-    <name not found> = ArrayList@5761[1] { ResolutionCandidate@5762 }
-}
-
-ResolutionTaskHolder@5763 {
-    <name not found> = ArrayList@5764[1] { ResolutionCandidate@5765 }
-}
-
-ResolutionTaskHolder@5766 {
-    <name not found> = ArrayList@5767[1] { ResolutionCandidate@5768 }
-}
-
-ResolutionTaskHolder@5769 {
-    <name not found> = ArrayList@5770[1] { ResolutionCandidate@5771 }
-}
-
-ResolutionTaskHolder@5772 {
-    <name not found> = ArrayList@5773[1] { ResolutionCandidate@5774 }
-}
-
-ResolutionTaskHolder@5775 {
-    <name not found> = ArrayList@5776[1] { ResolutionCandidate@5777 }
-}
-
-ResolutionTaskHolder@5778 {
-    <name not found> = ArrayList@5779[1] { ResolutionCandidate@5780 }
-}
-
-ResolutionTaskHolder@5781 {
-    <name not found> = ArrayList@5782[1] { ResolutionCandidate@5783 }
-}
-
-ResolutionTaskHolder@5784 {
-    <name not found> = ArrayList@5785[1] { ResolutionCandidate@5786 }
-}
-
-ResolutionTaskHolder@5787 {
-    <name not found> = ArrayList@5788[1] { ResolutionCandidate@5789 }
-}
-
-ResolutionTaskHolder@5790 {
-    <name not found> = ArrayList@5791[1] { ResolutionCandidate@5792 }
-}
-
-ResolutionTaskHolder@5793 {
-    <name not found> = ArrayList@5794[1] { ResolutionCandidate@5795 }
-}
-
-ResolutionTaskHolder@5796 {
-    <name not found> = ArrayList@5797[1] { ResolutionCandidate@5798 }
-}
-
-ResolutionTaskHolder@5799 {
-    <name not found> = ArrayList@5800[1] { ResolutionCandidate@5801 }
-}
-
-ResolutionTaskHolder@5802 {
-    <name not found> = ArrayList@5803[1] { ResolutionCandidate@5804 }
-}
-
-ResolutionTaskHolder@5805 {
-    <name not found> = ArrayList@5806[1] { ResolutionCandidate@5807 }
-}
-
-ResolutionTaskHolder@5808 {
-    <name not found> = ArrayList@5809[1] { ResolutionCandidate@5810 }
-}
-
-ResolutionTaskHolder@5811 {
-    <name not found> = ArrayList@5812[1] { ResolutionCandidate@5813 }
-}
-
-ResolutionTaskHolder@5814 {
-    <name not found> = ArrayList@5815[1] { ResolutionCandidate@5816 }
-}
-
-ResolutionTaskHolder@5817 {
-    <name not found> = ArrayList@5818[1] { ResolutionCandidate@5819 }
-}
-
-ResolutionTaskHolder@5820 {
-    <name not found> = ArrayList@5821[1] { ResolutionCandidate@5822 }
-}
-
-ResolutionTaskHolder@5823 {
-    <name not found> = ArrayList@5824[1] { ResolutionCandidate@5825 }
-}
-
-ResolutionTaskHolder@5826 {
-    <name not found> = ArrayList@5827[1] { ResolutionCandidate@5828 }
-}
-
-ResolutionTaskHolder@5829 {
-    <name not found> = ArrayList@5830[1] { ResolutionCandidate@5831 }
-}
-
-ResolutionTaskHolder@5832 {
-    <name not found> = ArrayList@5833[1] { ResolutionCandidate@5834 }
-}
-
-ResolutionTaskHolder@5835 {
-    <name not found> = ArrayList@5836[1] { ResolutionCandidate@5837 }
-}
-
-ResolutionTaskHolder@5838 {
-    <name not found> = ArrayList@5839[1] { ResolutionCandidate@5840 }
-}
-
-ResolutionTaskHolder@5841 {
-    <name not found> = ArrayList@5842[1] { ResolutionCandidate@5843 }
-}
-
-ResolutionTaskHolder@5844 {
-    <name not found> = ArrayList@5845[1] { ResolutionCandidate@5846 }
-}
-
-ResolutionTaskHolder@5847 {
-    <name not found> = ArrayList@5848[1] { ResolutionCandidate@5849 }
-}
-
-ResolutionTaskHolder@5850 {
-    <name not found> = ArrayList@5851[1] { ResolutionCandidate@5852 }
-}
-
-ResolutionTaskHolder@5853 {
-    <name not found> = ArrayList@5854[1] { ResolutionCandidate@5855 }
-}
-
-ResolutionTaskHolder@5856 {
-    <name not found> = ArrayList@5857[1] { ResolutionCandidate@5858 }
-}
-
-ResolutionTaskHolder@5859 {
-    <name not found> = ArrayList@5860[1] { ResolutionCandidate@5861 }
-}
-
-ResolutionTaskHolder@5862 {
-    <name not found> = ArrayList@5863[1] { ResolutionCandidate@5864 }
-}
-
-ResolutionTaskHolder@5865 {
-    <name not found> = ArrayList@5866[1] { ResolutionCandidate@5867 }
-}
-
-ResolutionTaskHolder@5868 {
-    <name not found> = ArrayList@5869[1] { ResolutionCandidate@5870 }
-}
-
-ResolutionTaskHolder@5871 {
-    <name not found> = ArrayList@5872[1] { ResolutionCandidate@5873 }
-}
-
-ResolutionTaskHolder@5874 {
-    <name not found> = ArrayList@5875[1] { ResolutionCandidate@5876 }
-}
-
-ResolutionTaskHolder@5877 {
-    <name not found> = ArrayList@5878[1] { ResolutionCandidate@5879 }
-}
-
-ResolutionTaskHolder@5880 {
-    <name not found> = ArrayList@5881[1] { ResolutionCandidate@5882 }
-}
-
-ResolutionTaskHolder@5883 {
-    <name not found> = ArrayList@5884[1] { ResolutionCandidate@5885 }
-}
-
-ResolutionTaskHolder@5886 {
-    <name not found> = ArrayList@5887[1] { ResolutionCandidate@5888 }
-}
-
-ResolutionTaskHolder@5889 {
-    <name not found> = ArrayList@5890[1] { ResolutionCandidate@5891 }
-}
-
-ResolutionTaskHolder@5892 {
-    <name not found> = ArrayList@5893[1] { ResolutionCandidate@5894 }
-}
-
-ResolutionTaskHolder@5895 {
-    <name not found> = ArrayList@5896[1] { ResolutionCandidate@5897 }
-}
-
-ResolutionTaskHolder@5898 {
-    <name not found> = ArrayList@5899[1] { ResolutionCandidate@5900 }
-}
-
-ResolutionTaskHolder@5901 {
-    <name not found> = ArrayList@5902[1] { ResolutionCandidate@5903 }
-}
-
-ResolutionTaskHolder@5904 {
-    <name not found> = ArrayList@5905[1] { ResolutionCandidate@5906 }
-}
-
-ResolutionTaskHolder@5907 {
-    <name not found> = ArrayList@5908[1] { ResolutionCandidate@5909 }
-}
-
-ResolutionTaskHolder@5910 {
-    <name not found> = ArrayList@5911[1] { ResolutionCandidate@5912 }
-}
-
-ResolutionTaskHolder@5913 {
-    <name not found> = ArrayList@5914[1] { ResolutionCandidate@5915 }
-}
-
-ResolutionTaskHolder@5916 {
-    <name not found> = ArrayList@5917[1] { ResolutionCandidate@5918 }
-}
-
-ResolutionTaskHolder@5919 {
-    <name not found> = ArrayList@5920[1] { ResolutionCandidate@5921 }
-}
-
-ResolutionTaskHolder@5922 {
-    <name not found> = ArrayList@5923[1] { ResolutionCandidate@5924 }
-}
-
-ResolutionTaskHolder@5925 {
-    <name not found> = ArrayList@5926[1] { ResolutionCandidate@5927 }
-}
-
-ResolutionTaskHolder@5928 {
-    <name not found> = ArrayList@5929[1] { ResolutionCandidate@5930 }
-}
-
-ResolutionTaskHolder@5931 {
-    <name not found> = ArrayList@5932[1] { ResolutionCandidate@5933 }
-}
-
-ResolutionTaskHolder@5934 {
-    <name not found> = ArrayList@5935[1] { ResolutionCandidate@5936 }
-}
-
-ResolutionTaskHolder@5937 {
-    <name not found> = ArrayList@5938[1] { ResolutionCandidate@5939 }
-}
-
-ResolutionTaskHolder@5940 {
-    <name not found> = ArrayList@5941[1] { ResolutionCandidate@5942 }
-}
-
-ResolutionTaskHolder@5943 {
-    <name not found> = ArrayList@5944[1] { ResolutionCandidate@5945 }
-}
-
-ResolutionTaskHolder@5946 {
-    <name not found> = ArrayList@5947[1] { ResolutionCandidate@5948 }
-}
-
-ResolutionTaskHolder@5949 {
-    <name not found> = ArrayList@5950[1] { ResolutionCandidate@5951 }
-}
-
-ResolutionTaskHolder@5952 {
-    <name not found> = ArrayList@5953[1] { ResolutionCandidate@5954 }
-}
-
-ResolutionTaskHolder@5955 {
-    <name not found> = ArrayList@5956[1] { ResolutionCandidate@5957 }
-}
-
-ResolutionTaskHolder@5958 {
-    <name not found> = ArrayList@5959[1] { ResolutionCandidate@5960 }
-}
-
-ResolutionTaskHolder@5961 {
-    <name not found> = ArrayList@5962[1] { ResolutionCandidate@5963 }
-}
-
-ResolutionTaskHolder@5964 {
-    <name not found> = ArrayList@5965[1] { ResolutionCandidate@5966 }
-}
-
-ResolutionTaskHolder@5967 {
-    <name not found> = ArrayList@5968[1] { ResolutionCandidate@5969 }
-}
-
-ResolutionTaskHolder@5970 {
-    <name not found> = ArrayList@5971[1] { ResolutionCandidate@5972 }
-}
-
-ResolutionTaskHolder@5973 {
-    <name not found> = ArrayList@5974[1] { ResolutionCandidate@5975 }
-}
-
-ResolutionTaskHolder@5976 {
-    <name not found> = ArrayList@5977[1] { ResolutionCandidate@5978 }
-}
-
-ResolutionTaskHolder@5979 {
-    <name not found> = ArrayList@5980[1] { ResolutionCandidate@5981 }
-}
-
-ResolutionTaskHolder@5982 {
-    <name not found> = ArrayList@5983[1] { ResolutionCandidate@5984 }
-}
-
-ResolutionTaskHolder@5985 {
-    <name not found> = ArrayList@5986[1] { ResolutionCandidate@5987 }
-}
-
-ResolutionTaskHolder@5988 {
-    <name not found> = ArrayList@5989[1] { ResolutionCandidate@5990 }
-}
-
-ResolutionTaskHolder@5991 {
-    <name not found> = ArrayList@5992[1] { ResolutionCandidate@5993 }
-}
-
-ResolutionTaskHolder@5994 {
-    <name not found> = ArrayList@5995[1] { ResolutionCandidate@5996 }
-}
-
-ResolutionTaskHolder@5997 {
-    <name not found> = ArrayList@5998[1] { ResolutionCandidate@5999 }
-}
-
-ResolutionTaskHolder@6000 {
-    <name not found> = ArrayList@6001[1] { ResolutionCandidate@6002 }
-}
-
-ResolutionTaskHolder@6003 {
-    <name not found> = ArrayList@6004[1] { ResolutionCandidate@6005 }
-}
-
-ResolutionTaskHolder@6006 {
-    <name not found> = ArrayList@6007[1] { ResolutionCandidate@6008 }
-}
-
-ResolutionTaskHolder@6009 {
-    <name not found> = ArrayList@6010[1] { ResolutionCandidate@6011 }
-}
-
-ResolutionTaskHolder@6012 {
-    <name not found> = ArrayList@6013[1] { ResolutionCandidate@6014 }
-}
-
-ResolutionTaskHolder@6015 {
-    <name not found> = ArrayList@6016[1] { ResolutionCandidate@6017 }
-}
-
-ResolutionTaskHolder@6018 {
-    <name not found> = ArrayList@6019[1] { ResolutionCandidate@6020 }
-}
-
-ResolutionTaskHolder@6021 {
-    <name not found> = ArrayList@6022[1] { ResolutionCandidate@6023 }
-}
-
-ResolutionTaskHolder@6024 {
-    <name not found> = ArrayList@6025[1] { ResolutionCandidate@6026 }
-}
-
-ResolutionTaskHolder@6027 {
-    <name not found> = ArrayList@6028[1] { ResolutionCandidate@6029 }
-}
-
-ResolutionTaskHolder@6030 {
-    <name not found> = ArrayList@6031[1] { ResolutionCandidate@6032 }
-}
-
-ResolutionTaskHolder@6033 {
-    <name not found> = ArrayList@6034[1] { ResolutionCandidate@6035 }
-}
-
-ResolutionTaskHolder@6036 {
-    <name not found> = ArrayList@6037[1] { ResolutionCandidate@6038 }
-}
-
-ResolutionTaskHolder@6039 {
-    <name not found> = ArrayList@6040[1] { ResolutionCandidate@6041 }
-}
-
-ResolutionTaskHolder@6042 {
-    <name not found> = ArrayList@6043[1] { ResolutionCandidate@6044 }
-}
-
-ResolutionTaskHolder@6045 {
-    <name not found> = ArrayList@6046[1] { ResolutionCandidate@6047 }
-}
-
-ResolutionTaskHolder@6048 {
-    <name not found> = ArrayList@6049[1] { ResolutionCandidate@6050 }
-}
-
-ResolutionTaskHolder@6051 {
-    <name not found> = ArrayList@6052[1] { ResolutionCandidate@6053 }
-}
-
-ResolutionTaskHolder@6054 {
-    <name not found> = ArrayList@6055[1] { ResolutionCandidate@6056 }
-}
-
-ResolutionTaskHolder@6057 {
-    <name not found> = ArrayList@6058[1] { ResolutionCandidate@6059 }
-}
-
-ResolutionTaskHolder@6060 {
-    <name not found> = ArrayList@6061[1] { ResolutionCandidate@6062 }
-}
-
-ResolutionTaskHolder@6063 {
-    <name not found> = ArrayList@6064[1] { ResolutionCandidate@6065 }
-}
-
-ResolutionTaskHolder@6066 {
-    <name not found> = ArrayList@6067[1] { ResolutionCandidate@6068 }
-}
-
-ResolutionTaskHolder@6069 {
-    <name not found> = ArrayList@6070[1] { ResolutionCandidate@6071 }
-}
-
-ResolutionTaskHolder@6072 {
-    <name not found> = ArrayList@6073[1] { ResolutionCandidate@6074 }
-}
-
-ResolutionTaskHolder@6075 {
-    <name not found> = ArrayList@6076[1] { ResolutionCandidate@6077 }
-}
-
-ResolutionTaskHolder@6078 {
-    <name not found> = ArrayList@6079[1] { ResolutionCandidate@6080 }
-}
-
-ResolutionTaskHolder@6081 {
-    <name not found> = ArrayList@6082[1] { ResolutionCandidate@6083 }
-}
-
-ResolutionTaskHolder@6084 {
-    <name not found> = ArrayList@6085[1] { ResolutionCandidate@6086 }
-}
-
-ResolutionTaskHolder@6087 {
-    <name not found> = ArrayList@6088[1] { ResolutionCandidate@6089 }
-}
-
-ResolutionTaskHolder@6090 {
-    <name not found> = ArrayList@6091[1] { ResolutionCandidate@6092 }
-}
-
-ResolutionTaskHolder@6093 {
-    <name not found> = ArrayList@6094[1] { ResolutionCandidate@6095 }
-}
-
-ResolutionTaskHolder@6096 {
-    <name not found> = ArrayList@6097[1] { ResolutionCandidate@6098 }
-}
-
-ResolutionTaskHolder@6099 {
-    <name not found> = ArrayList@6100[1] { ResolutionCandidate@6101 }
-}
-
-ResolutionTaskHolder@6102 {
-    <name not found> = ArrayList@6103[1] { ResolutionCandidate@6104 }
-}
-
-ResolutionTaskHolder@6105 {
-    <name not found> = ArrayList@6106[1] { ResolutionCandidate@6107 }
-}
-
-ResolutionTaskHolder@6108 {
-    <name not found> = ArrayList@6109[1] { ResolutionCandidate@6110 }
-}
-
-ResolutionTaskHolder@6111 {
-    <name not found> = ArrayList@6112[1] { ResolutionCandidate@6113 }
-}
-
-ResolutionTaskHolder@6114 {
-    <name not found> = ArrayList@6115[1] { ResolutionCandidate@6116 }
-}
-
-ResolutionTaskHolder@6117 {
-    <name not found> = ArrayList@6118[1] { ResolutionCandidate@6119 }
-}
-
-ResolutionTaskHolder@6120 {
-    <name not found> = ArrayList@6121[1] { ResolutionCandidate@6122 }
-}
-
-ResolutionTaskHolder@6123 {
-    <name not found> = ArrayList@6124[1] { ResolutionCandidate@6125 }
-}
-
-ResolutionTaskHolder@6126 {
-    <name not found> = ArrayList@6127[1] { ResolutionCandidate@6128 }
-}
-
-ResolutionTaskHolder@6129 {
-    <name not found> = ArrayList@6130[1] { ResolutionCandidate@6131 }
-}
-
-ResolutionTaskHolder@6132 {
-    <name not found> = ArrayList@6133[1] { ResolutionCandidate@6134 }
-}
-
-ResolutionTaskHolder@6135 {
-    <name not found> = ArrayList@6136[1] { ResolutionCandidate@6137 }
-}
-
-ResolutionTaskHolder@6138 {
-    <name not found> = ArrayList@6139[1] { ResolutionCandidate@6140 }
-}
-
-ResolutionTaskHolder@6141 {
-    <name not found> = ArrayList@6142[1] { ResolutionCandidate@6143 }
-}
-
-ResolutionTaskHolder@6144 {
-    <name not found> = ArrayList@6145[1] { ResolutionCandidate@6146 }
-}
-
-ResolutionTaskHolder@6147 {
-    <name not found> = ArrayList@6148[1] { ResolutionCandidate@6149 }
-}
-
-ResolutionTaskHolder@6150 {
-    <name not found> = ArrayList@6151[1] { ResolutionCandidate@6152 }
-}
-
-ResolutionTaskHolder@6153 {
-    <name not found> = ArrayList@6154[1] { ResolutionCandidate@6155 }
-}
-
-ResolutionTaskHolder@6156 {
-    <name not found> = ArrayList@6157[1] { ResolutionCandidate@6158 }
-}
-
-ResolutionTaskHolder@6159 {
-    <name not found> = ArrayList@6160[1] { ResolutionCandidate@6161 }
-}
-
-ResolutionTaskHolder@6162 {
-    <name not found> = ArrayList@6163[1] { ResolutionCandidate@6164 }
-}
-
-ResolutionTaskHolder@6165 {
-    <name not found> = ArrayList@6166[1] { ResolutionCandidate@6167 }
-}
-
-ResolutionTaskHolder@6168 {
-    <name not found> = ArrayList@6169[1] { ResolutionCandidate@6170 }
-}
-
-ResolutionTaskHolder@6171 {
-    <name not found> = ArrayList@6172[1] { ResolutionCandidate@6173 }
-}
-
-ResolutionTaskHolder@6174 {
-    <name not found> = ArrayList@6175[1] { ResolutionCandidate@6176 }
-}
-
-ResolutionTaskHolder@6177 {
-    <name not found> = ArrayList@6178[1] { ResolutionCandidate@6179 }
-}
-
-ResolutionTaskHolder@6180 {
-    <name not found> = ArrayList@6181[1] { ResolutionCandidate@6182 }
-}
-
-ResolutionTaskHolder@6183 {
-    <name not found> = ArrayList@6184[1] { ResolutionCandidate@6185 }
-}
-
-ResolutionTaskHolder@6186 {
-    <name not found> = ArrayList@6187[1] { ResolutionCandidate@6188 }
-}
-
-ResolutionTaskHolder@6189 {
-    <name not found> = ArrayList@6190[1] { ResolutionCandidate@6191 }
-}
-
-ResolutionTaskHolder@6192 {
-    <name not found> = ArrayList@6193[1] { ResolutionCandidate@6194 }
-}
-
-ResolutionTaskHolder@6195 {
-    <name not found> = ArrayList@6196[1] { ResolutionCandidate@6197 }
-}
-
-ResolutionTaskHolder@6198 {
-    <name not found> = ArrayList@6199[1] { ResolutionCandidate@6200 }
-}
-
-ResolutionTaskHolder@6201 {
-    <name not found> = ArrayList@6202[1] { ResolutionCandidate@6203 }
-}
-
-ResolutionTaskHolder@6204 {
-    <name not found> = ArrayList@6205[1] { ResolutionCandidate@6206 }
-}
-
-ResolutionTaskHolder@6207 {
-    <name not found> = ArrayList@6208[1] { ResolutionCandidate@6209 }
-}
-
-ResolutionTaskHolder@6210 {
-    <name not found> = ArrayList@6211[1] { ResolutionCandidate@6212 }
-}
-
-ResolutionTaskHolder@6213 {
-    <name not found> = ArrayList@6214[1] { ResolutionCandidate@6215 }
-}
-
-ResolutionTaskHolder@6216 {
-    <name not found> = ArrayList@6217[1] { ResolutionCandidate@6218 }
-}
-
-ResolutionTaskHolder@6219 {
-    <name not found> = ArrayList@6220[1] { ResolutionCandidate@6221 }
-}
-
-ResolutionTaskHolder@6222 {
-    <name not found> = ArrayList@6223[1] { ResolutionCandidate@6224 }
-}
-
-ResolutionTaskHolder@6225 {
-    <name not found> = ArrayList@6226[1] { ResolutionCandidate@6227 }
-}
-
-ResolutionTaskHolder@6228 {
-    <name not found> = ArrayList@6229[1] { ResolutionCandidate@6230 }
-}
-
-ResolutionTaskHolder@6231 {
-    <name not found> = ArrayList@6232[1] { ResolutionCandidate@6233 }
-}
-
-ResolutionTaskHolder@6234 {
-    <name not found> = ArrayList@6235[1] { ResolutionCandidate@6236 }
-}
-
-ResolutionTaskHolder@6237 {
-    <name not found> = ArrayList@6238[1] { ResolutionCandidate@6239 }
-}
-
-ResolutionTaskHolder@6240 {
-    <name not found> = ArrayList@6241[1] { ResolutionCandidate@6242 }
-}
-
-ResolutionTaskHolder@6243 {
-    <name not found> = ArrayList@6244[1] { ResolutionCandidate@6245 }
-}
-
-ResolutionTaskHolder@6246 {
-    <name not found> = ArrayList@6247[1] { ResolutionCandidate@6248 }
-}
-
-ResolutionTaskHolder@6249 {
-    <name not found> = ArrayList@6250[1] { ResolutionCandidate@6251 }
-}
-
-ResolutionTaskHolder@6252 {
-    <name not found> = ArrayList@6253[1] { ResolutionCandidate@6254 }
-}
-
-ResolutionTaskHolder@6255 {
-    <name not found> = ArrayList@6256[1] { ResolutionCandidate@6257 }
-}
-
-ResolutionTaskHolder@6258 {
-    <name not found> = ArrayList@6259[1] { ResolutionCandidate@6260 }
-}
-
-ResolutionTaskHolder@6261 {
-    <name not found> = ArrayList@6262[1] { ResolutionCandidate@6263 }
-}
-
-ResolutionTaskHolder@6264 {
-    <name not found> = ArrayList@6265[1] { ResolutionCandidate@6266 }
-}
-
-ResolutionTaskHolder@6267 {
-    <name not found> = ArrayList@6268[1] { ResolutionCandidate@6269 }
-}
-
-ResolutionTaskHolder@6270 {
-    <name not found> = ArrayList@6271[1] { ResolutionCandidate@6272 }
-}
-
-ResolutionTaskHolder@6273 {
-    <name not found> = ArrayList@6274[1] { ResolutionCandidate@6275 }
-}
-
-ResolutionTaskHolder@6276 {
-    <name not found> = ArrayList@6277[1] { ResolutionCandidate@6278 }
-}
-
-ResolutionTaskHolder@6279 {
-    <name not found> = ArrayList@6280[1] { ResolutionCandidate@6281 }
-}
-
-ResolutionTaskHolder@6282 {
-    <name not found> = ArrayList@6283[1] { ResolutionCandidate@6284 }
-}
-
-ResolutionTaskHolder@6285 {
-    <name not found> = ArrayList@6286[1] { ResolutionCandidate@6287 }
-}
-
-ResolutionTaskHolder@6288 {
-    <name not found> = ArrayList@6289[1] { ResolutionCandidate@6290 }
-}
-
-ResolutionTaskHolder@6291 {
-    <name not found> = ArrayList@6292[1] { ResolutionCandidate@6293 }
-}
-
-ResolutionTaskHolder@6294 {
-    <name not found> = ArrayList@6295[1] { ResolutionCandidate@6296 }
-}
-
-ResolutionTaskHolder@6297 {
-    <name not found> = ArrayList@6298[1] { ResolutionCandidate@6299 }
-}
-
-ResolutionTaskHolder@6300 {
-    <name not found> = ArrayList@6301[1] { ResolutionCandidate@6302 }
-}
-
-ResolutionTaskHolder@6303 {
-    <name not found> = ArrayList@6304[1] { ResolutionCandidate@6305 }
-}
-
-ResolutionTaskHolder@6306 {
-    <name not found> = ArrayList@6307[1] { ResolutionCandidate@6308 }
-}
-
-ResolutionTaskHolder@6309 {
-    <name not found> = ArrayList@6310[1] { ResolutionCandidate@6311 }
-}
-
-ResolutionTaskHolder@6312 {
-    <name not found> = ArrayList@6313[1] { ResolutionCandidate@6314 }
-}
-
-ResolutionTaskHolder@6315 {
-    <name not found> = ArrayList@6316[1] { ResolutionCandidate@6317 }
-}
-
-ResolutionTaskHolder@6318 {
-    <name not found> = ArrayList@6319[1] { ResolutionCandidate@6320 }
-}
-
-ResolutionTaskHolder@6321 {
-    <name not found> = ArrayList@6322[1] { ResolutionCandidate@6323 }
-}
-
-ResolutionTaskHolder@6324 {
-    <name not found> = ArrayList@6325[1] { ResolutionCandidate@6326 }
-}
-
-ResolutionTaskHolder@6327 {
-    <name not found> = ArrayList@6328[1] { ResolutionCandidate@6329 }
-}
-
-ResolutionTaskHolder@6330 {
-    <name not found> = ArrayList@6331[1] { ResolutionCandidate@6332 }
-}
-
-ResolutionTaskHolder@6333 {
-    <name not found> = ArrayList@6334[1] { ResolutionCandidate@6335 }
-}
-
-ResolutionTaskHolder@6336 {
-    <name not found> = ArrayList@6337[1] { ResolutionCandidate@6338 }
-}
-
-ResolutionTaskHolder@6339 {
-    <name not found> = ArrayList@6340[1] { ResolutionCandidate@6341 }
-}
-
-ResolutionTaskHolder@6342 {
-    <name not found> = ArrayList@6343[1] { ResolutionCandidate@6344 }
-}
-
-ResolutionTaskHolder@6345 {
-    <name not found> = ArrayList@6346[1] { ResolutionCandidate@6347 }
-}
-
-ResolutionTaskHolder@6348 {
-    <name not found> = ArrayList@6349[1] { ResolutionCandidate@6350 }
-}
-
-ResolutionTaskHolder@6351 {
-    <name not found> = ArrayList@6352[1] { ResolutionCandidate@6353 }
-}
-
-ResolutionTaskHolder@6354 {
-    <name not found> = ArrayList@6355[1] { ResolutionCandidate@6356 }
-}
-
-ResolutionTaskHolder@6357 {
-    <name not found> = ArrayList@6358[1] { ResolutionCandidate@6359 }
-}
-
-ResolutionTaskHolder@6360 {
-    <name not found> = ArrayList@6361[1] { ResolutionCandidate@6362 }
-}
-
-ResolutionTaskHolder@6363 {
-    <name not found> = ArrayList@6364[1] { ResolutionCandidate@6365 }
-}
-
-ResolutionTaskHolder@6366 {
-    <name not found> = ArrayList@6367[1] { ResolutionCandidate@6368 }
-}
-
-ResolutionTaskHolder@6369 {
-    <name not found> = ArrayList@6370[1] { ResolutionCandidate@6371 }
-}
-
-ResolutionTaskHolder@6372 {
-    <name not found> = ArrayList@6373[1] { ResolutionCandidate@6374 }
-}
-
-ResolutionTaskHolder@6375 {
-    <name not found> = ArrayList@6376[1] { ResolutionCandidate@6377 }
-}
-
-ResolutionTaskHolder@6378 {
-    <name not found> = ArrayList@6379[1] { ResolutionCandidate@6380 }
-}
-
-ResolutionTaskHolder@6381 {
-    <name not found> = ArrayList@6382[1] { ResolutionCandidate@6383 }
-}
-
-ResolutionTaskHolder@6384 {
-    <name not found> = ArrayList@6385[1] { ResolutionCandidate@6386 }
-}
-
-ResolutionTaskHolder@6387 {
-    <name not found> = ArrayList@6388[1] { ResolutionCandidate@6389 }
-}
-
-ResolutionTaskHolder@6390 {
-    <name not found> = ArrayList@6391[1] { ResolutionCandidate@6392 }
-}
-
-ResolutionTaskHolder@6393 {
-    <name not found> = ArrayList@6394[1] { ResolutionCandidate@6395 }
-}
-
-ResolutionTaskHolder@6396 {
-    <name not found> = ArrayList@6397[1] { ResolutionCandidate@6398 }
-}
-
-ResolutionTaskHolder@6399 {
-    <name not found> = ArrayList@6400[1] { ResolutionCandidate@6401 }
-}
-
-ResolutionTaskHolder@6402 {
-    <name not found> = ArrayList@6403[1] { ResolutionCandidate@6404 }
-}
-
-ResolutionTaskHolder@6405 {
-    <name not found> = ArrayList@6406[1] { ResolutionCandidate@6407 }
-}
-
-ResolutionTaskHolder@6408 {
-    <name not found> = ArrayList@6409[1] { ResolutionCandidate@6410 }
-}
-
-ResolutionTaskHolder@6411 {
-    <name not found> = ArrayList@6412[1] { ResolutionCandidate@6413 }
-}
-
-ResolutionTaskHolder@6414 {
-    <name not found> = ArrayList@6415[1] { ResolutionCandidate@6416 }
-}
-
-ResolutionTaskHolder@6417 {
-    <name not found> = ArrayList@6418[1] { ResolutionCandidate@6419 }
-}
-
-ResolutionTaskHolder@6420 {
-    <name not found> = ArrayList@6421[1] { ResolutionCandidate@6422 }
-}
-
-ResolutionTaskHolder@6423 {
-    <name not found> = ArrayList@6424[1] { ResolutionCandidate@6425 }
-}
-
-ResolutionTaskHolder@6426 {
-    <name not found> = ArrayList@6427[1] { ResolutionCandidate@6428 }
-}
-
-ResolutionTaskHolder@6429 {
-    <name not found> = ArrayList@6430[1] { ResolutionCandidate@6431 }
-}
-
-ResolutionTaskHolder@6432 {
-    <name not found> = ArrayList@6433[1] { ResolutionCandidate@6434 }
-}
-
-ResolutionTaskHolder@6435 {
-    <name not found> = ArrayList@6436[1] { ResolutionCandidate@6437 }
-}
-
-ResolutionTaskHolder@6438 {
-    <name not found> = ArrayList@6439[1] { ResolutionCandidate@6440 }
-}
-
-ResolutionTaskHolder@6441 {
-    <name not found> = ArrayList@6442[1] { ResolutionCandidate@6443 }
-}
-
-ResolutionTaskHolder@6444 {
-    <name not found> = ArrayList@6445[1] { ResolutionCandidate@6446 }
-}
-
-ResolutionTaskHolder@6447 {
-    <name not found> = ArrayList@6448[1] { ResolutionCandidate@6449 }
-}
-
-ResolutionTaskHolder@6450 {
-    <name not found> = ArrayList@6451[1] { ResolutionCandidate@6452 }
-}
-
-ResolutionTaskHolder@6453 {
-    <name not found> = ArrayList@6454[1] { ResolutionCandidate@6455 }
-}
-
-ResolutionTaskHolder@6456 {
-    <name not found> = ArrayList@6457[1] { ResolutionCandidate@6458 }
-}
-
-ResolutionTaskHolder@6459 {
-    <name not found> = ArrayList@6460[1] { ResolutionCandidate@6461 }
-}
-
-ResolutionTaskHolder@6462 {
-    <name not found> = ArrayList@6463[1] { ResolutionCandidate@6464 }
-}
-
-ResolutionTaskHolder@6465 {
-    <name not found> = ArrayList@6466[1] { ResolutionCandidate@6467 }
-}
-
-ResolutionTaskHolder@6468 {
-    <name not found> = ArrayList@6469[1] { ResolutionCandidate@6470 }
-}
-
-ResolutionTaskHolder@6471 {
-    <name not found> = ArrayList@6472[1] { ResolutionCandidate@6473 }
-}
-
-ResolutionTaskHolder@6474 {
-    <name not found> = ArrayList@6475[1] { ResolutionCandidate@6476 }
-}
-
-ResolutionTaskHolder@6477 {
-    <name not found> = ArrayList@6478[1] { ResolutionCandidate@6479 }
-}
-
-ResolutionTaskHolder@6480 {
-    <name not found> = ArrayList@6481[1] { ResolutionCandidate@6482 }
-}
-
-ResolutionTaskHolder@6483 {
-    <name not found> = ArrayList@6484[1] { ResolutionCandidate@6485 }
-}
-
-ResolutionTaskHolder@6486 {
-    <name not found> = ArrayList@6487[1] { ResolutionCandidate@6488 }
-}
-
-ResolutionTaskHolder@6489 {
-    <name not found> = ArrayList@6490[1] { ResolutionCandidate@6491 }
-}
-
-ResolutionTaskHolder@6492 {
-    <name not found> = ArrayList@6493[1] { ResolutionCandidate@6494 }
-}
-
-ResolutionTaskHolder@6495 {
-    <name not found> = ArrayList@6496[1] { ResolutionCandidate@6497 }
-}
-
-ResolutionTaskHolder@6498 {
-    <name not found> = ArrayList@6499[1] { ResolutionCandidate@6500 }
-}
-
-ResolutionTaskHolder@6501 {
-    <name not found> = ArrayList@6502[1] { ResolutionCandidate@6503 }
-}
-
-ResolutionTaskHolder@6504 {
-    <name not found> = ArrayList@6505[1] { ResolutionCandidate@6506 }
-}
-
-ResolutionTaskHolder@6507 {
-    <name not found> = ArrayList@6508[1] { ResolutionCandidate@6509 }
-}
-
-ResolutionTaskHolder@6510 {
-    <name not found> = ArrayList@6511[1] { ResolutionCandidate@6512 }
-}
-
-ResolutionTaskHolder@6513 {
-    <name not found> = ArrayList@6514[1] { ResolutionCandidate@6515 }
-}
-
-ResolutionTaskHolder@6516 {
-    <name not found> = ArrayList@6517[1] { ResolutionCandidate@6518 }
-}
-
-ResolutionTaskHolder@6519 {
-    <name not found> = ArrayList@6520[1] { ResolutionCandidate@6521 }
-}
-
-ResolutionTaskHolder@6522 {
-    <name not found> = ArrayList@6523[1] { ResolutionCandidate@6524 }
-}
-
-ResolutionTaskHolder@6525 {
-    <name not found> = ArrayList@6526[1] { ResolutionCandidate@6527 }
-}
-
-ResolutionTaskHolder@6528 {
-    <name not found> = ArrayList@6529[1] { ResolutionCandidate@6530 }
-}
-
-ResolutionTaskHolder@6531 {
-    <name not found> = ArrayList@6532[1] { ResolutionCandidate@6533 }
-}
-
-ResolutionTaskHolder@6534 {
-    <name not found> = ArrayList@6535[1] { ResolutionCandidate@6536 }
-}
-
-ResolutionTaskHolder@6537 {
-    <name not found> = ArrayList@6538[1] { ResolutionCandidate@6539 }
-}
-
-ResolutionTaskHolder@6540 {
-    <name not found> = ArrayList@6541[1] { ResolutionCandidate@6542 }
-}
-
-ResolutionTaskHolder@6543 {
-    <name not found> = ArrayList@6544[1] { ResolutionCandidate@6545 }
-}
-
-ResolutionTaskHolder@6546 {
-    <name not found> = ArrayList@6547[1] { ResolutionCandidate@6548 }
-}
-
-ResolutionTaskHolder@6549 {
-    <name not found> = ArrayList@6550[1] { ResolutionCandidate@6551 }
-}
-
-ResolutionTaskHolder@6552 {
-    <name not found> = ArrayList@6553[1] { ResolutionCandidate@6554 }
-}
-
-ResolutionTaskHolder@6555 {
-    <name not found> = ArrayList@6556[1] { ResolutionCandidate@6557 }
-}
-
-ResolutionTaskHolder@6558 {
-    <name not found> = ArrayList@6559[1] { ResolutionCandidate@6560 }
-}
-
-ResolutionTaskHolder@6561 {
-    <name not found> = ArrayList@6562[1] { ResolutionCandidate@6563 }
-}
-
-ResolutionTaskHolder@6564 {
-    <name not found> = ArrayList@6565[1] { ResolutionCandidate@6566 }
-}
-
-ResolutionTaskHolder@6567 {
-    <name not found> = ArrayList@6568[1] { ResolutionCandidate@6569 }
-}
-
-ResolutionTaskHolder@6570 {
-    <name not found> = ArrayList@6571[1] { ResolutionCandidate@6572 }
-}
-
-ResolutionTaskHolder@6573 {
-    <name not found> = ArrayList@6574[1] { ResolutionCandidate@6575 }
-}
-
-ResolutionTaskHolder@6576 {
-    <name not found> = ArrayList@6577[1] { ResolutionCandidate@6578 }
-}
-
-ResolutionTaskHolder@6579 {
-    <name not found> = ArrayList@6580[1] { ResolutionCandidate@6581 }
-}
-
-ResolutionTaskHolder@6582 {
-    <name not found> = ArrayList@6583[1] { ResolutionCandidate@6584 }
-}
-
-ResolutionTaskHolder@6585 {
-    <name not found> = ArrayList@6586[1] { ResolutionCandidate@6587 }
-}
-
-ResolutionTaskHolder@6588 {
-    <name not found> = ArrayList@6589[1] { ResolutionCandidate@6590 }
-}
-
-ResolutionTaskHolder@6591 {
-    <name not found> = ArrayList@6592[1] { ResolutionCandidate@6593 }
-}
-
-ResolutionTaskHolder@6594 {
-    <name not found> = ArrayList@6595[1] { ResolutionCandidate@6596 }
-}
-
-ResolutionTaskHolder@6597 {
-    <name not found> = ArrayList@6598[1] { ResolutionCandidate@6599 }
-}
-
-ResolutionTaskHolder@6600 {
-    <name not found> = ArrayList@6601[1] { ResolutionCandidate@6602 }
-}
-
-ResolutionTaskHolder@6603 {
-    <name not found> = ArrayList@6604[1] { ResolutionCandidate@6605 }
-}
-
-ResolutionTaskHolder@6606 {
-    <name not found> = ArrayList@6607[1] { ResolutionCandidate@6608 }
-}
-
-ResolutionTaskHolder@6609 {
-    <name not found> = ArrayList@6610[1] { ResolutionCandidate@6611 }
-}
-
-ResolutionTaskHolder@6612 {
-    <name not found> = ArrayList@6613[1] { ResolutionCandidate@6614 }
-}
-
-ResolutionTaskHolder@6615 {
-    <name not found> = ArrayList@6616[1] { ResolutionCandidate@6617 }
-}
-
-ResolutionTaskHolder@6618 {
-    <name not found> = ArrayList@6619[1] { ResolutionCandidate@6620 }
-}
-
-ResolutionTaskHolder@6621 {
-    <name not found> = ArrayList@6622[1] { ResolutionCandidate@6623 }
-}
-
-ResolutionTaskHolder@6624 {
-    <name not found> = ArrayList@6625[1] { ResolutionCandidate@6626 }
-}
-
-ResolutionTaskHolder@6627 {
-    <name not found> = ArrayList@6628[1] { ResolutionCandidate@6629 }
-}
-
-ResolutionTaskHolder@6630 {
-    <name not found> = ArrayList@6631[1] { ResolutionCandidate@6632 }
-}
-
-ResolutionTaskHolder@6633 {
-    <name not found> = ArrayList@6634[1] { ResolutionCandidate@6635 }
-}
-
-ResolutionTaskHolder@6636 {
-    <name not found> = ArrayList@6637[1] { ResolutionCandidate@6638 }
-}
-
-ResolutionTaskHolder@6639 {
-    <name not found> = ArrayList@6640[1] { ResolutionCandidate@6641 }
-}
-
-ResolutionTaskHolder@6642 {
-    <name not found> = ArrayList@6643[1] { ResolutionCandidate@6644 }
-}
-
-ResolutionTaskHolder@6645 {
-    <name not found> = ArrayList@6646[1] { ResolutionCandidate@6647 }
-}
-
-ResolutionTaskHolder@6648 {
-    <name not found> = ArrayList@6649[1] { ResolutionCandidate@6650 }
-}
-
-ResolutionTaskHolder@6651 {
-    <name not found> = ArrayList@6652[1] { ResolutionCandidate@6653 }
-}
-
-ResolutionTaskHolder@6654 {
-    <name not found> = ArrayList@6655[1] { ResolutionCandidate@6656 }
-}
-
-ResolutionTaskHolder@6657 {
-    <name not found> = ArrayList@6658[1] { ResolutionCandidate@6659 }
-}
-
-ResolutionTaskHolder@6660 {
-    <name not found> = ArrayList@6661[1] { ResolutionCandidate@6662 }
-}
-
-ResolutionTaskHolder@6663 {
-    <name not found> = ArrayList@6664[1] { ResolutionCandidate@6665 }
-}
-
-ResolutionTaskHolder@6666 {
-    <name not found> = ArrayList@6667[1] { ResolutionCandidate@6668 }
-}
-
-ResolutionTaskHolder@6669 {
-    <name not found> = ArrayList@6670[1] { ResolutionCandidate@6671 }
-}
-
-ResolutionTaskHolder@6672 {
-    <name not found> = ArrayList@6673[1] { ResolutionCandidate@6674 }
-}
-
-ResolutionTaskHolder@6675 {
-    <name not found> = ArrayList@6676[1] { ResolutionCandidate@6677 }
-}
-
-ResolutionTaskHolder@6678 {
-    <name not found> = ArrayList@6679[1] { ResolutionCandidate@6680 }
-}
-
-ResolutionTaskHolder@6681 {
-    <name not found> = ArrayList@6682[1] { ResolutionCandidate@6683 }
-}
-
-ResolutionTaskHolder@6684 {
-    <name not found> = ArrayList@6685[1] { ResolutionCandidate@6686 }
-}
-
-ResolutionTaskHolder@6687 {
-    <name not found> = ArrayList@6688[1] { ResolutionCandidate@6689 }
-}
-
-ResolutionTaskHolder@6690 {
-    <name not found> = ArrayList@6691[1] { ResolutionCandidate@6692 }
-}
-
-ResolutionTaskHolder@6693 {
-    <name not found> = ArrayList@6694[1] { ResolutionCandidate@6695 }
-}
-
-ResolutionTaskHolder@6696 {
-    <name not found> = ArrayList@6697[1] { ResolutionCandidate@6698 }
-}
-
-ResolutionTaskHolder@6699 {
-    <name not found> = ArrayList@6700[1] { ResolutionCandidate@6701 }
-}
-
-ResolutionTaskHolder@6702 {
-    <name not found> = ArrayList@6703[1] { ResolutionCandidate@6704 }
-}
-
-ResolutionTaskHolder@6705 {
-    <name not found> = ArrayList@6706[1] { ResolutionCandidate@6707 }
-}
-
-ResolutionTaskHolder@6708 {
-    <name not found> = ArrayList@6709[1] { ResolutionCandidate@6710 }
-}
-
-ResolutionTaskHolder@6711 {
-    <name not found> = ArrayList@6712[1] { ResolutionCandidate@6713 }
-}
-
-ResolutionTaskHolder@6714 {
-    <name not found> = ArrayList@6715[1] { ResolutionCandidate@6716 }
-}
-
-ResolutionTaskHolder@6717 {
-    <name not found> = ArrayList@6718[1] { ResolutionCandidate@6719 }
-}
-
-ResolutionTaskHolder@6720 {
-    <name not found> = ArrayList@6721[1] { ResolutionCandidate@6722 }
-}
-
-ResolutionTaskHolder@6723 {
-    <name not found> = ArrayList@6724[1] { ResolutionCandidate@6725 }
-}
-
-ResolutionTaskHolder@6726 {
-    <name not found> = ArrayList@6727[1] { ResolutionCandidate@6728 }
-}
-
-ResolutionTaskHolder@6729 {
-    <name not found> = ArrayList@6730[1] { ResolutionCandidate@6731 }
-}
-
-ResolutionTaskHolder@6732 {
-    <name not found> = ArrayList@6733[1] { ResolutionCandidate@6734 }
-}
-
-ResolutionTaskHolder@6735 {
-    <name not found> = ArrayList@6736[1] { ResolutionCandidate@6737 }
-}
-
-ResolutionTaskHolder@6738 {
-    <name not found> = ArrayList@6739[1] { ResolutionCandidate@6740 }
-}
-
-ResolutionTaskHolder@6741 {
-    <name not found> = ArrayList@6742[1] { ResolutionCandidate@6743 }
-}
-
-ResolutionTaskHolder@6744 {
-    <name not found> = ArrayList@6745[1] { ResolutionCandidate@6746 }
-}
-
-ResolutionTaskHolder@6747 {
-    <name not found> = ArrayList@6748[1] { ResolutionCandidate@6749 }
-}
-
-ResolutionTaskHolder@6750 {
-    <name not found> = ArrayList@6751[1] { ResolutionCandidate@6752 }
-}
-
-ResolutionTaskHolder@6753 {
-    <name not found> = ArrayList@6754[1] { ResolutionCandidate@6755 }
-}
-
-ResolutionTaskHolder@6756 {
-    <name not found> = ArrayList@6757[1] { ResolutionCandidate@6758 }
-}
-
-ResolutionTaskHolder@6759 {
-    <name not found> = ArrayList@6760[1] { ResolutionCandidate@6761 }
-}
-
-ResolutionTaskHolder@6762 {
-    <name not found> = ArrayList@6763[1] { ResolutionCandidate@6764 }
-}
-
-ResolutionTaskHolder@6765 {
-    <name not found> = ArrayList@6766[1] { ResolutionCandidate@6767 }
-}
-
-ResolutionTaskHolder@6768 {
-    <name not found> = ArrayList@6769[1] { ResolutionCandidate@6770 }
-}
-
-ResolutionTaskHolder@6771 {
-    <name not found> = ArrayList@6772[1] { ResolutionCandidate@6773 }
-}
-
-ResolutionTaskHolder@6774 {
-    <name not found> = ArrayList@6775[1] { ResolutionCandidate@6776 }
-}
-
-ResolutionTaskHolder@6777 {
-    <name not found> = ArrayList@6778[1] { ResolutionCandidate@6779 }
-}
-
-ResolutionTaskHolder@6780 {
-    <name not found> = ArrayList@6781[1] { ResolutionCandidate@6782 }
-}
-
-ResolutionTaskHolder@6783 {
-    <name not found> = ArrayList@6784[1] { ResolutionCandidate@6785 }
-}
-
-ResolutionTaskHolder@6786 {
-    <name not found> = ArrayList@6787[1] { ResolutionCandidate@6788 }
-}
-
-ResolutionTaskHolder@6789 {
-    <name not found> = ArrayList@6790[1] { ResolutionCandidate@6791 }
-}
-
-ResolutionTaskHolder@6792 {
-    <name not found> = ArrayList@6793[1] { ResolutionCandidate@6794 }
-}
-
-ResolutionTaskHolder@6795 {
-    <name not found> = ArrayList@6796[1] { ResolutionCandidate@6797 }
-}
-
-ResolutionTaskHolder@6798 {
-    <name not found> = ArrayList@6799[1] { ResolutionCandidate@6800 }
-}
-
-ResolutionTaskHolder@6801 {
-    <name not found> = ArrayList@6802[1] { ResolutionCandidate@6803 }
-}
-
-ResolutionTaskHolder@6804 {
-    <name not found> = ArrayList@6805[1] { ResolutionCandidate@6806 }
-}
-
-ResolutionTaskHolder@6807 {
-    <name not found> = ArrayList@6808[1] { ResolutionCandidate@6809 }
-}
-
-ResolutionTaskHolder@6810 {
-    <name not found> = ArrayList@6811[1] { ResolutionCandidate@6812 }
-}
-
-ResolutionTaskHolder@6813 {
-    <name not found> = ArrayList@6814[1] { ResolutionCandidate@6815 }
-}
-
-ResolutionTaskHolder@6816 {
-    <name not found> = ArrayList@6817[1] { ResolutionCandidate@6818 }
-}
-
-ResolutionTaskHolder@6819 {
-    <name not found> = ArrayList@6820[1] { ResolutionCandidate@6821 }
-}
-
-ResolutionTaskHolder@6822 {
-    <name not found> = ArrayList@6823[1] { ResolutionCandidate@6824 }
-}
-
-ResolutionTaskHolder@6825 {
-    <name not found> = ArrayList@6826[1] { ResolutionCandidate@6827 }
-}
-
-ResolutionTaskHolder@6828 {
-    <name not found> = ArrayList@6829[1] { ResolutionCandidate@6830 }
-}
-
-ResolutionTaskHolder@6831 {
-    <name not found> = ArrayList@6832[1] { ResolutionCandidate@6833 }
-}
-
-ResolutionTaskHolder@6834 {
-    <name not found> = ArrayList@6835[1] { ResolutionCandidate@6836 }
-}
-
-ResolutionTaskHolder@6837 {
-    <name not found> = ArrayList@6838[1] { ResolutionCandidate@6839 }
-}
-
-ResolutionTaskHolder@6840 {
-    <name not found> = ArrayList@6841[1] { ResolutionCandidate@6842 }
-}
-
-ResolutionTaskHolder@6843 {
-    <name not found> = ArrayList@6844[1] { ResolutionCandidate@6845 }
-}
-
-ResolutionTaskHolder@6846 {
-    <name not found> = ArrayList@6847[1] { ResolutionCandidate@6848 }
-}
-
-ResolutionTaskHolder@6849 {
-    <name not found> = ArrayList@6850[1] { ResolutionCandidate@6851 }
-}
-
-ResolutionTaskHolder@6852 {
-    <name not found> = ArrayList@6853[1] { ResolutionCandidate@6854 }
-}
-
-ResolutionTaskHolder@6855 {
-    <name not found> = ArrayList@6856[1] { ResolutionCandidate@6857 }
-}
-
-ResolutionTaskHolder@6858 {
-    <name not found> = ArrayList@6859[1] { ResolutionCandidate@6860 }
-}
-
-ResolutionTaskHolder@6861 {
-    <name not found> = ArrayList@6862[1] { ResolutionCandidate@6863 }
-}
-
-ResolutionTaskHolder@6864 {
-    <name not found> = ArrayList@6865[1] { ResolutionCandidate@6866 }
-}
-
-ResolutionTaskHolder@6867 {
-    <name not found> = ArrayList@6868[1] { ResolutionCandidate@6869 }
-}
-
-ResolutionTaskHolder@6870 {
-    <name not found> = ArrayList@6871[1] { ResolutionCandidate@6872 }
-}
-
-ResolutionTaskHolder@6873 {
-    <name not found> = ArrayList@6874[1] { ResolutionCandidate@6875 }
-}
-
-ResolutionTaskHolder@6876 {
-    <name not found> = ArrayList@6877[1] { ResolutionCandidate@6878 }
-}
-
-ResolutionTaskHolder@6879 {
-    <name not found> = ArrayList@6880[1] { ResolutionCandidate@6881 }
-}
-
-ResolutionTaskHolder@6882 {
-    <name not found> = ArrayList@6883[1] { ResolutionCandidate@6884 }
-}
-
-ResolutionTaskHolder@6885 {
-    <name not found> = ArrayList@6886[1] { ResolutionCandidate@6887 }
-}
-
-ResolutionTaskHolder@6888 {
-    <name not found> = ArrayList@6889[1] { ResolutionCandidate@6890 }
-}
-
-ResolutionTaskHolder@6891 {
-    <name not found> = ArrayList@6892[1] { ResolutionCandidate@6893 }
-}
-
-ResolutionTaskHolder@6894 {
-    <name not found> = ArrayList@6895[1] { ResolutionCandidate@6896 }
-}
-
-ResolutionTaskHolder@6897 {
-    <name not found> = ArrayList@6898[1] { ResolutionCandidate@6899 }
-}
-
-ResolutionTaskHolder@6900 {
-    <name not found> = ArrayList@6901[1] { ResolutionCandidate@6902 }
-}
-
-ResolutionTaskHolder@6903 {
-    <name not found> = ArrayList@6904[1] { ResolutionCandidate@6905 }
-}
-
-ResolutionTaskHolder@6906 {
-    <name not found> = ArrayList@6907[1] { ResolutionCandidate@6908 }
-}
-
-ResolutionTaskHolder@6909 {
-    <name not found> = ArrayList@6910[1] { ResolutionCandidate@6911 }
-}
-
-ResolutionTaskHolder@6912 {
-    <name not found> = ArrayList@6913[1] { ResolutionCandidate@6914 }
-}
-
-ResolutionTaskHolder@6915 {
-    <name not found> = ArrayList@6916[1] { ResolutionCandidate@6917 }
-}
-
-ResolutionTaskHolder@6918 {
-    <name not found> = ArrayList@6919[1] { ResolutionCandidate@6920 }
-}
-
-ResolutionTaskHolder@6921 {
-    <name not found> = ArrayList@6922[1] { ResolutionCandidate@6923 }
-}
-
-ResolutionTaskHolder@6924 {
-    <name not found> = ArrayList@6925[1] { ResolutionCandidate@6926 }
-}
-
-ResolutionTaskHolder@6927 {
-    <name not found> = ArrayList@6928[1] { ResolutionCandidate@6929 }
-}
-
-ResolutionTaskHolder@6930 {
-    <name not found> = ArrayList@6931[1] { ResolutionCandidate@6932 }
-}
-
-ResolutionTaskHolder@6933 {
-    <name not found> = ArrayList@6934[1] { ResolutionCandidate@6935 }
-}
-
-ResolutionTaskHolder@6936 {
-    <name not found> = ArrayList@6937[1] { ResolutionCandidate@6938 }
-}
-
-ResolutionTaskHolder@6939 {
-    <name not found> = ArrayList@6940[1] { ResolutionCandidate@6941 }
-}
-
-ResolutionTaskHolder@6942 {
-    <name not found> = ArrayList@6943[1] { ResolutionCandidate@6944 }
-}
-
-ResolutionTaskHolder@6945 {
-    <name not found> = ArrayList@6946[1] { ResolutionCandidate@6947 }
-}
-
-ResolutionTaskHolder@6948 {
-    <name not found> = ArrayList@6949[1] { ResolutionCandidate@6950 }
-}
-
-ResolutionTaskHolder@6951 {
-    <name not found> = ArrayList@6952[1] { ResolutionCandidate@6953 }
-}
-
-ResolutionTaskHolder@6954 {
-    <name not found> = ArrayList@6955[1] { ResolutionCandidate@6956 }
-}
-
-ResolutionTaskHolder@6957 {
-    <name not found> = ArrayList@6958[1] { ResolutionCandidate@6959 }
-}
-
-ResolutionTaskHolder@6960 {
-    <name not found> = ArrayList@6961[1] { ResolutionCandidate@6962 }
-}
-
-ResolutionTaskHolder@6963 {
-    <name not found> = ArrayList@6964[1] { ResolutionCandidate@6965 }
-}
-
-ResolutionTaskHolder@6966 {
-    <name not found> = ArrayList@6967[1] { ResolutionCandidate@6968 }
-}
-
-ResolutionTaskHolder@6969 {
-    <name not found> = ArrayList@6970[1] { ResolutionCandidate@6971 }
-}
-
-ResolutionTaskHolder@6972 {
-    <name not found> = ArrayList@6973[1] { ResolutionCandidate@6974 }
-}
-
-ResolutionTaskHolder@6975 {
-    <name not found> = ArrayList@6976[1] { ResolutionCandidate@6977 }
-}
-
-ResolutionTaskHolder@6978 {
-    <name not found> = ArrayList@6979[1] { ResolutionCandidate@6980 }
-}
-
-ResolutionTaskHolder@6981 {
-    <name not found> = ArrayList@6982[1] { ResolutionCandidate@6983 }
-}
-
-ResolutionTaskHolder@6984 {
-    <name not found> = ArrayList@6985[1] { ResolutionCandidate@6986 }
-}
-
-ResolutionTaskHolder@6987 {
-    <name not found> = ArrayList@6988[1] { ResolutionCandidate@6989 }
-}
-
-ResolutionTaskHolder@6990 {
-    <name not found> = ArrayList@6991[1] { ResolutionCandidate@6992 }
-}
-
-ResolutionTaskHolder@6993 {
-    <name not found> = ArrayList@6994[1] { ResolutionCandidate@6995 }
-}
-
-ResolutionTaskHolder@6996 {
-    <name not found> = ArrayList@6997[1] { ResolutionCandidate@6998 }
-}
-
-ResolutionTaskHolder@6999 {
-    <name not found> = ArrayList@7000[1] { ResolutionCandidate@7001 }
-}
-
-ResolutionTaskHolder@7002 {
-    <name not found> = ArrayList@7003[1] { ResolutionCandidate@7004 }
-}
-
-ResolutionTaskHolder@7005 {
-    <name not found> = ArrayList@7006[1] { ResolutionCandidate@7007 }
-}
-
-ResolutionTaskHolder@7008 {
-    <name not found> = ArrayList@7009[1] { ResolutionCandidate@7010 }
-}
-
-ResolutionTaskHolder@7011 {
-    <name not found> = ArrayList@7012[1] { ResolutionCandidate@7013 }
-}
-
-ResolutionTaskHolder@7014 {
-    <name not found> = ArrayList@7015[1] { ResolutionCandidate@7016 }
-}
-
-ResolutionTaskHolder@7017 {
-    <name not found> = ArrayList@7018[1] { ResolutionCandidate@7019 }
-}
-
-ResolutionTaskHolder@7020 {
-    <name not found> = ArrayList@7021[1] { ResolutionCandidate@7022 }
-}
-
-ResolutionTaskHolder@7023 {
-    <name not found> = ArrayList@7024[1] { ResolutionCandidate@7025 }
-}
-
-ResolutionTaskHolder@7026 {
-    <name not found> = ArrayList@7027[1] { ResolutionCandidate@7028 }
-}
-
-ResolutionTaskHolder@7029 {
-    <name not found> = ArrayList@7030[1] { ResolutionCandidate@7031 }
-}
-
-ResolutionTaskHolder@7032 {
-    <name not found> = ArrayList@7033[1] { ResolutionCandidate@7034 }
-}
-
-ResolutionTaskHolder@7035 {
-    <name not found> = ArrayList@7036[1] { ResolutionCandidate@7037 }
-}
-
-ResolutionTaskHolder@7038 {
-    <name not found> = ArrayList@7039[1] { ResolutionCandidate@7040 }
-}
-
-ResolutionTaskHolder@7041 {
-    <name not found> = ArrayList@7042[1] { ResolutionCandidate@7043 }
-}
-
-ResolutionTaskHolder@7044 {
-    <name not found> = ArrayList@7045[1] { ResolutionCandidate@7046 }
-}
-
-ResolutionTaskHolder@7047 {
-    <name not found> = ArrayList@7048[1] { ResolutionCandidate@7049 }
-}
-
-ResolutionTaskHolder@7050 {
-    <name not found> = ArrayList@7051[1] { ResolutionCandidate@7052 }
-}
-
-ResolutionTaskHolder@7053 {
-    <name not found> = ArrayList@7054[1] { ResolutionCandidate@7055 }
-}
-
-ResolutionTaskHolder@7056 {
-    <name not found> = ArrayList@7057[1] { ResolutionCandidate@7058 }
-}
-
-ResolutionTaskHolder@7059 {
-    <name not found> = ArrayList@7060[1] { ResolutionCandidate@7061 }
-}
-
-ResolutionTaskHolder@7062 {
-    <name not found> = ArrayList@7063[1] { ResolutionCandidate@7064 }
-}
-
-ResolutionTaskHolder@7065 {
-    <name not found> = ArrayList@7066[1] { ResolutionCandidate@7067 }
-}
-
-ResolutionTaskHolder@7068 {
-    <name not found> = ArrayList@7069[1] { ResolutionCandidate@7070 }
-}
-
-ResolutionTaskHolder@7071 {
-    <name not found> = ArrayList@7072[1] { ResolutionCandidate@7073 }
-}
-
-ResolutionTaskHolder@7074 {
-    <name not found> = ArrayList@7075[1] { ResolutionCandidate@7076 }
-}
-
-ResolutionTaskHolder@7077 {
-    <name not found> = ArrayList@7078[1] { ResolutionCandidate@7079 }
-}
-
-ResolutionTaskHolder@7080 {
-    <name not found> = ArrayList@7081[1] { ResolutionCandidate@7082 }
-}
-
-ResolutionTaskHolder@7083 {
-    <name not found> = ArrayList@7084[1] { ResolutionCandidate@7085 }
-}
-
-ResolutionTaskHolder@7086 {
-    <name not found> = ArrayList@7087[1] { ResolutionCandidate@7088 }
-}
-
-ResolutionTaskHolder@7089 {
-    <name not found> = ArrayList@7090[1] { ResolutionCandidate@7091 }
-}
-
-ResolutionTaskHolder@7092 {
-    <name not found> = ArrayList@7093[1] { ResolutionCandidate@7094 }
-}
-
-ResolutionTaskHolder@7095 {
-    <name not found> = ArrayList@7096[1] { ResolutionCandidate@7097 }
-}
-
-ResolutionTaskHolder@7098 {
-    <name not found> = ArrayList@7099[1] { ResolutionCandidate@7100 }
-}
-
-ResolutionTaskHolder@7101 {
-    <name not found> = ArrayList@7102[1] { ResolutionCandidate@7103 }
-}
-
-ResolutionTaskHolder@7104 {
-    <name not found> = ArrayList@7105[1] { ResolutionCandidate@7106 }
-}
-
-ResolutionTaskHolder@7107 {
-    <name not found> = ArrayList@7108[1] { ResolutionCandidate@7109 }
-}
-
-ResolutionTaskHolder@7110 {
-    <name not found> = ArrayList@7111[1] { ResolutionCandidate@7112 }
-}
-
-ResolutionTaskHolder@7113 {
-    <name not found> = ArrayList@7114[1] { ResolutionCandidate@7115 }
-}
-
-ResolutionTaskHolder@7116 {
-    <name not found> = ArrayList@7117[1] { ResolutionCandidate@7118 }
-}
-
-ResolutionTaskHolder@7119 {
-    <name not found> = ArrayList@7120[1] { ResolutionCandidate@7121 }
-}
-
-ResolutionTaskHolder@7122 {
-    <name not found> = ArrayList@7123[1] { ResolutionCandidate@7124 }
-}
-
-ResolutionTaskHolder@7125 {
-    <name not found> = ArrayList@7126[1] { ResolutionCandidate@7127 }
-}
-
-ResolutionTaskHolder@7128 {
-    <name not found> = ArrayList@7129[1] { ResolutionCandidate@7130 }
-}
-
-ResolutionTaskHolder@7131 {
-    <name not found> = ArrayList@7132[1] { ResolutionCandidate@7133 }
-}
-
-ResolutionTaskHolder@7134 {
-    <name not found> = ArrayList@7135[1] { ResolutionCandidate@7136 }
-}
-
-ResolutionTaskHolder@7137 {
-    <name not found> = ArrayList@7138[1] { ResolutionCandidate@7139 }
-}
-
-ResolutionTaskHolder@7140 {
-    <name not found> = ArrayList@7141[1] { ResolutionCandidate@7142 }
-}
-
-ResolutionTaskHolder@7143 {
-    <name not found> = ArrayList@7144[1] { ResolutionCandidate@7145 }
-}
-
-ResolutionTaskHolder@7146 {
-    <name not found> = ArrayList@7147[1] { ResolutionCandidate@7148 }
-}
-
-ResolutionTaskHolder@7149 {
-    <name not found> = ArrayList@7150[1] { ResolutionCandidate@7151 }
-}
-
-ResolutionTaskHolder@7152 {
-    <name not found> = ArrayList@7153[1] { ResolutionCandidate@7154 }
-}
-
-ResolutionTaskHolder@7155 {
-    <name not found> = ArrayList@7156[1] { ResolutionCandidate@7157 }
-}
-
-ResolutionTaskHolder@7158 {
-    <name not found> = ArrayList@7159[1] { ResolutionCandidate@7160 }
-}
-
-ResolutionTaskHolder@7161 {
-    <name not found> = ArrayList@7162[1] { ResolutionCandidate@7163 }
-}
-
-ResolutionTaskHolder@7164 {
-    <name not found> = ArrayList@7165[1] { ResolutionCandidate@7166 }
-}
-
-ResolutionTaskHolder@7167 {
-    <name not found> = ArrayList@7168[1] { ResolutionCandidate@7169 }
-}
-
-ResolutionTaskHolder@7170 {
-    <name not found> = ArrayList@7171[1] { ResolutionCandidate@7172 }
-}
-
-ResolutionTaskHolder@7173 {
-    <name not found> = ArrayList@7174[1] { ResolutionCandidate@7175 }
-}
-
-ResolutionTaskHolder@7176 {
-    <name not found> = ArrayList@7177[1] { ResolutionCandidate@7178 }
-}
-
-ResolutionTaskHolder@7179 {
-    <name not found> = ArrayList@7180[1] { ResolutionCandidate@7181 }
-}
-
-ResolutionTaskHolder@7182 {
-    <name not found> = ArrayList@7183[1] { ResolutionCandidate@7184 }
-}
-
-ResolutionTaskHolder@7185 {
-    <name not found> = ArrayList@7186[1] { ResolutionCandidate@7187 }
-}
-
-ResolutionTaskHolder@7188 {
-    <name not found> = ArrayList@7189[1] { ResolutionCandidate@7190 }
-}
-
-ResolutionTaskHolder@7191 {
-    <name not found> = ArrayList@7192[1] { ResolutionCandidate@7193 }
-}
-
-ResolutionTaskHolder@7194 {
-    <name not found> = ArrayList@7195[1] { ResolutionCandidate@7196 }
-}
-
-ResolutionTaskHolder@7197 {
-    <name not found> = ArrayList@7198[1] { ResolutionCandidate@7199 }
-}
-
-ResolutionTaskHolder@7200 {
-    <name not found> = ArrayList@7201[1] { ResolutionCandidate@7202 }
-}
-
-ResolutionTaskHolder@7203 {
-    <name not found> = ArrayList@7204[1] { ResolutionCandidate@7205 }
-}
-
-ResolutionTaskHolder@7206 {
-    <name not found> = ArrayList@7207[1] { ResolutionCandidate@7208 }
-}
-
-ResolutionTaskHolder@7209 {
-    <name not found> = ArrayList@7210[1] { ResolutionCandidate@7211 }
-}
-
-ResolutionTaskHolder@7212 {
-    <name not found> = ArrayList@7213[1] { ResolutionCandidate@7214 }
-}
-
-ResolutionTaskHolder@7215 {
-    <name not found> = ArrayList@7216[1] { ResolutionCandidate@7217 }
-}
-
-ResolutionTaskHolder@7218 {
-    <name not found> = ArrayList@7219[1] { ResolutionCandidate@7220 }
-}
-
-ResolutionTaskHolder@7221 {
-    <name not found> = ArrayList@7222[1] { ResolutionCandidate@7223 }
-}
-
-ResolutionTaskHolder@7224 {
-    <name not found> = ArrayList@7225[1] { ResolutionCandidate@7226 }
-}
-
-ResolutionTaskHolder@7227 {
-    <name not found> = ArrayList@7228[1] { ResolutionCandidate@7229 }
-}
-
-ResolutionTaskHolder@7230 {
-    <name not found> = ArrayList@7231[1] { ResolutionCandidate@7232 }
-}
-
-ResolutionTaskHolder@7233 {
-    <name not found> = ArrayList@7234[1] { ResolutionCandidate@7235 }
-}
-
-ResolutionTaskHolder@7236 {
-    <name not found> = ArrayList@7237[1] { ResolutionCandidate@7238 }
-}
-
-ResolutionTaskHolder@7239 {
-    <name not found> = ArrayList@7240[1] { ResolutionCandidate@7241 }
-}
-
-ResolutionTaskHolder@7242 {
-    <name not found> = ArrayList@7243[1] { ResolutionCandidate@7244 }
-}
-
-ResolutionTaskHolder@7245 {
-    <name not found> = ArrayList@7246[1] { ResolutionCandidate@7247 }
-}
-
-ResolutionTaskHolder@7248 {
-    <name not found> = ArrayList@7249[1] { ResolutionCandidate@7250 }
-}
-
-ResolutionTaskHolder@7251 {
-    <name not found> = ArrayList@7252[1] { ResolutionCandidate@7253 }
-}
-
-ResolutionTaskHolder@7254 {
-    <name not found> = ArrayList@7255[1] { ResolutionCandidate@7256 }
-}
-
-ResolutionTaskHolder@7257 {
-    <name not found> = ArrayList@7258[1] { ResolutionCandidate@7259 }
-}
-
-ResolutionTaskHolder@7260 {
-    <name not found> = ArrayList@7261[1] { ResolutionCandidate@7262 }
-}
-
-ResolutionTaskHolder@7263 {
-    <name not found> = ArrayList@7264[1] { ResolutionCandidate@7265 }
-}
-
-ResolutionTaskHolder@7266 {
-    <name not found> = ArrayList@7267[1] { ResolutionCandidate@7268 }
-}
-
-ResolutionTaskHolder@7269 {
-    <name not found> = ArrayList@7270[1] { ResolutionCandidate@7271 }
-}
-
-ResolutionTaskHolder@7272 {
-    <name not found> = ArrayList@7273[1] { ResolutionCandidate@7274 }
-}
-
-ResolutionTaskHolder@7275 {
-    <name not found> = ArrayList@7276[1] { ResolutionCandidate@7277 }
-}
-
-ResolutionTaskHolder@7278 {
-    <name not found> = ArrayList@7279[1] { ResolutionCandidate@7280 }
-}
-
-ResolutionTaskHolder@7281 {
-    <name not found> = ArrayList@7282[1] { ResolutionCandidate@7283 }
-}
-
-ResolutionTaskHolder@7284 {
-    <name not found> = ArrayList@7285[1] { ResolutionCandidate@7286 }
-}
-
-ResolutionTaskHolder@7287 {
-    <name not found> = ArrayList@7288[1] { ResolutionCandidate@7289 }
-}
-
-ResolutionTaskHolder@7290 {
-    <name not found> = ArrayList@7291[1] { ResolutionCandidate@7292 }
-}
-
-ResolutionTaskHolder@7293 {
-    <name not found> = ArrayList@7294[1] { ResolutionCandidate@7295 }
-}
-
-ResolutionTaskHolder@7296 {
-    <name not found> = ArrayList@7297[1] { ResolutionCandidate@7298 }
-}
-
-ResolutionTaskHolder@7299 {
-    <name not found> = ArrayList@7300[1] { ResolutionCandidate@7301 }
-}
-
-ResolutionTaskHolder@7302 {
-    <name not found> = ArrayList@7303[1] { ResolutionCandidate@7304 }
-}
-
-ResolutionTaskHolder@7305 {
-    <name not found> = ArrayList@7306[1] { ResolutionCandidate@7307 }
-}
-
-ResolutionTaskHolder@7308 {
-    <name not found> = ArrayList@7309[1] { ResolutionCandidate@7310 }
-}
-
-ResolutionTaskHolder@7311 {
-    <name not found> = ArrayList@7312[1] { ResolutionCandidate@7313 }
-}
-
-ResolutionTaskHolder@7314 {
-    <name not found> = ArrayList@7315[1] { ResolutionCandidate@7316 }
-}
-
-ResolutionTaskHolder@7317 {
-    <name not found> = ArrayList@7318[1] { ResolutionCandidate@7319 }
-}
-
-ResolutionTaskHolder@7320 {
-    <name not found> = ArrayList@7321[1] { ResolutionCandidate@7322 }
-}
-
-ResolutionTaskHolder@7323 {
-    <name not found> = ArrayList@7324[1] { ResolutionCandidate@7325 }
-}
-
-ResolutionTaskHolder@7326 {
-    <name not found> = ArrayList@7327[1] { ResolutionCandidate@7328 }
-}
-
-ResolutionTaskHolder@7329 {
-    <name not found> = ArrayList@7330[1] { ResolutionCandidate@7331 }
-}
-
-ResolutionTaskHolder@7332 {
-    <name not found> = ArrayList@7333[1] { ResolutionCandidate@7334 }
-}
-
-ResolutionTaskHolder@7335 {
-    <name not found> = ArrayList@7336[1] { ResolutionCandidate@7337 }
-}
-
-ResolutionTaskHolder@7338 {
-    <name not found> = ArrayList@7339[1] { ResolutionCandidate@7340 }
-}
-
-ResolutionTaskHolder@7341 {
-    <name not found> = ArrayList@7342[1] { ResolutionCandidate@7343 }
-}
-
-ResolutionTaskHolder@7344 {
-    <name not found> = ArrayList@7345[1] { ResolutionCandidate@7346 }
-}
-
-ResolutionTaskHolder@7347 {
-    <name not found> = ArrayList@7348[1] { ResolutionCandidate@7349 }
-}
-
-ResolutionTaskHolder@7350 {
-    <name not found> = ArrayList@7351[1] { ResolutionCandidate@7352 }
-}
-
-ResolutionTaskHolder@7353 {
-    <name not found> = ArrayList@7354[1] { ResolutionCandidate@7355 }
-}
-
-ResolutionTaskHolder@7356 {
-    <name not found> = ArrayList@7357[1] { ResolutionCandidate@7358 }
-}
-
-ResolutionTaskHolder@7359 {
-    <name not found> = ArrayList@7360[1] { ResolutionCandidate@7361 }
-}
-
-ResolutionTaskHolder@7362 {
-    <name not found> = ArrayList@7363[1] { ResolutionCandidate@7364 }
-}
-
-ResolutionTaskHolder@7365 {
-    <name not found> = ArrayList@7366[1] { ResolutionCandidate@7367 }
-}
-
-ResolutionTaskHolder@7368 {
-    <name not found> = ArrayList@7369[1] { ResolutionCandidate@7370 }
-}
-
-ResolutionTaskHolder@7371 {
-    <name not found> = ArrayList@7372[1] { ResolutionCandidate@7373 }
-}
-
-ResolutionTaskHolder@7374 {
-    <name not found> = ArrayList@7375[1] { ResolutionCandidate@7376 }
-}
-
-ResolutionTaskHolder@7377 {
-    <name not found> = ArrayList@7378[1] { ResolutionCandidate@7379 }
-}
-
-ResolutionTaskHolder@7380 {
-    <name not found> = ArrayList@7381[1] { ResolutionCandidate@7382 }
-}
-
-ResolutionTaskHolder@7383 {
-    <name not found> = ArrayList@7384[1] { ResolutionCandidate@7385 }
-}
-
-ResolutionTaskHolder@7386 {
-    <name not found> = ArrayList@7387[1] { ResolutionCandidate@7388 }
-}
-
-ResolutionTaskHolder@7389 {
-    <name not found> = ArrayList@7390[1] { ResolutionCandidate@7391 }
-}
-
-ResolutionTaskHolder@7392 {
-    <name not found> = ArrayList@7393[1] { ResolutionCandidate@7394 }
-}
-
-ResolutionTaskHolder@7395 {
-    <name not found> = ArrayList@7396[1] { ResolutionCandidate@7397 }
-}
-
-ResolutionTaskHolder@7398 {
-    <name not found> = ArrayList@7399[1] { ResolutionCandidate@7400 }
-}
-
-ResolutionTaskHolder@7401 {
-    <name not found> = ArrayList@7402[1] { ResolutionCandidate@7403 }
-}
-
-ResolutionTaskHolder@7404 {
-    <name not found> = ArrayList@7405[1] { ResolutionCandidate@7406 }
-}
-
-ResolutionTaskHolder@7407 {
-    <name not found> = ArrayList@7408[1] { ResolutionCandidate@7409 }
-}
-
-ResolutionTaskHolder@7410 {
-    <name not found> = ArrayList@7411[1] { ResolutionCandidate@7412 }
-}
-
-ResolutionTaskHolder@7413 {
-    <name not found> = ArrayList@7414[1] { ResolutionCandidate@7415 }
-}
-
-ResolutionTaskHolder@7416 {
-    <name not found> = ArrayList@7417[1] { ResolutionCandidate@7418 }
-}
-
-ResolutionTaskHolder@7419 {
-    <name not found> = ArrayList@7420[1] { ResolutionCandidate@7421 }
-}
-
-ResolutionTaskHolder@7422 {
-    <name not found> = ArrayList@7423[1] { ResolutionCandidate@7424 }
-}
-
-ResolutionTaskHolder@7425 {
-    <name not found> = ArrayList@7426[1] { ResolutionCandidate@7427 }
-}
-
-ResolutionTaskHolder@7428 {
-    <name not found> = ArrayList@7429[1] { ResolutionCandidate@7430 }
-}
-
-ResolutionTaskHolder@7431 {
-    <name not found> = ArrayList@7432[1] { ResolutionCandidate@7433 }
-}
-
-ResolutionTaskHolder@7434 {
-    <name not found> = ArrayList@7435[1] { ResolutionCandidate@7436 }
-}
-
-ResolutionTaskHolder@7437 {
-    <name not found> = ArrayList@7438[1] { ResolutionCandidate@7439 }
-}
-
-ResolutionTaskHolder@7440 {
-    <name not found> = ArrayList@7441[1] { ResolutionCandidate@7442 }
-}
-
-ResolutionTaskHolder@7443 {
-    <name not found> = ArrayList@7444[1] { ResolutionCandidate@7445 }
-}
-
-ResolutionTaskHolder@7446 {
-    <name not found> = ArrayList@7447[1] { ResolutionCandidate@7448 }
-}
-
-ResolutionTaskHolder@7449 {
-    <name not found> = ArrayList@7450[1] { ResolutionCandidate@7451 }
-}
-
-ResolutionTaskHolder@7452 {
-    <name not found> = ArrayList@7453[1] { ResolutionCandidate@7454 }
-}
-
-ResolutionTaskHolder@7455 {
-    <name not found> = ArrayList@7456[1] { ResolutionCandidate@7457 }
-}
-
-ResolutionTaskHolder@7458 {
-    <name not found> = ArrayList@7459[1] { ResolutionCandidate@7460 }
-}
-
-ResolutionTaskHolder@7461 {
-    <name not found> = ArrayList@7462[1] { ResolutionCandidate@7463 }
-}
-
-ResolutionTaskHolder@7464 {
-    <name not found> = ArrayList@7465[1] { ResolutionCandidate@7466 }
-}
-
-ResolutionTaskHolder@7467 {
-    <name not found> = ArrayList@7468[1] { ResolutionCandidate@7469 }
-}
-
-ResolutionTaskHolder@7470 {
-    <name not found> = ArrayList@7471[1] { ResolutionCandidate@7472 }
-}
-
-ResolutionTaskHolder@7473 {
-    <name not found> = ArrayList@7474[1] { ResolutionCandidate@7475 }
-}
-
-ResolutionTaskHolder@7476 {
-    <name not found> = ArrayList@7477[1] { ResolutionCandidate@7478 }
-}
-
-ResolutionTaskHolder@7479 {
-    <name not found> = ArrayList@7480[1] { ResolutionCandidate@7481 }
-}
-
-ResolutionTaskHolder@7482 {
-    <name not found> = ArrayList@7483[1] { ResolutionCandidate@7484 }
-}
-
-ResolutionTaskHolder@7485 {
-    <name not found> = ArrayList@7486[1] { ResolutionCandidate@7487 }
-}
-
-ResolutionTaskHolder@7488 {
-    <name not found> = ArrayList@7489[1] { ResolutionCandidate@7490 }
-}
-
-ResolutionTaskHolder@7491 {
-    <name not found> = ArrayList@7492[1] { ResolutionCandidate@7493 }
-}
-
-ResolutionTaskHolder@7494 {
-    <name not found> = ArrayList@7495[1] { ResolutionCandidate@7496 }
-}
-
-ResolutionTaskHolder@7497 {
-    <name not found> = ArrayList@7498[1] { ResolutionCandidate@7499 }
-}
-
-ResolutionTaskHolder@7500 {
-    <name not found> = ArrayList@7501[1] { ResolutionCandidate@7502 }
-}
-
-ResolutionTaskHolder@7503 {
-    <name not found> = ArrayList@7504[1] { ResolutionCandidate@7505 }
-}
-
-ResolutionTaskHolder@7506 {
-    <name not found> = ArrayList@7507[1] { ResolutionCandidate@7508 }
-}
-
-ResolutionTaskHolder@7509 {
-    <name not found> = ArrayList@7510[1] { ResolutionCandidate@7511 }
-}
-
-ResolutionTaskHolder@7512 {
-    <name not found> = ArrayList@7513[1] { ResolutionCandidate@7514 }
-}
-
-ResolutionTaskHolder@7515 {
-    <name not found> = ArrayList@7516[1] { ResolutionCandidate@7517 }
-}
-
-ResolutionTaskHolder@7518 {
-    <name not found> = ArrayList@7519[1] { ResolutionCandidate@7520 }
-}
-
-ResolutionTaskHolder@7521 {
-    <name not found> = ArrayList@7522[1] { ResolutionCandidate@7523 }
-}
-
-ResolutionTaskHolder@7524 {
-    <name not found> = ArrayList@7525[1] { ResolutionCandidate@7526 }
-}
-
-ResolutionTaskHolder@7527 {
-    <name not found> = ArrayList@7528[1] { ResolutionCandidate@7529 }
-}
-
-ResolutionTaskHolder@7530 {
-    <name not found> = ArrayList@7531[1] { ResolutionCandidate@7532 }
-}
-
-ResolutionTaskHolder@7533 {
-    <name not found> = ArrayList@7534[1] { ResolutionCandidate@7535 }
-}
-
-ResolutionTaskHolder@7536 {
-    <name not found> = ArrayList@7537[1] { ResolutionCandidate@7538 }
-}
-
-ResolutionTaskHolder@7539 {
-    <name not found> = ArrayList@7540[1] { ResolutionCandidate@7541 }
-}
-
-ResolutionTaskHolder@7542 {
-    <name not found> = ArrayList@7543[1] { ResolutionCandidate@7544 }
-}
-
-ResolutionTaskHolder@7545 {
-    <name not found> = ArrayList@7546[1] { ResolutionCandidate@7547 }
-}
-
-ResolutionTaskHolder@7548 {
-    <name not found> = ArrayList@7549[1] { ResolutionCandidate@7550 }
-}
-
-ResolutionTaskHolder@7551 {
-    <name not found> = ArrayList@7552[1] { ResolutionCandidate@7553 }
-}
-
-ResolutionTaskHolder@7554 {
-    <name not found> = ArrayList@7555[1] { ResolutionCandidate@7556 }
-}
-
-ResolutionTaskHolder@7557 {
-    <name not found> = ArrayList@7558[1] { ResolutionCandidate@7559 }
-}
-
-ResolutionTaskHolder@7560 {
-    <name not found> = ArrayList@7561[1] { ResolutionCandidate@7562 }
-}
-
-ResolutionTaskHolder@7563 {
-    <name not found> = ArrayList@7564[1] { ResolutionCandidate@7565 }
-}
-
-ResolutionTaskHolder@7566 {
-    <name not found> = ArrayList@7567[1] { ResolutionCandidate@7568 }
-}
-
-ResolutionTaskHolder@7569 {
-    <name not found> = ArrayList@7570[1] { ResolutionCandidate@7571 }
-}
-
-ResolutionTaskHolder@7572 {
-    <name not found> = ArrayList@7573[1] { ResolutionCandidate@7574 }
-}
-
-ResolutionTaskHolder@7575 {
-    <name not found> = ArrayList@7576[1] { ResolutionCandidate@7577 }
-}
-
-ResolutionTaskHolder@7578 {
-    <name not found> = ArrayList@7579[1] { ResolutionCandidate@7580 }
-}
-
-ResolutionTaskHolder@7581 {
-    <name not found> = ArrayList@7582[1] { ResolutionCandidate@7583 }
-}
-
-ResolutionTaskHolder@7584 {
-    <name not found> = ArrayList@7585[1] { ResolutionCandidate@7586 }
-}
-
-ResolutionTaskHolder@7587 {
-    <name not found> = ArrayList@7588[1] { ResolutionCandidate@7589 }
-}
-
-ResolutionTaskHolder@7590 {
-    <name not found> = ArrayList@7591[1] { ResolutionCandidate@7592 }
-}
-
-ResolutionTaskHolder@7593 {
-    <name not found> = ArrayList@7594[1] { ResolutionCandidate@7595 }
-}
-
-ResolutionTaskHolder@7596 {
-    <name not found> = ArrayList@7597[1] { ResolutionCandidate@7598 }
-}
-
-ResolutionTaskHolder@7599 {
-    <name not found> = ArrayList@7600[1] { ResolutionCandidate@7601 }
-}
-
-ResolutionTaskHolder@7602 {
-    <name not found> = ArrayList@7603[1] { ResolutionCandidate@7604 }
-}
-
-ResolutionTaskHolder@7605 {
-    <name not found> = ArrayList@7606[1] { ResolutionCandidate@7607 }
-}
-
-ResolutionTaskHolder@7608 {
-    <name not found> = ArrayList@7609[1] { ResolutionCandidate@7610 }
-}
-
-ResolutionTaskHolder@7611 {
-    <name not found> = ArrayList@7612[1] { ResolutionCandidate@7613 }
-}
-
-ResolutionTaskHolder@7614 {
-    <name not found> = ArrayList@7615[1] { ResolutionCandidate@7616 }
-}
-
-ResolutionTaskHolder@7617 {
-    <name not found> = ArrayList@7618[1] { ResolutionCandidate@7619 }
-}
-
-ResolutionTaskHolder@7620 {
-    <name not found> = ArrayList@7621[1] { ResolutionCandidate@7622 }
-}
-
-ResolutionTaskHolder@7623 {
-    <name not found> = ArrayList@7624[1] { ResolutionCandidate@7625 }
-}
-
-ResolutionTaskHolder@7626 {
-    <name not found> = ArrayList@7627[1] { ResolutionCandidate@7628 }
-}
-
-ResolutionTaskHolder@7629 {
-    <name not found> = ArrayList@7630[1] { ResolutionCandidate@7631 }
-}
-
-ResolutionTaskHolder@7632 {
-    <name not found> = ArrayList@7633[1] { ResolutionCandidate@7634 }
-}
-
-ResolutionTaskHolder@7635 {
-    <name not found> = ArrayList@7636[1] { ResolutionCandidate@7637 }
-}
-
-ResolutionTaskHolder@7638 {
-    <name not found> = ArrayList@7639[1] { ResolutionCandidate@7640 }
-}
-
-ResolutionTaskHolder@7641 {
-    <name not found> = ArrayList@7642[1] { ResolutionCandidate@7643 }
-}
-
-ResolutionTaskHolder@7644 {
-    <name not found> = ArrayList@7645[1] { ResolutionCandidate@7646 }
-}
-
-ResolutionTaskHolder@7647 {
-    <name not found> = ArrayList@7648[1] { ResolutionCandidate@7649 }
-}
-
-ResolutionTaskHolder@7650 {
-    <name not found> = ArrayList@7651[1] { ResolutionCandidate@7652 }
-}
-
-ResolutionTaskHolder@7653 {
-    <name not found> = ArrayList@7654[1] { ResolutionCandidate@7655 }
-}
-
-ResolutionTaskHolder@7656 {
-    <name not found> = ArrayList@7657[1] { ResolutionCandidate@7658 }
-}
-
-ResolutionTaskHolder@7659 {
-    <name not found> = ArrayList@7660[1] { ResolutionCandidate@7661 }
-}
-
-ResolutionTaskHolder@7662 {
-    <name not found> = ArrayList@7663[1] { ResolutionCandidate@7664 }
-}
-
-ResolutionTaskHolder@7665 {
-    <name not found> = ArrayList@7666[1] { ResolutionCandidate@7667 }
-}
-
-ResolutionTaskHolder@7668 {
-    <name not found> = ArrayList@7669[1] { ResolutionCandidate@7670 }
-}
-
-ResolutionTaskHolder@7671 {
-    <name not found> = ArrayList@7672[1] { ResolutionCandidate@7673 }
-}
-
-ResolutionTaskHolder@7674 {
-    <name not found> = ArrayList@7675[1] { ResolutionCandidate@7676 }
-}
-
-ResolutionTaskHolder@7677 {
-    <name not found> = ArrayList@7678[1] { ResolutionCandidate@7679 }
-}
-
-ResolutionTaskHolder@7680 {
-    <name not found> = ArrayList@7681[1] { ResolutionCandidate@7682 }
-}
-
-ResolutionTaskHolder@7683 {
-    <name not found> = ArrayList@7684[1] { ResolutionCandidate@7685 }
-}
-
-ResolutionTaskHolder@7686 {
-    <name not found> = ArrayList@7687[1] { ResolutionCandidate@7688 }
-}
-
-ResolutionTaskHolder@7689 {
-    <name not found> = ArrayList@7690[1] { ResolutionCandidate@7691 }
-}
-
-ResolutionTaskHolder@7692 {
-    <name not found> = ArrayList@7693[1] { ResolutionCandidate@7694 }
-}
-
-ResolutionTaskHolder@7695 {
-    <name not found> = ArrayList@7696[1] { ResolutionCandidate@7697 }
-}
-
-ResolutionTaskHolder@7698 {
-    <name not found> = ArrayList@7699[1] { ResolutionCandidate@7700 }
-}
-
-ResolutionTaskHolder@7701 {
-    <name not found> = ArrayList@7702[1] { ResolutionCandidate@7703 }
-}
-
-ResolutionTaskHolder@7704 {
-    <name not found> = ArrayList@7705[1] { ResolutionCandidate@7706 }
-}
-
-ResolutionTaskHolder@7707 {
-    <name not found> = ArrayList@7708[1] { ResolutionCandidate@7709 }
-}
-
-ResolutionTaskHolder@7710 {
-    <name not found> = ArrayList@7711[1] { ResolutionCandidate@7712 }
-}
-
-ResolutionTaskHolder@7713 {
-    <name not found> = ArrayList@7714[1] { ResolutionCandidate@7715 }
-}
-
-ResolutionTaskHolder@7716 {
-    <name not found> = ArrayList@7717[1] { ResolutionCandidate@7718 }
-}
-
-ResolutionTaskHolder@7719 {
-    <name not found> = ArrayList@7720[1] { ResolutionCandidate@7721 }
-}
-
-ResolutionTaskHolder@7722 {
-    <name not found> = ArrayList@7723[1] { ResolutionCandidate@7724 }
-}
-
-ResolutionTaskHolder@7725 {
-    <name not found> = ArrayList@7726[1] { ResolutionCandidate@7727 }
-}
-
-ResolutionTaskHolder@7728 {
-    <name not found> = ArrayList@7729[1] { ResolutionCandidate@7730 }
-}
-
-ResolutionTaskHolder@7731 {
-    <name not found> = ArrayList@7732[6] { ResolutionCandidate@7733, ResolutionCandidate@7734, ResolutionCandidate@7735, ... }
-}
-
-ResolutionTaskHolder@7736 {
-    <name not found> = ArrayList@7737[6] { ResolutionCandidate@7738, ResolutionCandidate@7739, ResolutionCandidate@7740, ... }
-}
-
-ResolutionTaskHolder@7741 {
-    <name not found> = ArrayList@7742[6] { ResolutionCandidate@7743, ResolutionCandidate@7744, ResolutionCandidate@7745, ... }
-}
-
-ResolutionTaskHolder@7746 {
-    <name not found> = ArrayList@7747[6] { ResolutionCandidate@7748, ResolutionCandidate@7749, ResolutionCandidate@7750, ... }
-}
-
-ResolutionTaskHolder@7751 {
-    <name not found> = ArrayList@7752[6] { ResolutionCandidate@7753, ResolutionCandidate@7754, ResolutionCandidate@7755, ... }
-}
-
-ResolutionTaskHolder@7756 {
-    <name not found> = ArrayList@7757[6] { ResolutionCandidate@7758, ResolutionCandidate@7759, ResolutionCandidate@7760, ... }
-}
-
-ResolutionTaskHolder@7761 {
-    <name not found> = ArrayList@7762[6] { ResolutionCandidate@7763, ResolutionCandidate@7764, ResolutionCandidate@7765, ... }
-}
-
-ResolutionTaskHolder@7766 {
-    <name not found> = ArrayList@7767[6] { ResolutionCandidate@7768, ResolutionCandidate@7769, ResolutionCandidate@7770, ... }
-}
-
-ResolutionTaskHolder@7771 {
-    <name not found> = ArrayList@7772[6] { ResolutionCandidate@7773, ResolutionCandidate@7774, ResolutionCandidate@7775, ... }
-}
-
-ResolutionTaskHolder@7776 {
-    <name not found> = ArrayList@7777[6] { ResolutionCandidate@7778, ResolutionCandidate@7779, ResolutionCandidate@7780, ... }
-}
-
-ResolutionTaskHolder@7781 {
-    <name not found> = ArrayList@7782[6] { ResolutionCandidate@7783, ResolutionCandidate@7784, ResolutionCandidate@7785, ... }
-}
-
-ResolutionTaskHolder@7786 {
-    <name not found> = ArrayList@7787[6] { ResolutionCandidate@7788, ResolutionCandidate@7789, ResolutionCandidate@7790, ... }
-}
-
-ResolutionTaskHolder@7791 {
-    <name not found> = ArrayList@7792[6] { ResolutionCandidate@7793, ResolutionCandidate@7794, ResolutionCandidate@7795, ... }
-}
-
-ResolutionTaskHolder@7796 {
-    <name not found> = ArrayList@7797[6] { ResolutionCandidate@7798, ResolutionCandidate@7799, ResolutionCandidate@7800, ... }
-}
-
-ResolutionTaskHolder@7801 {
-    <name not found> = ArrayList@7802[6] { ResolutionCandidate@7803, ResolutionCandidate@7804, ResolutionCandidate@7805, ... }
-}
-
-ResolutionTaskHolder@7806 {
-    <name not found> = ArrayList@7807[6] { ResolutionCandidate@7808, ResolutionCandidate@7809, ResolutionCandidate@7810, ... }
-}
-
-ResolutionTaskHolder@7811 {
-    <name not found> = ArrayList@7812[6] { ResolutionCandidate@7813, ResolutionCandidate@7814, ResolutionCandidate@7815, ... }
-}
-
-ResolutionTaskHolder@7816 {
-    <name not found> = ArrayList@7817[6] { ResolutionCandidate@7818, ResolutionCandidate@7819, ResolutionCandidate@7820, ... }
-}
-
-ResolutionTaskHolder@7821 {
-    <name not found> = ArrayList@7822[6] { ResolutionCandidate@7823, ResolutionCandidate@7824, ResolutionCandidate@7825, ... }
-}
-
-ResolutionTaskHolder@7826 {
-    <name not found> = ArrayList@7827[6] { ResolutionCandidate@7828, ResolutionCandidate@7829, ResolutionCandidate@7830, ... }
-}
-
-ResolutionTaskHolder@7831 {
-    <name not found> = ArrayList@7832[6] { ResolutionCandidate@7833, ResolutionCandidate@7834, ResolutionCandidate@7835, ... }
-}
-
-ResolutionTaskHolder@7836 {
-    <name not found> = ArrayList@7837[6] { ResolutionCandidate@7838, ResolutionCandidate@7839, ResolutionCandidate@7840, ... }
-}
-
-ResolutionTaskHolder@7841 {
-    <name not found> = ArrayList@7842[6] { ResolutionCandidate@7843, ResolutionCandidate@7844, ResolutionCandidate@7845, ... }
-}
-
-ResolutionTaskHolder@7846 {
-    <name not found> = ArrayList@7847[6] { ResolutionCandidate@7848, ResolutionCandidate@7849, ResolutionCandidate@7850, ... }
-}
-
-ResolutionTaskHolder@7851 {
-    <name not found> = ArrayList@7852[7] { ResolutionCandidate@7853, ResolutionCandidate@7854, ResolutionCandidate@7855, ... }
-}
-
-ResolutionTaskHolder@7856 {
-    <name not found> = ArrayList@7857[7] { ResolutionCandidate@7858, ResolutionCandidate@7859, ResolutionCandidate@7860, ... }
-}
-
-ResolutionTaskHolder@7861 {
-    <name not found> = ArrayList@7862[7] { ResolutionCandidate@7863, ResolutionCandidate@7864, ResolutionCandidate@7865, ... }
-}
-
-ResolutionTaskHolder@7866 {
-    <name not found> = ArrayList@7867[7] { ResolutionCandidate@7868, ResolutionCandidate@7869, ResolutionCandidate@7870, ... }
-}
-
-ResolutionTaskHolder@7871 {
-    <name not found> = ArrayList@7872[7] { ResolutionCandidate@7873, ResolutionCandidate@7874, ResolutionCandidate@7875, ... }
-}
-
-ResolutionTaskHolder@7876 {
-    <name not found> = ArrayList@7877[7] { ResolutionCandidate@7878, ResolutionCandidate@7879, ResolutionCandidate@7880, ... }
-}
-
-ResolutionTaskHolder@7881 {
-    <name not found> = ArrayList@7882[7] { ResolutionCandidate@7883, ResolutionCandidate@7884, ResolutionCandidate@7885, ... }
-}
-
-ResolutionTaskHolder@7886 {
-    <name not found> = ArrayList@7887[7] { ResolutionCandidate@7888, ResolutionCandidate@7889, ResolutionCandidate@7890, ... }
-}
-
-ResolutionTaskHolder@7891 {
-    <name not found> = ArrayList@7892[7] { ResolutionCandidate@7893, ResolutionCandidate@7894, ResolutionCandidate@7895, ... }
-}
-
-ResolutionTaskHolder@7896 {
-    <name not found> = ArrayList@7897[7] { ResolutionCandidate@7898, ResolutionCandidate@7899, ResolutionCandidate@7900, ... }
-}
-
-ResolutionTaskHolder@7901 {
-    <name not found> = ArrayList@7902[7] { ResolutionCandidate@7903, ResolutionCandidate@7904, ResolutionCandidate@7905, ... }
-}
-
-ResolutionTaskHolder@7906 {
-    <name not found> = ArrayList@7907[7] { ResolutionCandidate@7908, ResolutionCandidate@7909, ResolutionCandidate@7910, ... }
-}
-
-ResolutionTaskHolder@7911 {
-    <name not found> = ArrayList@7912[7] { ResolutionCandidate@7913, ResolutionCandidate@7914, ResolutionCandidate@7915, ... }
-}
-
-ResolutionTaskHolder@7916 {
-    <name not found> = ArrayList@7917[7] { ResolutionCandidate@7918, ResolutionCandidate@7919, ResolutionCandidate@7920, ... }
-}
-
-ResolutionTaskHolder@7921 {
-    <name not found> = ArrayList@7922[7] { ResolutionCandidate@7923, ResolutionCandidate@7924, ResolutionCandidate@7925, ... }
-}
-
-ResolutionTaskHolder@7926 {
-    <name not found> = ArrayList@7927[7] { ResolutionCandidate@7928, ResolutionCandidate@7929, ResolutionCandidate@7930, ... }
-}
-
-ResolutionTaskHolder@7931 {
-    <name not found> = ArrayList@7932[7] { ResolutionCandidate@7933, ResolutionCandidate@7934, ResolutionCandidate@7935, ... }
-}
-
-ResolutionTaskHolder@7936 {
-    <name not found> = ArrayList@7937[7] { ResolutionCandidate@7938, ResolutionCandidate@7939, ResolutionCandidate@7940, ... }
-}
-
-ResolutionTaskHolder@7941 {
-    <name not found> = ArrayList@7942[7] { ResolutionCandidate@7943, ResolutionCandidate@7944, ResolutionCandidate@7945, ... }
-}
-
-ResolutionTaskHolder@7946 {
-    <name not found> = ArrayList@7947[7] { ResolutionCandidate@7948, ResolutionCandidate@7949, ResolutionCandidate@7950, ... }
-}
-
-ResolutionTaskHolder@7951 {
-    <name not found> = ArrayList@7952[7] { ResolutionCandidate@7953, ResolutionCandidate@7954, ResolutionCandidate@7955, ... }
-}
-
-ResolutionTaskHolder@7956 {
-    <name not found> = ArrayList@7957[7] { ResolutionCandidate@7958, ResolutionCandidate@7959, ResolutionCandidate@7960, ... }
-}
-
-ResolutionTaskHolder@7961 {
-    <name not found> = ArrayList@7962[7] { ResolutionCandidate@7963, ResolutionCandidate@7964, ResolutionCandidate@7965, ... }
-}
-
-ResolutionTaskHolder@7966 {
-    <name not found> = ArrayList@7967[7] { ResolutionCandidate@7968, ResolutionCandidate@7969, ResolutionCandidate@7970, ... }
-}
-
-ResolutionTaskHolder@7971 {
-    <name not found> = ArrayList@7972[7] { ResolutionCandidate@7973, ResolutionCandidate@7974, ResolutionCandidate@7975, ... }
-}
-
-ResolutionTaskHolder@7976 {
-    <name not found> = ArrayList@7977[7] { ResolutionCandidate@7978, ResolutionCandidate@7979, ResolutionCandidate@7980, ... }
-}
-
-ResolutionTaskHolder@7981 {
-    <name not found> = ArrayList@7982[7] { ResolutionCandidate@7983, ResolutionCandidate@7984, ResolutionCandidate@7985, ... }
-}
-
-ResolutionTaskHolder@7986 {
-    <name not found> = ArrayList@7987[7] { ResolutionCandidate@7988, ResolutionCandidate@7989, ResolutionCandidate@7990, ... }
-}
-
-ResolutionTaskHolder@7991 {
-    <name not found> = ArrayList@7992[7] { ResolutionCandidate@7993, ResolutionCandidate@7994, ResolutionCandidate@7995, ... }
-}
-
-ResolutionTaskHolder@7996 {
-    <name not found> = ArrayList@7997[7] { ResolutionCandidate@7998, ResolutionCandidate@7999, ResolutionCandidate@8000, ... }
-}
-
-ResolutionTaskHolder@8001 {
-    <name not found> = ArrayList@8002[7] { ResolutionCandidate@8003, ResolutionCandidate@8004, ResolutionCandidate@8005, ... }
-}
-
-ResolutionTaskHolder@8006 {
-    <name not found> = ArrayList@8007[7] { ResolutionCandidate@8008, ResolutionCandidate@8009, ResolutionCandidate@8010, ... }
-}
-
-ResolutionTaskHolder@8011 {
-    <name not found> = ArrayList@8012[7] { ResolutionCandidate@8013, ResolutionCandidate@8014, ResolutionCandidate@8015, ... }
-}
-
-ResolutionTaskHolder@8016 {
-    <name not found> = ArrayList@8017[7] { ResolutionCandidate@8018, ResolutionCandidate@8019, ResolutionCandidate@8020, ... }
-}
-
-ResolutionTaskHolder@8021 {
-    <name not found> = ArrayList@8022[7] { ResolutionCandidate@8023, ResolutionCandidate@8024, ResolutionCandidate@8025, ... }
-}
-
-ResolutionTaskHolder@8026 {
-    <name not found> = ArrayList@8027[7] { ResolutionCandidate@8028, ResolutionCandidate@8029, ResolutionCandidate@8030, ... }
-}
-
-ResolutionTaskHolder@8031 {
-    <name not found> = ArrayList@8032[7] { ResolutionCandidate@8033, ResolutionCandidate@8034, ResolutionCandidate@8035, ... }
-}
-
-ResolutionTaskHolder@8036 {
-    <name not found> = ArrayList@8037[7] { ResolutionCandidate@8038, ResolutionCandidate@8039, ResolutionCandidate@8040, ... }
-}
-
-ResolutionTaskHolder@8041 {
-    <name not found> = ArrayList@8042[7] { ResolutionCandidate@8043, ResolutionCandidate@8044, ResolutionCandidate@8045, ... }
-}
-
-ResolutionTaskHolder@8046 {
-    <name not found> = ArrayList@8047[7] { ResolutionCandidate@8048, ResolutionCandidate@8049, ResolutionCandidate@8050, ... }
-}
-
-ResolutionTaskHolder@8051 {
-    <name not found> = ArrayList@8052[7] { ResolutionCandidate@8053, ResolutionCandidate@8054, ResolutionCandidate@8055, ... }
-}
-
-ResolutionTaskHolder@8056 {
-    <name not found> = ArrayList@8057[7] { ResolutionCandidate@8058, ResolutionCandidate@8059, ResolutionCandidate@8060, ... }
-}
-
-ResolutionTaskHolder@8061 {
-    <name not found> = ArrayList@8062[7] { ResolutionCandidate@8063, ResolutionCandidate@8064, ResolutionCandidate@8065, ... }
-}
-
-ResolutionTaskHolder@8066 {
-    <name not found> = ArrayList@8067[7] { ResolutionCandidate@8068, ResolutionCandidate@8069, ResolutionCandidate@8070, ... }
-}
-
-ResolutionTaskHolder@8071 {
-    <name not found> = ArrayList@8072[7] { ResolutionCandidate@8073, ResolutionCandidate@8074, ResolutionCandidate@8075, ... }
-}
-
-ResolutionTaskHolder@8076 {
-    <name not found> = ArrayList@8077[7] { ResolutionCandidate@8078, ResolutionCandidate@8079, ResolutionCandidate@8080, ... }
-}
-
-ResolutionTaskHolder@8081 {
-    <name not found> = ArrayList@8082[7] { ResolutionCandidate@8083, ResolutionCandidate@8084, ResolutionCandidate@8085, ... }
-}
-
-ResolutionTaskHolder@8086 {
-    <name not found> = ArrayList@8087[7] { ResolutionCandidate@8088, ResolutionCandidate@8089, ResolutionCandidate@8090, ... }
-}
-
-ResolutionTaskHolder@8091 {
-    <name not found> = ArrayList@8092[7] { ResolutionCandidate@8093, ResolutionCandidate@8094, ResolutionCandidate@8095, ... }
-}
-
-ResolutionTaskHolder@8096 {
-    <name not found> = ArrayList@8097[7] { ResolutionCandidate@8098, ResolutionCandidate@8099, ResolutionCandidate@8100, ... }
-}
-
-ResolutionTaskHolder@8101 {
-    <name not found> = ArrayList@8102[7] { ResolutionCandidate@8103, ResolutionCandidate@8104, ResolutionCandidate@8105, ... }
-}
-
-ResolutionTaskHolder@8106 {
-    <name not found> = ArrayList@8107[7] { ResolutionCandidate@8108, ResolutionCandidate@8109, ResolutionCandidate@8110, ... }
-}
-
-ResolutionTaskHolder@8111 {
-    <name not found> = ArrayList@8112[7] { ResolutionCandidate@8113, ResolutionCandidate@8114, ResolutionCandidate@8115, ... }
-}
-
-ResolutionTaskHolder@8116 {
-    <name not found> = ArrayList@8117[7] { ResolutionCandidate@8118, ResolutionCandidate@8119, ResolutionCandidate@8120, ... }
-}
-
-ResolutionTaskHolder@8121 {
-    <name not found> = ArrayList@8122[7] { ResolutionCandidate@8123, ResolutionCandidate@8124, ResolutionCandidate@8125, ... }
-}
-
-ResolutionTaskHolder@8126 {
-    <name not found> = ArrayList@8127[7] { ResolutionCandidate@8128, ResolutionCandidate@8129, ResolutionCandidate@8130, ... }
-}
-
-ResolutionTaskHolder@8131 {
-    <name not found> = ArrayList@8132[7] { ResolutionCandidate@8133, ResolutionCandidate@8134, ResolutionCandidate@8135, ... }
-}
-
-ResolutionTaskHolder@8136 {
-    <name not found> = ArrayList@8137[7] { ResolutionCandidate@8138, ResolutionCandidate@8139, ResolutionCandidate@8140, ... }
-}
-
-ResolutionTaskHolder@8141 {
-    <name not found> = ArrayList@8142[7] { ResolutionCandidate@8143, ResolutionCandidate@8144, ResolutionCandidate@8145, ... }
-}
-
-ResolutionTaskHolder@8146 {
-    <name not found> = ArrayList@8147[7] { ResolutionCandidate@8148, ResolutionCandidate@8149, ResolutionCandidate@8150, ... }
-}
-
-ResolutionTaskHolder@8151 {
-    <name not found> = ArrayList@8152[7] { ResolutionCandidate@8153, ResolutionCandidate@8154, ResolutionCandidate@8155, ... }
-}
-
-ResolutionTaskHolder@8156 {
-    <name not found> = ArrayList@8157[7] { ResolutionCandidate@8158, ResolutionCandidate@8159, ResolutionCandidate@8160, ... }
-}
-
-ResolutionTaskHolder@8161 {
-    <name not found> = ArrayList@8162[7] { ResolutionCandidate@8163, ResolutionCandidate@8164, ResolutionCandidate@8165, ... }
-}
-
-ResolutionTaskHolder@8166 {
-    <name not found> = ArrayList@8167[7] { ResolutionCandidate@8168, ResolutionCandidate@8169, ResolutionCandidate@8170, ... }
-}
-
-ResolutionTaskHolder@8171 {
-    <name not found> = ArrayList@8172[7] { ResolutionCandidate@8173, ResolutionCandidate@8174, ResolutionCandidate@8175, ... }
-}
-
-ResolutionTaskHolder@8176 {
-    <name not found> = ArrayList@8177[7] { ResolutionCandidate@8178, ResolutionCandidate@8179, ResolutionCandidate@8180, ... }
-}
-
-ResolutionTaskHolder@8181 {
-    <name not found> = ArrayList@8182[7] { ResolutionCandidate@8183, ResolutionCandidate@8184, ResolutionCandidate@8185, ... }
-}
-
-ResolutionTaskHolder@8186 {
-    <name not found> = ArrayList@8187[7] { ResolutionCandidate@8188, ResolutionCandidate@8189, ResolutionCandidate@8190, ... }
-}
-
-ResolutionTaskHolder@8191 {
-    <name not found> = ArrayList@8192[7] { ResolutionCandidate@8193, ResolutionCandidate@8194, ResolutionCandidate@8195, ... }
-}
-
-ResolutionTaskHolder@8196 {
-    <name not found> = ArrayList@8197[7] { ResolutionCandidate@8198, ResolutionCandidate@8199, ResolutionCandidate@8200, ... }
-}
-
-ResolutionTaskHolder@8201 {
-    <name not found> = ArrayList@8202[7] { ResolutionCandidate@8203, ResolutionCandidate@8204, ResolutionCandidate@8205, ... }
-}
-
-ResolutionTaskHolder@8206 {
-    <name not found> = ArrayList@8207[7] { ResolutionCandidate@8208, ResolutionCandidate@8209, ResolutionCandidate@8210, ... }
-}
-
-ResolutionTaskHolder@8211 {
-    <name not found> = ArrayList@8212[7] { ResolutionCandidate@8213, ResolutionCandidate@8214, ResolutionCandidate@8215, ... }
-}
-
-ResolutionTaskHolder@8216 {
-    <name not found> = ArrayList@8217[7] { ResolutionCandidate@8218, ResolutionCandidate@8219, ResolutionCandidate@8220, ... }
-}
-
-ResolutionTaskHolder@8221 {
-    <name not found> = ArrayList@8222[7] { ResolutionCandidate@8223, ResolutionCandidate@8224, ResolutionCandidate@8225, ... }
-}
-
-ResolutionTaskHolder@8226 {
-    <name not found> = ArrayList@8227[7] { ResolutionCandidate@8228, ResolutionCandidate@8229, ResolutionCandidate@8230, ... }
-}
-
-ResolutionTaskHolder@8231 {
-    <name not found> = ArrayList@8232[7] { ResolutionCandidate@8233, ResolutionCandidate@8234, ResolutionCandidate@8235, ... }
-}
-
-ResolutionTaskHolder@8236 {
-    <name not found> = ArrayList@8237[7] { ResolutionCandidate@8238, ResolutionCandidate@8239, ResolutionCandidate@8240, ... }
-}
-
-ResolutionTaskHolder@8241 {
-    <name not found> = ArrayList@8242[7] { ResolutionCandidate@8243, ResolutionCandidate@8244, ResolutionCandidate@8245, ... }
-}
-
-ResolutionTaskHolder@8246 {
-    <name not found> = ArrayList@8247[7] { ResolutionCandidate@8248, ResolutionCandidate@8249, ResolutionCandidate@8250, ... }
-}
-
-ResolutionTaskHolder@8251 {
-    <name not found> = ArrayList@8252[7] { ResolutionCandidate@8253, ResolutionCandidate@8254, ResolutionCandidate@8255, ... }
-}
-
-ResolutionTaskHolder@8256 {
-    <name not found> = ArrayList@8257[7] { ResolutionCandidate@8258, ResolutionCandidate@8259, ResolutionCandidate@8260, ... }
-}
-
-ResolutionTaskHolder@8261 {
-    <name not found> = ArrayList@8262[7] { ResolutionCandidate@8263, ResolutionCandidate@8264, ResolutionCandidate@8265, ... }
-}
-
-ResolutionTaskHolder@8266 {
-    <name not found> = ArrayList@8267[7] { ResolutionCandidate@8268, ResolutionCandidate@8269, ResolutionCandidate@8270, ... }
-}
-
-ResolutionTaskHolder@8271 {
-    <name not found> = ArrayList@8272[7] { ResolutionCandidate@8273, ResolutionCandidate@8274, ResolutionCandidate@8275, ... }
-}
-
-ResolutionTaskHolder@8276 {
-    <name not found> = ArrayList@8277[7] { ResolutionCandidate@8278, ResolutionCandidate@8279, ResolutionCandidate@8280, ... }
-}
-
-ResolutionTaskHolder@8281 {
-    <name not found> = ArrayList@8282[7] { ResolutionCandidate@8283, ResolutionCandidate@8284, ResolutionCandidate@8285, ... }
-}
-
-ResolutionTaskHolder@8286 {
-    <name not found> = ArrayList@8287[7] { ResolutionCandidate@8288, ResolutionCandidate@8289, ResolutionCandidate@8290, ... }
-}
-
-ResolutionTaskHolder@8291 {
-    <name not found> = ArrayList@8292[7] { ResolutionCandidate@8293, ResolutionCandidate@8294, ResolutionCandidate@8295, ... }
-}
-
-ResolutionTaskHolder@8296 {
-    <name not found> = ArrayList@8297[7] { ResolutionCandidate@8298, ResolutionCandidate@8299, ResolutionCandidate@8300, ... }
-}
-
-ResolutionTaskHolder@8301 {
-    <name not found> = ArrayList@8302[7] { ResolutionCandidate@8303, ResolutionCandidate@8304, ResolutionCandidate@8305, ... }
-}
-
-ResolutionTaskHolder@8306 {
-    <name not found> = ArrayList@8307[7] { ResolutionCandidate@8308, ResolutionCandidate@8309, ResolutionCandidate@8310, ... }
-}
-
-ResolutionTaskHolder@8311 {
-    <name not found> = ArrayList@8312[7] { ResolutionCandidate@8313, ResolutionCandidate@8314, ResolutionCandidate@8315, ... }
-}
-
-ResolutionTaskHolder@8316 {
-    <name not found> = ArrayList@8317[7] { ResolutionCandidate@8318, ResolutionCandidate@8319, ResolutionCandidate@8320, ... }
-}
-
-ResolutionTaskHolder@8321 {
-    <name not found> = ArrayList@8322[7] { ResolutionCandidate@8323, ResolutionCandidate@8324, ResolutionCandidate@8325, ... }
-}
-
-ResolutionTaskHolder@8326 {
-    <name not found> = ArrayList@8327[7] { ResolutionCandidate@8328, ResolutionCandidate@8329, ResolutionCandidate@8330, ... }
-}
-
-ResolutionTaskHolder@8331 {
-    <name not found> = ArrayList@8332[7] { ResolutionCandidate@8333, ResolutionCandidate@8334, ResolutionCandidate@8335, ... }
-}
-
-ResolutionTaskHolder@8336 {
-    <name not found> = ArrayList@8337[7] { ResolutionCandidate@8338, ResolutionCandidate@8339, ResolutionCandidate@8340, ... }
-}
-
-ResolutionTaskHolder@8341 {
-    <name not found> = ArrayList@8342[7] { ResolutionCandidate@8343, ResolutionCandidate@8344, ResolutionCandidate@8345, ... }
-}
-
-ResolutionTaskHolder@8346 {
-    <name not found> = ArrayList@8347[7] { ResolutionCandidate@8348, ResolutionCandidate@8349, ResolutionCandidate@8350, ... }
-}
-
-ResolutionTaskHolder@8351 {
-    <name not found> = ArrayList@8352[7] { ResolutionCandidate@8353, ResolutionCandidate@8354, ResolutionCandidate@8355, ... }
-}
-
-ResolutionTaskHolder@8356 {
-    <name not found> = ArrayList@8357[7] { ResolutionCandidate@8358, ResolutionCandidate@8359, ResolutionCandidate@8360, ... }
-}
-
-ResolutionTaskHolder@8361 {
-    <name not found> = ArrayList@8362[7] { ResolutionCandidate@8363, ResolutionCandidate@8364, ResolutionCandidate@8365, ... }
-}
-
-ResolutionTaskHolder@8366 {
-    <name not found> = ArrayList@8367[7] { ResolutionCandidate@8368, ResolutionCandidate@8369, ResolutionCandidate@8370, ... }
-}
-
-ResolutionTaskHolder@8371 {
-    <name not found> = ArrayList@8372[7] { ResolutionCandidate@8373, ResolutionCandidate@8374, ResolutionCandidate@8375, ... }
-}
-
-ResolutionTaskHolder@8376 {
-    <name not found> = ArrayList@8377[7] { ResolutionCandidate@8378, ResolutionCandidate@8379, ResolutionCandidate@8380, ... }
-}
-
-ResolutionTaskHolder@8381 {
-    <name not found> = ArrayList@8382[7] { ResolutionCandidate@8383, ResolutionCandidate@8384, ResolutionCandidate@8385, ... }
-}
-
-ResolutionTaskHolder@8386 {
-    <name not found> = ArrayList@8387[7] { ResolutionCandidate@8388, ResolutionCandidate@8389, ResolutionCandidate@8390, ... }
-}
-
-ResolutionTaskHolder@8391 {
-    <name not found> = ArrayList@8392[7] { ResolutionCandidate@8393, ResolutionCandidate@8394, ResolutionCandidate@8395, ... }
-}
-
-ResolutionTaskHolder@8396 {
-    <name not found> = ArrayList@8397[7] { ResolutionCandidate@8398, ResolutionCandidate@8399, ResolutionCandidate@8400, ... }
-}
-
-ResolutionTaskHolder@8401 {
-    <name not found> = ArrayList@8402[7] { ResolutionCandidate@8403, ResolutionCandidate@8404, ResolutionCandidate@8405, ... }
-}
-
-ResolutionTaskHolder@8406 {
-    <name not found> = ArrayList@8407[7] { ResolutionCandidate@8408, ResolutionCandidate@8409, ResolutionCandidate@8410, ... }
-}
-
-ResolutionTaskHolder@8411 {
-    <name not found> = ArrayList@8412[7] { ResolutionCandidate@8413, ResolutionCandidate@8414, ResolutionCandidate@8415, ... }
-}
-
-ResolutionTaskHolder@8416 {
-    <name not found> = ArrayList@8417[7] { ResolutionCandidate@8418, ResolutionCandidate@8419, ResolutionCandidate@8420, ... }
-}
-
-ResolutionTaskHolder@8421 {
-    <name not found> = ArrayList@8422[7] { ResolutionCandidate@8423, ResolutionCandidate@8424, ResolutionCandidate@8425, ... }
-}
-
-ResolutionTaskHolder@8426 {
-    <name not found> = ArrayList@8427[7] { ResolutionCandidate@8428, ResolutionCandidate@8429, ResolutionCandidate@8430, ... }
-}
-
-ResolutionTaskHolder@8431 {
-    <name not found> = ArrayList@8432[7] { ResolutionCandidate@8433, ResolutionCandidate@8434, ResolutionCandidate@8435, ... }
-}
-
-ResolutionTaskHolder@8436 {
-    <name not found> = ArrayList@8437[7] { ResolutionCandidate@8438, ResolutionCandidate@8439, ResolutionCandidate@8440, ... }
-}
-
-ResolutionTaskHolder@8441 {
-    <name not found> = ArrayList@8442[7] { ResolutionCandidate@8443, ResolutionCandidate@8444, ResolutionCandidate@8445, ... }
-}
-
-ResolutionTaskHolder@8446 {
-    <name not found> = ArrayList@8447[7] { ResolutionCandidate@8448, ResolutionCandidate@8449, ResolutionCandidate@8450, ... }
-}
-
-ResolutionTaskHolder@8451 {
-    <name not found> = ArrayList@8452[7] { ResolutionCandidate@8453, ResolutionCandidate@8454, ResolutionCandidate@8455, ... }
-}
-
-ResolutionTaskHolder@8456 {
-    <name not found> = ArrayList@8457[7] { ResolutionCandidate@8458, ResolutionCandidate@8459, ResolutionCandidate@8460, ... }
-}
-
-ResolutionTaskHolder@8461 {
-    <name not found> = ArrayList@8462[7] { ResolutionCandidate@8463, ResolutionCandidate@8464, ResolutionCandidate@8465, ... }
-}
-
-ResolutionTaskHolder@8466 {
-    <name not found> = ArrayList@8467[7] { ResolutionCandidate@8468, ResolutionCandidate@8469, ResolutionCandidate@8470, ... }
-}
-
-ResolutionTaskHolder@8471 {
-    <name not found> = ArrayList@8472[7] { ResolutionCandidate@8473, ResolutionCandidate@8474, ResolutionCandidate@8475, ... }
-}
-
-ResolutionTaskHolder@8476 {
-    <name not found> = ArrayList@8477[7] { ResolutionCandidate@8478, ResolutionCandidate@8479, ResolutionCandidate@8480, ... }
-}
-
-ResolutionTaskHolder@8481 {
-    <name not found> = ArrayList@8482[7] { ResolutionCandidate@8483, ResolutionCandidate@8484, ResolutionCandidate@8485, ... }
-}
-
-ResolutionTaskHolder@8486 {
-    <name not found> = ArrayList@8487[7] { ResolutionCandidate@8488, ResolutionCandidate@8489, ResolutionCandidate@8490, ... }
-}
-
-ResolutionTaskHolder@8491 {
-    <name not found> = ArrayList@8492[7] { ResolutionCandidate@8493, ResolutionCandidate@8494, ResolutionCandidate@8495, ... }
-}
-
-ResolutionTaskHolder@8496 {
-    <name not found> = ArrayList@8497[7] { ResolutionCandidate@8498, ResolutionCandidate@8499, ResolutionCandidate@8500, ... }
-}
-
-ResolutionTaskHolder@8501 {
-    <name not found> = ArrayList@8502[7] { ResolutionCandidate@8503, ResolutionCandidate@8504, ResolutionCandidate@8505, ... }
-}
-
-ResolutionTaskHolder@8506 {
-    <name not found> = ArrayList@8507[7] { ResolutionCandidate@8508, ResolutionCandidate@8509, ResolutionCandidate@8510, ... }
-}
-
-ResolutionTaskHolder@8511 {
-    <name not found> = ArrayList@8512[7] { ResolutionCandidate@8513, ResolutionCandidate@8514, ResolutionCandidate@8515, ... }
-}
-
-ResolutionTaskHolder@8516 {
-    <name not found> = ArrayList@8517[7] { ResolutionCandidate@8518, ResolutionCandidate@8519, ResolutionCandidate@8520, ... }
-}
-
-ResolutionTaskHolder@8521 {
-    <name not found> = ArrayList@8522[7] { ResolutionCandidate@8523, ResolutionCandidate@8524, ResolutionCandidate@8525, ... }
-}
-
-ResolutionTaskHolder@8526 {
-    <name not found> = ArrayList@8527[7] { ResolutionCandidate@8528, ResolutionCandidate@8529, ResolutionCandidate@8530, ... }
-}
-
-ResolutionTaskHolder@8531 {
-    <name not found> = ArrayList@8532[7] { ResolutionCandidate@8533, ResolutionCandidate@8534, ResolutionCandidate@8535, ... }
-}
-
-ResolutionTaskHolder@8536 {
-    <name not found> = ArrayList@8537[7] { ResolutionCandidate@8538, ResolutionCandidate@8539, ResolutionCandidate@8540, ... }
-}
-
-ResolutionTaskHolder@8541 {
-    <name not found> = ArrayList@8542[7] { ResolutionCandidate@8543, ResolutionCandidate@8544, ResolutionCandidate@8545, ... }
-}
-
-ResolutionTaskHolder@8546 {
-    <name not found> = ArrayList@8547[7] { ResolutionCandidate@8548, ResolutionCandidate@8549, ResolutionCandidate@8550, ... }
-}
-
-ResolutionTaskHolder@8551 {
-    <name not found> = ArrayList@8552[7] { ResolutionCandidate@8553, ResolutionCandidate@8554, ResolutionCandidate@8555, ... }
-}
-
-ResolutionTaskHolder@8556 {
-    <name not found> = ArrayList@8557[7] { ResolutionCandidate@8558, ResolutionCandidate@8559, ResolutionCandidate@8560, ... }
-}
-
-ResolutionTaskHolder@8561 {
-    <name not found> = ArrayList@8562[7] { ResolutionCandidate@8563, ResolutionCandidate@8564, ResolutionCandidate@8565, ... }
-}
-
-ResolutionTaskHolder@8566 {
-    <name not found> = ArrayList@8567[7] { ResolutionCandidate@8568, ResolutionCandidate@8569, ResolutionCandidate@8570, ... }
-}
-
-ResolutionTaskHolder@8571 {
-    <name not found> = ArrayList@8572[7] { ResolutionCandidate@8573, ResolutionCandidate@8574, ResolutionCandidate@8575, ... }
-}
-
-ResolutionTaskHolder@8576 {
-    <name not found> = ArrayList@8577[7] { ResolutionCandidate@8578, ResolutionCandidate@8579, ResolutionCandidate@8580, ... }
-}
-
-ResolutionTaskHolder@8581 {
-    <name not found> = ArrayList@8582[7] { ResolutionCandidate@8583, ResolutionCandidate@8584, ResolutionCandidate@8585, ... }
-}
-
-ResolutionTaskHolder@8586 {
-    <name not found> = ArrayList@8587[7] { ResolutionCandidate@8588, ResolutionCandidate@8589, ResolutionCandidate@8590, ... }
-}
-
-ResolutionTaskHolder@8591 {
-    <name not found> = ArrayList@8592[7] { ResolutionCandidate@8593, ResolutionCandidate@8594, ResolutionCandidate@8595, ... }
-}
-
-ResolutionTaskHolder@8596 {
-    <name not found> = ArrayList@8597[7] { ResolutionCandidate@8598, ResolutionCandidate@8599, ResolutionCandidate@8600, ... }
-}
-
-ResolutionTaskHolder@8601 {
-    <name not found> = ArrayList@8602[7] { ResolutionCandidate@8603, ResolutionCandidate@8604, ResolutionCandidate@8605, ... }
-}
-
-ResolutionTaskHolder@8606 {
-    <name not found> = ArrayList@8607[7] { ResolutionCandidate@8608, ResolutionCandidate@8609, ResolutionCandidate@8610, ... }
-}
-
-ResolutionTaskHolder@8611 {
-    <name not found> = ArrayList@8612[7] { ResolutionCandidate@8613, ResolutionCandidate@8614, ResolutionCandidate@8615, ... }
-}
-
-ResolutionTaskHolder@8616 {
-    <name not found> = ArrayList@8617[7] { ResolutionCandidate@8618, ResolutionCandidate@8619, ResolutionCandidate@8620, ... }
-}
-
-ResolutionTaskHolder@8621 {
-    <name not found> = ArrayList@8622[7] { ResolutionCandidate@8623, ResolutionCandidate@8624, ResolutionCandidate@8625, ... }
-}
-
-ResolutionTaskHolder@8626 {
-    <name not found> = ArrayList@8627[7] { ResolutionCandidate@8628, ResolutionCandidate@8629, ResolutionCandidate@8630, ... }
-}
-
-ResolutionTaskHolder@8631 {
-    <name not found> = ArrayList@8632[7] { ResolutionCandidate@8633, ResolutionCandidate@8634, ResolutionCandidate@8635, ... }
-}
-
-ResolutionTaskHolder@8636 {
-    <name not found> = ArrayList@8637[7] { ResolutionCandidate@8638, ResolutionCandidate@8639, ResolutionCandidate@8640, ... }
-}
-
-ResolutionTaskHolder@8641 {
-    <name not found> = ArrayList@8642[7] { ResolutionCandidate@8643, ResolutionCandidate@8644, ResolutionCandidate@8645, ... }
-}
-
-ResolutionTaskHolder@8646 {
-    <name not found> = ArrayList@8647[7] { ResolutionCandidate@8648, ResolutionCandidate@8649, ResolutionCandidate@8650, ... }
-}
-
-ResolutionTaskHolder@8651 {
-    <name not found> = ArrayList@8652[7] { ResolutionCandidate@8653, ResolutionCandidate@8654, ResolutionCandidate@8655, ... }
-}
-
-ResolutionTaskHolder@8656 {
-    <name not found> = ArrayList@8657[7] { ResolutionCandidate@8658, ResolutionCandidate@8659, ResolutionCandidate@8660, ... }
-}
-
-ResolutionTaskHolder@8661 {
-    <name not found> = ArrayList@8662[7] { ResolutionCandidate@8663, ResolutionCandidate@8664, ResolutionCandidate@8665, ... }
-}
-
-ResolutionTaskHolder@8666 {
-    <name not found> = ArrayList@8667[7] { ResolutionCandidate@8668, ResolutionCandidate@8669, ResolutionCandidate@8670, ... }
-}
-
-ResolutionTaskHolder@8671 {
-    <name not found> = ArrayList@8672[7] { ResolutionCandidate@8673, ResolutionCandidate@8674, ResolutionCandidate@8675, ... }
-}
-
-ResolutionTaskHolder@8676 {
-    <name not found> = ArrayList@8677[7] { ResolutionCandidate@8678, ResolutionCandidate@8679, ResolutionCandidate@8680, ... }
-}
-
-ResolutionTaskHolder@8681 {
-    <name not found> = ArrayList@8682[7] { ResolutionCandidate@8683, ResolutionCandidate@8684, ResolutionCandidate@8685, ... }
-}
-
-ResolutionTaskHolder@8686 {
-    <name not found> = ArrayList@8687[7] { ResolutionCandidate@8688, ResolutionCandidate@8689, ResolutionCandidate@8690, ... }
-}
-
-ResolutionTaskHolder@8691 {
-    <name not found> = ArrayList@8692[7] { ResolutionCandidate@8693, ResolutionCandidate@8694, ResolutionCandidate@8695, ... }
-}
-
-ResolutionTaskHolder@8696 {
-    <name not found> = ArrayList@8697[7] { ResolutionCandidate@8698, ResolutionCandidate@8699, ResolutionCandidate@8700, ... }
-}
-
-ResolutionTaskHolder@8701 {
-    <name not found> = ArrayList@8702[7] { ResolutionCandidate@8703, ResolutionCandidate@8704, ResolutionCandidate@8705, ... }
-}
-
-ResolutionTaskHolder@8706 {
-    <name not found> = ArrayList@8707[7] { ResolutionCandidate@8708, ResolutionCandidate@8709, ResolutionCandidate@8710, ... }
-}
-
-ResolutionTaskHolder@8711 {
-    <name not found> = ArrayList@8712[7] { ResolutionCandidate@8713, ResolutionCandidate@8714, ResolutionCandidate@8715, ... }
-}
-
-ResolutionTaskHolder@8716 {
-    <name not found> = ArrayList@8717[7] { ResolutionCandidate@8718, ResolutionCandidate@8719, ResolutionCandidate@8720, ... }
-}
-
-ResolutionTaskHolder@8721 {
-    <name not found> = ArrayList@8722[7] { ResolutionCandidate@8723, ResolutionCandidate@8724, ResolutionCandidate@8725, ... }
-}
-
-ResolutionTaskHolder@8726 {
-    <name not found> = ArrayList@8727[8] { ResolutionCandidate@8728, ResolutionCandidate@8729, ResolutionCandidate@8730, ... }
-}
-
-ResolutionTaskHolder@8731 {
-    <name not found> = ArrayList@8732[8] { ResolutionCandidate@8733, ResolutionCandidate@8734, ResolutionCandidate@8735, ... }
-}
-
-ResolutionTaskHolder@8736 {
-    <name not found> = ArrayList@8737[8] { ResolutionCandidate@8738, ResolutionCandidate@8739, ResolutionCandidate@8740, ... }
-}
-
-ResolutionTaskHolder@8741 {
-    <name not found> = ArrayList@8742[8] { ResolutionCandidate@8743, ResolutionCandidate@8744, ResolutionCandidate@8745, ... }
-}
-
-ResolutionTaskHolder@8746 {
-    <name not found> = ArrayList@8747[8] { ResolutionCandidate@8748, ResolutionCandidate@8749, ResolutionCandidate@8750, ... }
-}
-
-ResolutionTaskHolder@8751 {
-    <name not found> = ArrayList@8752[8] { ResolutionCandidate@8753, ResolutionCandidate@8754, ResolutionCandidate@8755, ... }
-}
-
-ResolutionTaskHolder@8756 {
-    <name not found> = ArrayList@8757[8] { ResolutionCandidate@8758, ResolutionCandidate@8759, ResolutionCandidate@8760, ... }
-}
-
-ResolutionTaskHolder@8761 {
-    <name not found> = ArrayList@8762[8] { ResolutionCandidate@8763, ResolutionCandidate@8764, ResolutionCandidate@8765, ... }
-}
-
-ResolutionTaskHolder@8766 {
-    <name not found> = ArrayList@8767[8] { ResolutionCandidate@8768, ResolutionCandidate@8769, ResolutionCandidate@8770, ... }
-}
-
-ResolutionTaskHolder@8771 {
-    <name not found> = ArrayList@8772[8] { ResolutionCandidate@8773, ResolutionCandidate@8774, ResolutionCandidate@8775, ... }
-}
-
-ResolutionTaskHolder@8776 {
-    <name not found> = ArrayList@8777[8] { ResolutionCandidate@8778, ResolutionCandidate@8779, ResolutionCandidate@8780, ... }
-}
-
-ResolutionTaskHolder@8781 {
-    <name not found> = ArrayList@8782[8] { ResolutionCandidate@8783, ResolutionCandidate@8784, ResolutionCandidate@8785, ... }
-}
-
-ResolutionTaskHolder@8786 {
-    <name not found> = ArrayList@8787[8] { ResolutionCandidate@8788, ResolutionCandidate@8789, ResolutionCandidate@8790, ... }
-}
-
-ResolutionTaskHolder@8791 {
-    <name not found> = ArrayList@8792[8] { ResolutionCandidate@8793, ResolutionCandidate@8794, ResolutionCandidate@8795, ... }
-}
-
-ResolutionTaskHolder@8796 {
-    <name not found> = ArrayList@8797[8] { ResolutionCandidate@8798, ResolutionCandidate@8799, ResolutionCandidate@8800, ... }
-}
-
-ResolutionTaskHolder@8801 {
-    <name not found> = ArrayList@8802[8] { ResolutionCandidate@8803, ResolutionCandidate@8804, ResolutionCandidate@8805, ... }
-}
-
-ResolutionTaskHolder@8806 {
-    <name not found> = ArrayList@8807[8] { ResolutionCandidate@8808, ResolutionCandidate@8809, ResolutionCandidate@8810, ... }
-}
-
-ResolutionTaskHolder@8811 {
-    <name not found> = ArrayList@8812[8] { ResolutionCandidate@8813, ResolutionCandidate@8814, ResolutionCandidate@8815, ... }
-}
-
-ResolutionTaskHolder@8816 {
-    <name not found> = ArrayList@8817[8] { ResolutionCandidate@8818, ResolutionCandidate@8819, ResolutionCandidate@8820, ... }
-}
-
-ResolutionTaskHolder@8821 {
-    <name not found> = ArrayList@8822[8] { ResolutionCandidate@8823, ResolutionCandidate@8824, ResolutionCandidate@8825, ... }
-}
-
-ResolutionTaskHolder@8826 {
-    <name not found> = ArrayList@8827[8] { ResolutionCandidate@8828, ResolutionCandidate@8829, ResolutionCandidate@8830, ... }
-}
-
-ResolutionTaskHolder@8831 {
-    <name not found> = ArrayList@8832[8] { ResolutionCandidate@8833, ResolutionCandidate@8834, ResolutionCandidate@8835, ... }
-}
-
-ResolutionTaskHolder@8836 {
-    <name not found> = ArrayList@8837[8] { ResolutionCandidate@8838, ResolutionCandidate@8839, ResolutionCandidate@8840, ... }
-}
-
-ResolutionTaskHolder@8841 {
-    <name not found> = ArrayList@8842[8] { ResolutionCandidate@8843, ResolutionCandidate@8844, ResolutionCandidate@8845, ... }
-}
-
-ResolutionTaskHolder@8846 {
-    <name not found> = ArrayList@8847[8] { ResolutionCandidate@8848, ResolutionCandidate@8849, ResolutionCandidate@8850, ... }
-}
-
-ResolutionTaskHolder@8851 {
-    <name not found> = ArrayList@8852[8] { ResolutionCandidate@8853, ResolutionCandidate@8854, ResolutionCandidate@8855, ... }
-}
-
-ResolutionTaskHolder@8856 {
-    <name not found> = ArrayList@8857[8] { ResolutionCandidate@8858, ResolutionCandidate@8859, ResolutionCandidate@8860, ... }
-}
-
-ResolutionTaskHolder@8861 {
-    <name not found> = ArrayList@8862[8] { ResolutionCandidate@8863, ResolutionCandidate@8864, ResolutionCandidate@8865, ... }
-}
-
-ResolutionTaskHolder@8866 {
-    <name not found> = ArrayList@8867[8] { ResolutionCandidate@8868, ResolutionCandidate@8869, ResolutionCandidate@8870, ... }
-}
-
-ResolutionTaskHolder@8871 {
-    <name not found> = ArrayList@8872[8] { ResolutionCandidate@8873, ResolutionCandidate@8874, ResolutionCandidate@8875, ... }
-}
-
-ResolutionTaskHolder@8876 {
-    <name not found> = ArrayList@8877[8] { ResolutionCandidate@8878, ResolutionCandidate@8879, ResolutionCandidate@8880, ... }
-}
-
-ResolutionTaskHolder@8881 {
-    <name not found> = ArrayList@8882[8] { ResolutionCandidate@8883, ResolutionCandidate@8884, ResolutionCandidate@8885, ... }
-}
-
-ResolutionTaskHolder@8886 {
-    <name not found> = ArrayList@8887[8] { ResolutionCandidate@8888, ResolutionCandidate@8889, ResolutionCandidate@8890, ... }
-}
-
-ResolutionTaskHolder@8891 {
-    <name not found> = ArrayList@8892[8] { ResolutionCandidate@8893, ResolutionCandidate@8894, ResolutionCandidate@8895, ... }
-}
-
-ResolutionTaskHolder@8896 {
-    <name not found> = ArrayList@8897[8] { ResolutionCandidate@8898, ResolutionCandidate@8899, ResolutionCandidate@8900, ... }
-}
-
-ResolutionTaskHolder@8901 {
-    <name not found> = ArrayList@8902[8] { ResolutionCandidate@8903, ResolutionCandidate@8904, ResolutionCandidate@8905, ... }
-}
-
-ResolutionTaskHolder@8906 {
-    <name not found> = ArrayList@8907[8] { ResolutionCandidate@8908, ResolutionCandidate@8909, ResolutionCandidate@8910, ... }
-}
-
-ResolutionTaskHolder@8911 {
-    <name not found> = ArrayList@8912[8] { ResolutionCandidate@8913, ResolutionCandidate@8914, ResolutionCandidate@8915, ... }
-}
-
-ResolutionTaskHolder@8916 {
-    <name not found> = ArrayList@8917[8] { ResolutionCandidate@8918, ResolutionCandidate@8919, ResolutionCandidate@8920, ... }
-}
-
-ResolutionTaskHolder@8921 {
-    <name not found> = ArrayList@8922[8] { ResolutionCandidate@8923, ResolutionCandidate@8924, ResolutionCandidate@8925, ... }
-}
-
-ResolutionTaskHolder@8926 {
-    <name not found> = ArrayList@8927[8] { ResolutionCandidate@8928, ResolutionCandidate@8929, ResolutionCandidate@8930, ... }
-}
-
-ResolutionTaskHolder@8931 {
-    <name not found> = ArrayList@8932[8] { ResolutionCandidate@8933, ResolutionCandidate@8934, ResolutionCandidate@8935, ... }
-}
-
-ResolutionTaskHolder@8936 {
-    <name not found> = ArrayList@8937[8] { ResolutionCandidate@8938, ResolutionCandidate@8939, ResolutionCandidate@8940, ... }
-}
-
-ResolutionTaskHolder@8941 {
-    <name not found> = ArrayList@8942[8] { ResolutionCandidate@8943, ResolutionCandidate@8944, ResolutionCandidate@8945, ... }
-}
-
-ResolutionTaskHolder@8946 {
-    <name not found> = ArrayList@8947[8] { ResolutionCandidate@8948, ResolutionCandidate@8949, ResolutionCandidate@8950, ... }
-}
-
-ResolutionTaskHolder@8951 {
-    <name not found> = ArrayList@8952[8] { ResolutionCandidate@8953, ResolutionCandidate@8954, ResolutionCandidate@8955, ... }
-}
-
-ResolutionTaskHolder@8956 {
-    <name not found> = ArrayList@8957[8] { ResolutionCandidate@8958, ResolutionCandidate@8959, ResolutionCandidate@8960, ... }
-}
-
-ResolutionTaskHolder@8961 {
-    <name not found> = ArrayList@8962[8] { ResolutionCandidate@8963, ResolutionCandidate@8964, ResolutionCandidate@8965, ... }
-}
-
-ResolutionTaskHolder@8966 {
-    <name not found> = ArrayList@8967[8] { ResolutionCandidate@8968, ResolutionCandidate@8969, ResolutionCandidate@8970, ... }
-}
-
-ResolutionTaskHolder@8971 {
-    <name not found> = ArrayList@8972[8] { ResolutionCandidate@8973, ResolutionCandidate@8974, ResolutionCandidate@8975, ... }
-}
-
-ResolutionTaskHolder@8976 {
-    <name not found> = ArrayList@8977[8] { ResolutionCandidate@8978, ResolutionCandidate@8979, ResolutionCandidate@8980, ... }
-}
-
-ResolutionTaskHolder@8981 {
-    <name not found> = ArrayList@8982[8] { ResolutionCandidate@8983, ResolutionCandidate@8984, ResolutionCandidate@8985, ... }
-}
-
-ResolutionTaskHolder@8986 {
-    <name not found> = ArrayList@8987[8] { ResolutionCandidate@8988, ResolutionCandidate@8989, ResolutionCandidate@8990, ... }
-}
-
-ResolutionTaskHolder@8991 {
-    <name not found> = ArrayList@8992[8] { ResolutionCandidate@8993, ResolutionCandidate@8994, ResolutionCandidate@8995, ... }
-}
-
-ResolutionTaskHolder@8996 {
-    <name not found> = ArrayList@8997[8] { ResolutionCandidate@8998, ResolutionCandidate@8999, ResolutionCandidate@9000, ... }
-}
-
-ResolutionTaskHolder@9001 {
-    <name not found> = ArrayList@9002[8] { ResolutionCandidate@9003, ResolutionCandidate@9004, ResolutionCandidate@9005, ... }
-}
-
-ResolutionTaskHolder@9006 {
-    <name not found> = ArrayList@9007[8] { ResolutionCandidate@9008, ResolutionCandidate@9009, ResolutionCandidate@9010, ... }
-}
-
-ResolutionTaskHolder@9011 {
-    <name not found> = ArrayList@9012[8] { ResolutionCandidate@9013, ResolutionCandidate@9014, ResolutionCandidate@9015, ... }
-}
-
-ResolutionTaskHolder@9016 {
-    <name not found> = ArrayList@9017[8] { ResolutionCandidate@9018, ResolutionCandidate@9019, ResolutionCandidate@9020, ... }
-}
-
-ResolutionTaskHolder@9021 {
-    <name not found> = ArrayList@9022[8] { ResolutionCandidate@9023, ResolutionCandidate@9024, ResolutionCandidate@9025, ... }
-}
-
-ResolutionTaskHolder@9026 {
-    <name not found> = ArrayList@9027[8] { ResolutionCandidate@9028, ResolutionCandidate@9029, ResolutionCandidate@9030, ... }
-}
-
-ResolutionTaskHolder@9031 {
-    <name not found> = ArrayList@9032[8] { ResolutionCandidate@9033, ResolutionCandidate@9034, ResolutionCandidate@9035, ... }
-}
-
-ResolutionTaskHolder@9036 {
-    <name not found> = ArrayList@9037[8] { ResolutionCandidate@9038, ResolutionCandidate@9039, ResolutionCandidate@9040, ... }
-}
-
-ResolutionTaskHolder@9041 {
-    <name not found> = ArrayList@9042[8] { ResolutionCandidate@9043, ResolutionCandidate@9044, ResolutionCandidate@9045, ... }
-}
-
-ResolutionTaskHolder@9046 {
-    <name not found> = ArrayList@9047[8] { ResolutionCandidate@9048, ResolutionCandidate@9049, ResolutionCandidate@9050, ... }
-}
-
-ResolutionTaskHolder@9051 {
-    <name not found> = ArrayList@9052[8] { ResolutionCandidate@9053, ResolutionCandidate@9054, ResolutionCandidate@9055, ... }
-}
-
-ResolutionTaskHolder@9056 {
-    <name not found> = ArrayList@9057[8] { ResolutionCandidate@9058, ResolutionCandidate@9059, ResolutionCandidate@9060, ... }
-}
-
-ResolutionTaskHolder@9061 {
-    <name not found> = ArrayList@9062[8] { ResolutionCandidate@9063, ResolutionCandidate@9064, ResolutionCandidate@9065, ... }
-}
-
-ResolutionTaskHolder@9066 {
-    <name not found> = ArrayList@9067[8] { ResolutionCandidate@9068, ResolutionCandidate@9069, ResolutionCandidate@9070, ... }
-}
-
-ResolutionTaskHolder@9071 {
-    <name not found> = ArrayList@9072[8] { ResolutionCandidate@9073, ResolutionCandidate@9074, ResolutionCandidate@9075, ... }
-}
-
-ResolutionTaskHolder@9076 {
-    <name not found> = ArrayList@9077[8] { ResolutionCandidate@9078, ResolutionCandidate@9079, ResolutionCandidate@9080, ... }
-}
-
-ResolutionTaskHolder@9081 {
-    <name not found> = ArrayList@9082[8] { ResolutionCandidate@9083, ResolutionCandidate@9084, ResolutionCandidate@9085, ... }
-}
-
-ResolutionTaskHolder@9086 {
-    <name not found> = ArrayList@9087[8] { ResolutionCandidate@9088, ResolutionCandidate@9089, ResolutionCandidate@9090, ... }
-}
-
-ResolutionTaskHolder@9091 {
-    <name not found> = ArrayList@9092[8] { ResolutionCandidate@9093, ResolutionCandidate@9094, ResolutionCandidate@9095, ... }
-}
-
-ResolutionTaskHolder@9096 {
-    <name not found> = ArrayList@9097[8] { ResolutionCandidate@9098, ResolutionCandidate@9099, ResolutionCandidate@9100, ... }
-}
-
-ResolutionTaskHolder@9101 {
-    <name not found> = ArrayList@9102[8] { ResolutionCandidate@9103, ResolutionCandidate@9104, ResolutionCandidate@9105, ... }
-}
-
-ResolutionTaskHolder@9106 {
-    <name not found> = ArrayList@9107[8] { ResolutionCandidate@9108, ResolutionCandidate@9109, ResolutionCandidate@9110, ... }
-}
-
-ResolutionTaskHolder@9111 {
-    <name not found> = ArrayList@9112[8] { ResolutionCandidate@9113, ResolutionCandidate@9114, ResolutionCandidate@9115, ... }
-}
-
-ResolutionTaskHolder@9116 {
-    <name not found> = ArrayList@9117[8] { ResolutionCandidate@9118, ResolutionCandidate@9119, ResolutionCandidate@9120, ... }
-}
-
-ResolutionTaskHolder@9121 {
-    <name not found> = ArrayList@9122[8] { ResolutionCandidate@9123, ResolutionCandidate@9124, ResolutionCandidate@9125, ... }
-}
-
-ResolutionTaskHolder@9126 {
-    <name not found> = ArrayList@9127[8] { ResolutionCandidate@9128, ResolutionCandidate@9129, ResolutionCandidate@9130, ... }
-}
-
-ResolutionTaskHolder@9131 {
-    <name not found> = ArrayList@9132[8] { ResolutionCandidate@9133, ResolutionCandidate@9134, ResolutionCandidate@9135, ... }
-}
-
-ResolutionTaskHolder@9136 {
-    <name not found> = ArrayList@9137[8] { ResolutionCandidate@9138, ResolutionCandidate@9139, ResolutionCandidate@9140, ... }
-}
-
-ResolutionTaskHolder@9141 {
-    <name not found> = ArrayList@9142[8] { ResolutionCandidate@9143, ResolutionCandidate@9144, ResolutionCandidate@9145, ... }
-}
-
-ResolutionTaskHolder@9146 {
-    <name not found> = ArrayList@9147[8] { ResolutionCandidate@9148, ResolutionCandidate@9149, ResolutionCandidate@9150, ... }
-}
-
-ResolutionTaskHolder@9151 {
-    <name not found> = ArrayList@9152[8] { ResolutionCandidate@9153, ResolutionCandidate@9154, ResolutionCandidate@9155, ... }
-}
-
-ResolutionTaskHolder@9156 {
-    <name not found> = ArrayList@9157[8] { ResolutionCandidate@9158, ResolutionCandidate@9159, ResolutionCandidate@9160, ... }
-}
-
-ResolutionTaskHolder@9161 {
-    <name not found> = ArrayList@9162[8] { ResolutionCandidate@9163, ResolutionCandidate@9164, ResolutionCandidate@9165, ... }
-}
-
-ResolutionTaskHolder@9166 {
-    <name not found> = ArrayList@9167[8] { ResolutionCandidate@9168, ResolutionCandidate@9169, ResolutionCandidate@9170, ... }
-}
-
-ResolutionTaskHolder@9171 {
-    <name not found> = ArrayList@9172[8] { ResolutionCandidate@9173, ResolutionCandidate@9174, ResolutionCandidate@9175, ... }
-}
-
-ResolutionTaskHolder@9176 {
-    <name not found> = ArrayList@9177[8] { ResolutionCandidate@9178, ResolutionCandidate@9179, ResolutionCandidate@9180, ... }
-}
-
-ResolutionTaskHolder@9181 {
-    <name not found> = ArrayList@9182[8] { ResolutionCandidate@9183, ResolutionCandidate@9184, ResolutionCandidate@9185, ... }
-}
-
-ResolutionTaskHolder@9186 {
-    <name not found> = ArrayList@9187[8] { ResolutionCandidate@9188, ResolutionCandidate@9189, ResolutionCandidate@9190, ... }
-}
-
-ResolutionTaskHolder@9191 {
-    <name not found> = ArrayList@9192[8] { ResolutionCandidate@9193, ResolutionCandidate@9194, ResolutionCandidate@9195, ... }
-}
-
-ResolutionTaskHolder@9196 {
-    <name not found> = ArrayList@9197[8] { ResolutionCandidate@9198, ResolutionCandidate@9199, ResolutionCandidate@9200, ... }
-}
-
-ResolutionTaskHolder@9201 {
-    <name not found> = ArrayList@9202[8] { ResolutionCandidate@9203, ResolutionCandidate@9204, ResolutionCandidate@9205, ... }
-}
-
-ResolutionTaskHolder@9206 {
-    <name not found> = ArrayList@9207[8] { ResolutionCandidate@9208, ResolutionCandidate@9209, ResolutionCandidate@9210, ... }
-}
-
-ResolutionTaskHolder@9211 {
-    <name not found> = ArrayList@9212[8] { ResolutionCandidate@9213, ResolutionCandidate@9214, ResolutionCandidate@9215, ... }
-}
-
-ResolutionTaskHolder@9216 {
-    <name not found> = ArrayList@9217[8] { ResolutionCandidate@9218, ResolutionCandidate@9219, ResolutionCandidate@9220, ... }
-}
-
-ResolutionTaskHolder@9221 {
-    <name not found> = ArrayList@9222[8] { ResolutionCandidate@9223, ResolutionCandidate@9224, ResolutionCandidate@9225, ... }
-}
-
-ResolutionTaskHolder@9226 {
-    <name not found> = ArrayList@9227[8] { ResolutionCandidate@9228, ResolutionCandidate@9229, ResolutionCandidate@9230, ... }
-}
-
-ResolutionTaskHolder@9231 {
-    <name not found> = ArrayList@9232[8] { ResolutionCandidate@9233, ResolutionCandidate@9234, ResolutionCandidate@9235, ... }
-}
-
-ResolutionTaskHolder@9236 {
-    <name not found> = ArrayList@9237[8] { ResolutionCandidate@9238, ResolutionCandidate@9239, ResolutionCandidate@9240, ... }
-}
-
-ResolutionTaskHolder@9241 {
-    <name not found> = ArrayList@9242[8] { ResolutionCandidate@9243, ResolutionCandidate@9244, ResolutionCandidate@9245, ... }
-}
-
-ResolutionTaskHolder@9246 {
-    <name not found> = ArrayList@9247[8] { ResolutionCandidate@9248, ResolutionCandidate@9249, ResolutionCandidate@9250, ... }
-}
-
-ResolutionTaskHolder@9251 {
-    <name not found> = ArrayList@9252[8] { ResolutionCandidate@9253, ResolutionCandidate@9254, ResolutionCandidate@9255, ... }
-}
-
-ResolutionTaskHolder@9256 {
-    <name not found> = ArrayList@9257[8] { ResolutionCandidate@9258, ResolutionCandidate@9259, ResolutionCandidate@9260, ... }
-}
-
-ResolutionTaskHolder@9261 {
-    <name not found> = ArrayList@9262[8] { ResolutionCandidate@9263, ResolutionCandidate@9264, ResolutionCandidate@9265, ... }
-}
-
-TypeDeserializer@9266 {
-    classDescriptors('1': Integer@9267) = DeserializedClassDescriptor@6['Pair']
-}
-
-TypeDeserializer@9268 {
-    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
-    classDescriptors('5': Integer@9271) = LazyJavaClassDescriptor@114['Serializable']
-}
-
-TypeDeserializer@9272 {
-    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
-}
-
-TypeDeserializer@9273 {
-    classDescriptors('2': Integer@9269) = DeserializedClassDescriptor@9270['Any']
-}
-
-TypeDeserializer@9274 {
-    classDescriptors('8': Integer@9275) = DeserializedClassDescriptor@9276['Array']
-    classDescriptors('80': Integer@9277) = DeserializedClassDescriptor@6['Pair']
-    classDescriptors('81': Integer@9278) = LazyJavaClassDescriptor@113['HashMap']
-    classDescriptors('9': Integer@9279) = DeserializedClassDescriptor@9270['Any']
-}
-
-TypeDeserializer@9280 {
-    classDescriptors('80': Integer@9277) = DeserializedClassDescriptor@6['Pair']
-    classDescriptors('9': Integer@9279) = DeserializedClassDescriptor@9270['Any']
-}
-
-null {
-    <name not found> = ArrayList@9281[1] { ResolutionCandidate@617 }
-    <name not found> = ArrayList@9282[1] { ResolutionCandidate@1037 }
-    <name not found> = ArrayList@9283[1] { ResolutionCandidate@1346 }
-    <name not found> = ArrayList@9284[1] { ResolutionCandidate@1442 }
-    <name not found> = ArrayList@9285[1] { ResolutionCandidate@911 }
-    <name not found> = ArrayList@9286[1] { ResolutionCandidate@1436 }
-    <name not found> = ArrayList@9287[1] { ResolutionCandidate@1277 }
-    <name not found> = ArrayList@9288[1] { ResolutionCandidate@791 }
-    <name not found> = ArrayList@9289[1] { ResolutionCandidate@1220 }
-    <name not found> = ArrayList@9290[1] { ResolutionCandidate@593 }
-    <name not found> = ArrayList@9291[1] { ResolutionCandidate@1223 }
-    <name not found> = ArrayList@9292[1] { ResolutionCandidate@4568 }
-    <name not found> = ArrayList@9293[1] { ResolutionCandidate@1745 }
-    <name not found> = ArrayList@9294[1] { ResolutionCandidate@3395 }
-    <name not found> = ArrayList@9295[1] { ResolutionCandidate@725 }
-    <name not found> = ArrayList@9296[1] { ResolutionCandidate@7121 }
-    <name not found> = ArrayList@9297[1] { ResolutionCandidate@5465 }
-    <name not found> = ArrayList@9298[1] { ResolutionCandidate@428 }
-    <name not found> = ArrayList@9299[1] { ResolutionCandidate@6263 }
-    <name not found> = ArrayList@9300[1] { ResolutionCandidate@6443 }
-    <name not found> = ArrayList@9301[1] { ResolutionCandidate@851 }
-    <name not found> = ArrayList@9302[1] { ResolutionCandidate@875 }
-    <name not found> = ArrayList@9303[1] { ResolutionCandidate@6755 }
-    <name not found> = ArrayList@9304[1] { ResolutionCandidate@6518 }
-    <name not found> = ArrayList@9305[1] { ResolutionCandidate@3608 }
-    <name not found> = ArrayList@9306[1] { ResolutionCandidate@2516 }
-    <name not found> = ArrayList@9307[1] { ResolutionCandidate@641 }
-    <name not found> = ArrayList@9308[1] { ResolutionCandidate@7490 }
-    <name not found> = ArrayList@9309[1] { ResolutionCandidate@6242 }
-    <name not found> = ArrayList@9310[1] { ResolutionCandidate@2165 }
-    <name not found> = ArrayList@9311[1] { ResolutionCandidate@1475 }
-    <name not found> = ArrayList@9312[1] { ResolutionCandidate@7007 }
-    <name not found> = ArrayList@9313[1] { ResolutionCandidate@5711 }
-    <name not found> = ArrayList@9314[1] { ResolutionCandidate@3140 }
-    <name not found> = ArrayList@9315[1] { ResolutionCandidate@4418 }
-    <name not found> = ArrayList@9316[1] { ResolutionCandidate@419 }
-    <name not found> = ArrayList@9317[1] { ResolutionCandidate@6380 }
-    <name not found> = ArrayList@9318[1] { ResolutionCandidate@5576 }
-    <name not found> = ArrayList@9319[1] { ResolutionCandidate@1862 }
-    <name not found> = ArrayList@9320[1] { ResolutionCandidate@4181 }
-    <name not found> = ArrayList@9321[1] { ResolutionCandidate@959 }
-    <name not found> = ArrayList@9322[1] { ResolutionCandidate@7613 }
-    <name not found> = ArrayList@9323[1] { ResolutionCandidate@6527 }
-    <name not found> = ArrayList@9324[1] { ResolutionCandidate@1664 }
-    <name not found> = ArrayList@9325[1] { ResolutionCandidate@4334 }
-    <name not found> = ArrayList@9326[1] { ResolutionCandidate@584 }
-    <name not found> = ArrayList@9327[1] { ResolutionCandidate@6164 }
-    <name not found> = ArrayList@9328[1] { ResolutionCandidate@4433 }
-    <name not found> = ArrayList@9329[1] { ResolutionCandidate@4277 }
-    <name not found> = ArrayList@9330[1] { ResolutionCandidate@1514 }
-    <name not found> = ArrayList@9331[1] { ResolutionCandidate@5021 }
-    <name not found> = ArrayList@9332[1] { ResolutionCandidate@5984 }
-    <name not found> = ArrayList@9333[1] { ResolutionCandidate@2504 }
-    <name not found> = ArrayList@9334[1] { ResolutionCandidate@3554 }
-    <name not found> = ArrayList@9335[1] { ResolutionCandidate@449 }
-    <name not found> = ArrayList@9336[1] { ResolutionCandidate@4769 }
-    <name not found> = ArrayList@9337[1] { ResolutionCandidate@4784 }
-    <name not found> = ArrayList@9338[1] { ResolutionCandidate@3515 }
-    <name not found> = ArrayList@9339[1] { ResolutionCandidate@3920 }
-    <name not found> = ArrayList@9340[1] { ResolutionCandidate@1022 }
-    <name not found> = ArrayList@9341[1] { ResolutionCandidate@7397 }
-    <name not found> = ArrayList@9342[1] { ResolutionCandidate@6770 }
-    <name not found> = ArrayList@9343[1] { ResolutionCandidate@1733 }
-    <name not found> = ArrayList@9344[1] { ResolutionCandidate@2633 }
-    <name not found> = ArrayList@9345[1] { ResolutionCandidate@479 }
-    <name not found> = ArrayList@9346[1] { ResolutionCandidate@4760 }
-    <name not found> = ArrayList@9347[1] { ResolutionCandidate@5555 }
-    <name not found> = ArrayList@9348[1] { ResolutionCandidate@1781 }
-    <name not found> = ArrayList@9349[1] { ResolutionCandidate@2468 }
-    <name not found> = ArrayList@9350[1] { ResolutionCandidate@464 }
-    <name not found> = ArrayList@9351[1] { ResolutionCandidate@7271 }
-    <name not found> = ArrayList@9352[1] { ResolutionCandidate@6131 }
-    <name not found> = ArrayList@9353[1] { ResolutionCandidate@2741 }
-    <name not found> = ArrayList@9354[1] { ResolutionCandidate@3626 }
-    <name not found> = ArrayList@9355[1] { ResolutionCandidate@1274 }
-    <name not found> = ArrayList@9356[1] { ResolutionCandidate@5627 }
-    <name not found> = ArrayList@9357[1] { ResolutionCandidate@4481 }
-    <name not found> = ArrayList@9358[1] { ResolutionCandidate@3944 }
-    <name not found> = ArrayList@9359[1] { ResolutionCandidate@545 }
-    <name not found> = ArrayList@9360[1] { ResolutionCandidate@7721 }
-    <name not found> = ArrayList@9361[1] { ResolutionCandidate@6881 }
-    <name not found> = ArrayList@9362[1] { ResolutionCandidate@1676 }
-    <name not found> = ArrayList@9363[1] { ResolutionCandidate@2813 }
-    <name not found> = ArrayList@9364[1] { ResolutionCandidate@962 }
-    <name not found> = ArrayList@9365[1] { ResolutionCandidate@5135 }
-    <name not found> = ArrayList@9366[1] { ResolutionCandidate@6047 }
-    <name not found> = ArrayList@9367[1] { ResolutionCandidate@3713 }
-    <name not found> = ArrayList@9368[1] { ResolutionCandidate@4118 }
-    <name not found> = ArrayList@9369[1] { ResolutionCandidate@722 }
-    <name not found> = ArrayList@9370[1] { ResolutionCandidate@5585 }
-    <name not found> = ArrayList@9371[1] { ResolutionCandidate@3644 }
-    <name not found> = ArrayList@9372[1] { ResolutionCandidate@1577 }
-    <name not found> = ArrayList@9373[1] { ResolutionCandidate@506 }
-    <name not found> = ArrayList@9374[1] { ResolutionCandidate@5762 }
-    <name not found> = ArrayList@9375[1] { ResolutionCandidate@7640 }
-    <name not found> = ArrayList@9376[1] { ResolutionCandidate@4313 }
-    <name not found> = ArrayList@9377[1] { ResolutionCandidate@2006 }
-    <name not found> = ArrayList@9378[1] { ResolutionCandidate@491 }
-    <name not found> = ArrayList@9379[1] { ResolutionCandidate@5549 }
-    <name not found> = ArrayList@9380[1] { ResolutionCandidate@5780 }
-    <name not found> = ArrayList@9381[1] { ResolutionCandidate@3275 }
-    <name not found> = ArrayList@9382[1] { ResolutionCandidate@4070 }
-    <name not found> = ArrayList@9383[1] { ResolutionCandidate@1424 }
-    <name not found> = ArrayList@9384[1] { ResolutionCandidate@6776 }
-    <name not found> = ArrayList@9385[1] { ResolutionCandidate@5642 }
-    <name not found> = ArrayList@9386[1] { ResolutionCandidate@3623 }
-    <name not found> = ArrayList@9387[1] { ResolutionCandidate@1583 }
-    <name not found> = ArrayList@9388[1] { ResolutionCandidate@1226 }
-    <name not found> = ArrayList@9389[1] { ResolutionCandidate@5771 }
-    <name not found> = ArrayList@9390[1] { ResolutionCandidate@6470 }
-    <name not found> = ArrayList@9391[1] { ResolutionCandidate@4502 }
-    <name not found> = ArrayList@9392[1] { ResolutionCandidate@2000 }
-    <name not found> = ArrayList@9393[1] { ResolutionCandidate@1130 }
-    <name not found> = ArrayList@9394[1] { ResolutionCandidate@6257 }
-    <name not found> = ArrayList@9395[1] { ResolutionCandidate@4793 }
-    <name not found> = ArrayList@9396[1] { ResolutionCandidate@4331 }
-    <name not found> = ArrayList@9397[1] { ResolutionCandidate@3185 }
-    <name not found> = ArrayList@9398[1] { ResolutionCandidate@1184 }
-    <name not found> = ArrayList@9399[1] { ResolutionCandidate@6683 }
-    <name not found> = ArrayList@9400[1] { ResolutionCandidate@2432 }
-    <name not found> = ArrayList@9401[1] { ResolutionCandidate@2993 }
-    <name not found> = ArrayList@9402[1] { ResolutionCandidate@461 }
-    <name not found> = ArrayList@9403[1] { ResolutionCandidate@5396 }
-    <name not found> = ArrayList@9404[1] { ResolutionCandidate@5573 }
-    <name not found> = ArrayList@9405[1] { ResolutionCandidate@2300 }
-    <name not found> = ArrayList@9406[1] { ResolutionCandidate@3530 }
-    <name not found> = ArrayList@9407[1] { ResolutionCandidate@1262 }
-    <name not found> = ArrayList@9408[1] { ResolutionCandidate@5327 }
-    <name not found> = ArrayList@9409[1] { ResolutionCandidate@6509 }
-    <name not found> = ArrayList@9410[1] { ResolutionCandidate@3755 }
-    <name not found> = ArrayList@9411[1] { ResolutionCandidate@4409 }
-    <name not found> = ArrayList@9412[1] { ResolutionCandidate@1211 }
-    <name not found> = ArrayList@9413[1] { ResolutionCandidate@7004 }
-    <name not found> = ArrayList@9414[1] { ResolutionCandidate@3350 }
-    <name not found> = ArrayList@9415[1] { ResolutionCandidate@2594 }
-    <name not found> = ArrayList@9416[1] { ResolutionCandidate@1526 }
-    <name not found> = ArrayList@9417[1] { ResolutionCandidate@6110 }
-    <name not found> = ArrayList@9418[1] { ResolutionCandidate@5003 }
-    <name not found> = ArrayList@9419[1] { ResolutionCandidate@4325 }
-    <name not found> = ArrayList@9420[1] { ResolutionCandidate@1838 }
-    <name not found> = ArrayList@9421[1] { ResolutionCandidate@440 }
-    <name not found> = ArrayList@9422[1] { ResolutionCandidate@7091 }
-    <name not found> = ArrayList@9423[1] { ResolutionCandidate@5669 }
-    <name not found> = ArrayList@9424[1] { ResolutionCandidate@2435 }
-    <name not found> = ArrayList@9425[1] { ResolutionCandidate@4358 }
-    <name not found> = ArrayList@9426[1] { ResolutionCandidate@893 }
-    <name not found> = ArrayList@9427[1] { ResolutionCandidate@5522 }
-    <name not found> = ArrayList@9428[1] { ResolutionCandidate@6425 }
-    <name not found> = ArrayList@9429[1] { ResolutionCandidate@2708 }
-    <name not found> = ArrayList@9430[1] { ResolutionCandidate@1841 }
-    <name not found> = ArrayList@9431[1] { ResolutionCandidate@1544 }
-    <name not found> = ArrayList@9432[1] { ResolutionCandidate@6632 }
-    <name not found> = ArrayList@9433[1] { ResolutionCandidate@5381 }
-    <name not found> = ArrayList@9434[1] { ResolutionCandidate@1910 }
-    <name not found> = ArrayList@9435[1] { ResolutionCandidate@3260 }
-    <name not found> = ArrayList@9436[1] { ResolutionCandidate@740 }
-    <name not found> = ArrayList@9437[1] { ResolutionCandidate@5204 }
-    <name not found> = ArrayList@9438[1] { ResolutionCandidate@7634 }
-    <name not found> = ArrayList@9439[1] { ResolutionCandidate@4316 }
-    <name not found> = ArrayList@9440[1] { ResolutionCandidate@3908 }
-    <name not found> = ArrayList@9441[1] { ResolutionCandidate@365 }
-    <name not found> = ArrayList@9442[1] { ResolutionCandidate@5060 }
-    <name not found> = ArrayList@9443[1] { ResolutionCandidate@2141 }
-    <name not found> = ArrayList@9444[1] { ResolutionCandidate@1679 }
-    <name not found> = ArrayList@9445[1] { ResolutionCandidate@1373 }
-    <name not found> = ArrayList@9446[1] { ResolutionCandidate@5759 }
-    <name not found> = ArrayList@9447[1] { ResolutionCandidate@7223 }
-    <name not found> = ArrayList@9448[1] { ResolutionCandidate@1709 }
-    <name not found> = ArrayList@9449[1] { ResolutionCandidate@3359 }
-    <name not found> = ArrayList@9450[1] { ResolutionCandidate@1433 }
-    <name not found> = ArrayList@9451[1] { ResolutionCandidate@4847 }
-    <name not found> = ArrayList@9452[1] { ResolutionCandidate@5183 }
-    <name not found> = ArrayList@9453[1] { ResolutionCandidate@3362 }
-    <name not found> = ArrayList@9454[1] { ResolutionCandidate@3869 }
-    <name not found> = ArrayList@9455[1] { ResolutionCandidate@1139 }
-    <name not found> = ArrayList@9456[1] { ResolutionCandidate@7346 }
-    <name not found> = ArrayList@9457[1] { ResolutionCandidate@2090 }
-    <name not found> = ArrayList@9458[1] { ResolutionCandidate@2129 }
-    <name not found> = ArrayList@9459[1] { ResolutionCandidate@1232 }
-    <name not found> = ArrayList@9460[1] { ResolutionCandidate@6971 }
-    <name not found> = ArrayList@9461[1] { ResolutionCandidate@5123 }
-    <name not found> = ArrayList@9462[1] { ResolutionCandidate@2147 }
-    <name not found> = ArrayList@9463[1] { ResolutionCandidate@2807 }
-    <name not found> = ArrayList@9464[1] { ResolutionCandidate@878 }
-    <name not found> = ArrayList@9465[1] { ResolutionCandidate@5387 }
-    <name not found> = ArrayList@9466[1] { ResolutionCandidate@5726 }
-    <name not found> = ArrayList@9467[1] { ResolutionCandidate@3482 }
-    <name not found> = ArrayList@9468[1] { ResolutionCandidate@2363 }
-    <name not found> = ArrayList@9469[1] { ResolutionCandidate@1259 }
-    <name not found> = ArrayList@9470[1] { ResolutionCandidate@5960 }
-    <name not found> = ArrayList@9471[1] { ResolutionCandidate@6056 }
-    <name not found> = ArrayList@9472[1] { ResolutionCandidate@2261 }
-    <name not found> = ArrayList@9473[1] { ResolutionCandidate@3134 }
-    <name not found> = ArrayList@9474[1] { ResolutionCandidate@1529 }
-    <name not found> = ArrayList@9475[1] { ResolutionCandidate@7307 }
-    <name not found> = ArrayList@9476[1] { ResolutionCandidate@5612 }
-    <name not found> = ArrayList@9477[1] { ResolutionCandidate@2498 }
-    <name not found> = ArrayList@9478[1] { ResolutionCandidate@2324 }
-    <name not found> = ArrayList@9479[1] { ResolutionCandidate@749 }
-    <name not found> = ArrayList@9480[1] { ResolutionCandidate@6389 }
-    <name not found> = ArrayList@9481[1] { ResolutionCandidate@4427 }
-    <name not found> = ArrayList@9482[1] { ResolutionCandidate@3323 }
-    <name not found> = ArrayList@9483[1] { ResolutionCandidate@623 }
-    <name not found> = ArrayList@9484[1] { ResolutionCandidate@4958 }
-    <name not found> = ArrayList@9485[1] { ResolutionCandidate@5534 }
-    <name not found> = ArrayList@9486[1] { ResolutionCandidate@4025 }
-    <name not found> = ArrayList@9487[1] { ResolutionCandidate@4430 }
-    <name not found> = ArrayList@9488[1] { ResolutionCandidate@554 }
-    <name not found> = ArrayList@9489[1] { ResolutionCandidate@6872 }
-    <name not found> = ArrayList@9490[1] { ResolutionCandidate@5789 }
-    <name not found> = ArrayList@9491[1] { ResolutionCandidate@3386 }
-    <name not found> = ArrayList@9492[1] { ResolutionCandidate@1565 }
-    <name not found> = ArrayList@9493[1] { ResolutionCandidate@644 }
-    <name not found> = ArrayList@9494[1] { ResolutionCandidate@5054 }
-    <name not found> = ArrayList@9495[1] { ResolutionCandidate@7619 }
-    <name not found> = ArrayList@9496[1] { ResolutionCandidate@2810 }
-    <name not found> = ArrayList@9497[1] { ResolutionCandidate@1874 }
-    <name not found> = ArrayList@9498[1] { ResolutionCandidate@1334 }
-    <name not found> = ArrayList@9499[1] { ResolutionCandidate@7262 }
-    <name not found> = ArrayList@9500[1] { ResolutionCandidate@7319 }
-    <name not found> = ArrayList@9501[1] { ResolutionCandidate@4040 }
-    <name not found> = ArrayList@9502[1] { ResolutionCandidate@1193 }
-    <name not found> = ArrayList@9503[1] { ResolutionCandidate@6803 }
-    <name not found> = ArrayList@9504[1] { ResolutionCandidate@7715 }
-    <name not found> = ArrayList@9505[1] { ResolutionCandidate@1883 }
-    <name not found> = ArrayList@9506[1] { ResolutionCandidate@2528 }
-    <name not found> = ArrayList@9507[1] { ResolutionCandidate@800 }
-    <name not found> = ArrayList@9508[1] { ResolutionCandidate@5156 }
-    <name not found> = ArrayList@9509[1] { ResolutionCandidate@6917 }
-    <name not found> = ArrayList@9510[1] { ResolutionCandidate@2402 }
-    <name not found> = ArrayList@9511[1] { ResolutionCandidate@4442 }
-    <name not found> = ArrayList@9512[1] { ResolutionCandidate@1376 }
-    <name not found> = ArrayList@9513[1] { ResolutionCandidate@5321 }
-    <name not found> = ArrayList@9514[1] { ResolutionCandidate@7181 }
-    <name not found> = ArrayList@9515[1] { ResolutionCandidate@2393 }
-    <name not found> = ArrayList@9516[1] { ResolutionCandidate@3005 }
-    <name not found> = ArrayList@9517[1] { ResolutionCandidate@737 }
-    <name not found> = ArrayList@9518[1] { ResolutionCandidate@7172 }
-    <name not found> = ArrayList@9519[1] { ResolutionCandidate@5291 }
-    <name not found> = ArrayList@9520[1] { ResolutionCandidate@3650 }
-    <name not found> = ArrayList@9521[1] { ResolutionCandidate@2771 }
-    <name not found> = ArrayList@9522[1] { ResolutionCandidate@908 }
-    <name not found> = ArrayList@9523[1] { ResolutionCandidate@5804 }
-    <name not found> = ArrayList@9524[1] { ResolutionCandidate@5795 }
-    <name not found> = ArrayList@9525[1] { ResolutionCandidate@2051 }
-    <name not found> = ArrayList@9526[1] { ResolutionCandidate@2378 }
-    <name not found> = ArrayList@9527[1] { ResolutionCandidate@1307 }
-    <name not found> = ArrayList@9528[1] { ResolutionCandidate@6722 }
-    <name not found> = ArrayList@9529[1] { ResolutionCandidate@3131 }
-    <name not found> = ArrayList@9530[1] { ResolutionCandidate@4298 }
-    <name not found> = ArrayList@9531[1] { ResolutionCandidate@1085 }
-    <name not found> = ArrayList@9532[1] { ResolutionCandidate@7661 }
-    <name not found> = ArrayList@9533[1] { ResolutionCandidate@5102 }
-    <name not found> = ArrayList@9534[1] { ResolutionCandidate@2405 }
-    <name not found> = ArrayList@9535[1] { ResolutionCandidate@3842 }
-    <name not found> = ArrayList@9536[1] { ResolutionCandidate@1328 }
-    <name not found> = ArrayList@9537[1] { ResolutionCandidate@5831 }
-    <name not found> = ArrayList@9538[1] { ResolutionCandidate@5339 }
-    <name not found> = ArrayList@9539[1] { ResolutionCandidate@2792 }
-    <name not found> = ArrayList@9540[1] { ResolutionCandidate@3356 }
-    <name not found> = ArrayList@9541[1] { ResolutionCandidate@866 }
-    <name not found> = ArrayList@9542[1] { ResolutionCandidate@6191 }
-    <name not found> = ArrayList@9543[1] { ResolutionCandidate@6398 }
-    <name not found> = ArrayList@9544[1] { ResolutionCandidate@3578 }
-    <name not found> = ArrayList@9545[1] { ResolutionCandidate@2903 }
-    <name not found> = ArrayList@9546[1] { ResolutionCandidate@656 }
-    <name not found> = ArrayList@9547[1] { ResolutionCandidate@6326 }
-    <name not found> = ArrayList@9548[1] { ResolutionCandidate@5702 }
-    <name not found> = ArrayList@9549[1] { ResolutionCandidate@2762 }
-    <name not found> = ArrayList@9550[1] { ResolutionCandidate@563 }
-    <name not found> = ArrayList@9551[1] { ResolutionCandidate@5330 }
-    <name not found> = ArrayList@9552[1] { ResolutionCandidate@7697 }
-    <name not found> = ArrayList@9553[1] { ResolutionCandidate@1754 }
-    <name not found> = ArrayList@9554[1] { ResolutionCandidate@3668 }
-    <name not found> = ArrayList@9555[1] { ResolutionCandidate@1013 }
-    <name not found> = ArrayList@9556[1] { ResolutionCandidate@4625 }
-    <name not found> = ArrayList@9557[1] { ResolutionCandidate@6746 }
-    <name not found> = ArrayList@9558[1] { ResolutionCandidate@2549 }
-    <name not found> = ArrayList@9559[1] { ResolutionCandidate@3992 }
-    <name not found> = ArrayList@9560[1] { ResolutionCandidate@1244 }
-    <name not found> = ArrayList@9561[1] { ResolutionCandidate@6413 }
-    <name not found> = ArrayList@9562[1] { ResolutionCandidate@7541 }
-    <name not found> = ArrayList@9563[1] { ResolutionCandidate@3011 }
-    <name not found> = ArrayList@9564[1] { ResolutionCandidate@3449 }
-    <name not found> = ArrayList@9565[1] { ResolutionCandidate@1154 }
-    <name not found> = ArrayList@9566[1] { ResolutionCandidate@4754 }
-    <name not found> = ArrayList@9567[1] { ResolutionCandidate@7256 }
-    <name not found> = ArrayList@9568[1] { ResolutionCandidate@1697 }
-    <name not found> = ArrayList@9569[1] { ResolutionCandidate@1736 }
-    <name not found> = ArrayList@9570[1] { ResolutionCandidate@1043 }
-    <name not found> = ArrayList@9571[1] { ResolutionCandidate@5861 }
-    <name not found> = ArrayList@9572[1] { ResolutionCandidate@5117 }
-    <name not found> = ArrayList@9573[1] { ResolutionCandidate@2288 }
-    <name not found> = ArrayList@9574[1] { ResolutionCandidate@3830 }
-    <name not found> = ArrayList@9575[1] { ResolutionCandidate@569 }
-    <name not found> = ArrayList@9576[1] { ResolutionCandidate@5603 }
-    <name not found> = ArrayList@9577[1] { ResolutionCandidate@6035 }
-    <name not found> = ArrayList@9578[1] { ResolutionCandidate@3794 }
-    <name not found> = ArrayList@9579[1] { ResolutionCandidate@767 }
-    <name not found> = ArrayList@9580[1] { ResolutionCandidate@7406 }
-    <name not found> = ArrayList@9581[1] { ResolutionCandidate@7079 }
-    <name not found> = ArrayList@9582[1] { ResolutionCandidate@4424 }
-    <name not found> = ArrayList@9583[1] { ResolutionCandidate@2681 }
-    <name not found> = ArrayList@9584[1] { ResolutionCandidate@566 }
-    <name not found> = ArrayList@9585[1] { ResolutionCandidate@5705 }
-    <name not found> = ArrayList@9586[1] { ResolutionCandidate@5510 }
-    <name not found> = ArrayList@9587[1] { ResolutionCandidate@2144 }
-    <name not found> = ArrayList@9588[1] { ResolutionCandidate@3041 }
-    <name not found> = ArrayList@9589[1] { ResolutionCandidate@455 }
-    <name not found> = ArrayList@9590[1] { ResolutionCandidate@6515 }
-    <name not found> = ArrayList@9591[1] { ResolutionCandidate@6962 }
-    <name not found> = ArrayList@9592[1] { ResolutionCandidate@3329 }
-    <name not found> = ArrayList@9593[1] { ResolutionCandidate@1601 }
-    <name not found> = ArrayList@9594[1] { ResolutionCandidate@1076 }
-    <name not found> = ArrayList@9595[1] { ResolutionCandidate@6476 }
-    <name not found> = ArrayList@9596[1] { ResolutionCandidate@4217 }
-    <name not found> = ArrayList@9597[1] { ResolutionCandidate@1640 }
-    <name not found> = ArrayList@9598[1] { ResolutionCandidate@1286 }
-    <name not found> = ArrayList@9599[1] { ResolutionCandidate@6686 }
-    <name not found> = ArrayList@9600[1] { ResolutionCandidate@7514 }
-    <name not found> = ArrayList@9601[1] { ResolutionCandidate@2258 }
-    <name not found> = ArrayList@9602[1] { ResolutionCandidate@3020 }
-    <name not found> = ArrayList@9603[1] { ResolutionCandidate@692 }
-    <name not found> = ArrayList@9604[1] { ResolutionCandidate@6605 }
-    <name not found> = ArrayList@9605[1] { ResolutionCandidate@7520 }
-    <name not found> = ArrayList@9606[1] { ResolutionCandidate@3845 }
-    <name not found> = ArrayList@9607[1] { ResolutionCandidate@3479 }
-    <name not found> = ArrayList@9608[1] { ResolutionCandidate@1370 }
-    <name not found> = ArrayList@9609[1] { ResolutionCandidate@4628 }
-    <name not found> = ArrayList@9610[1] { ResolutionCandidate@7610 }
-    <name not found> = ArrayList@9611[1] { ResolutionCandidate@2384 }
-    <name not found> = ArrayList@9612[1] { ResolutionCandidate@2180 }
-    <name not found> = ArrayList@9613[1] { ResolutionCandidate@1136 }
-    <name not found> = ArrayList@9614[1] { ResolutionCandidate@6983 }
-    <name not found> = ArrayList@9615[1] { ResolutionCandidate@6710 }
-    <name not found> = ArrayList@9616[1] { ResolutionCandidate@2639 }
-    <name not found> = ArrayList@9617[1] { ResolutionCandidate@4073 }
-    <name not found> = ArrayList@9618[1] { ResolutionCandidate@929 }
-    <name not found> = ArrayList@9619[1] { ResolutionCandidate@6323 }
-    <name not found> = ArrayList@9620[1] { ResolutionCandidate@7580 }
-    <name not found> = ArrayList@9621[1] { ResolutionCandidate@371 }
-    <name not found> = ArrayList@9622[1] { ResolutionCandidate@4256 }
-    <name not found> = ArrayList@9623[1] { ResolutionCandidate@1988 }
-    <name not found> = ArrayList@9624[1] { ResolutionCandidate@3314 }
-    <name not found> = ArrayList@9625[1] { ResolutionCandidate@626 }
-    <name not found> = ArrayList@9626[1] { ResolutionCandidate@5342 }
-    <name not found> = ArrayList@9627[1] { ResolutionCandidate@6452 }
-    <name not found> = ArrayList@9628[1] { ResolutionCandidate@6269 }
-    <name not found> = ArrayList@9629[1] { ResolutionCandidate@968 }
-    <name not found> = ArrayList@9630[1] { ResolutionCandidate@6200 }
-    <name not found> = ArrayList@9631[1] { ResolutionCandidate@6626 }
-    <name not found> = ArrayList@9632[1] { ResolutionCandidate@515 }
-    <name not found> = ArrayList@9633[1] { ResolutionCandidate@1133 }
-    <name not found> = ArrayList@9634[1] { ResolutionCandidate@4997 }
-    <name not found> = ArrayList@9635[1] { ResolutionCandidate@5201 }
-    <name not found> = ArrayList@9636[1] { ResolutionCandidate@4661 }
-    <name not found> = ArrayList@9637[1] { ResolutionCandidate@2069 }
-    <name not found> = ArrayList@9638[1] { ResolutionCandidate@1631 }
-    <name not found> = ArrayList@9639[1] { ResolutionCandidate@2240 }
-    <name not found> = ArrayList@9640[1] { ResolutionCandidate@470 }
-    <name not found> = ArrayList@9641[1] { ResolutionCandidate@4880 }
-    <name not found> = ArrayList@9642[1] { ResolutionCandidate@4730 }
-    <name not found> = ArrayList@9643[1] { ResolutionCandidate@5138 }
-    <name not found> = ArrayList@9644[1] { ResolutionCandidate@2852 }
-    <name not found> = ArrayList@9645[1] { ResolutionCandidate@1604 }
-    <name not found> = ArrayList@9646[1] { ResolutionCandidate@4349 }
-    <name not found> = ArrayList@9647[1] { ResolutionCandidate@785 }
-    <name not found> = ArrayList@9648[1] { ResolutionCandidate@7463 }
-    <name not found> = ArrayList@9649[1] { ResolutionCandidate@7328 }
-    <name not found> = ArrayList@9650[1] { ResolutionCandidate@4901 }
-    <name not found> = ArrayList@9651[1] { ResolutionCandidate@2663 }
-    <name not found> = ArrayList@9652[1] { ResolutionCandidate@2102 }
-    <name not found> = ArrayList@9653[1] { ResolutionCandidate@2756 }
-    <name not found> = ArrayList@9654[1] { ResolutionCandidate@350 }
-    <name not found> = ArrayList@9655[1] { ResolutionCandidate@5441 }
-    <name not found> = ArrayList@9656[1] { ResolutionCandidate@5189 }
-    <name not found> = ArrayList@9657[1] { ResolutionCandidate@6986 }
-    <name not found> = ArrayList@9658[1] { ResolutionCandidate@3584 }
-    <name not found> = ArrayList@9659[1] { ResolutionCandidate@2750 }
-    <name not found> = ArrayList@9660[1] { ResolutionCandidate@2603 }
-    <name not found> = ArrayList@9661[1] { ResolutionCandidate@938 }
-    <name not found> = ArrayList@9662[1] { ResolutionCandidate@6995 }
-    <name not found> = ArrayList@9663[1] { ResolutionCandidate@7046 }
-    <name not found> = ArrayList@9664[1] { ResolutionCandidate@6833 }
-    <name not found> = ArrayList@9665[1] { ResolutionCandidate@4373 }
-    <name not found> = ArrayList@9666[1] { ResolutionCandidate@3161 }
-    <name not found> = ArrayList@9667[1] { ResolutionCandidate@1541 }
-    <name not found> = ArrayList@9668[1] { ResolutionCandidate@6947 }
-    <name not found> = ArrayList@9669[1] { ResolutionCandidate@7028 }
-    <name not found> = ArrayList@9670[1] { ResolutionCandidate@7523 }
-    <name not found> = ArrayList@9671[1] { ResolutionCandidate@6818 }
-    <name not found> = ArrayList@9672[1] { ResolutionCandidate@7718 }
-    <name not found> = ArrayList@9673[1] { ResolutionCandidate@4520 }
-    <name not found> = ArrayList@9674[1] { ResolutionCandidate@4055 }
-    <name not found> = ArrayList@9675[1] { ResolutionCandidate@4178 }
-    <name not found> = ArrayList@9676[1] { ResolutionCandidate@668 }
-    <name not found> = ArrayList@9677[1] { ResolutionCandidate@6050 }
-    <name not found> = ArrayList@9678[1] { ResolutionCandidate@4871 }
-    <name not found> = ArrayList@9679[1] { ResolutionCandidate@1991 }
-    <name not found> = ArrayList@9680[1] { ResolutionCandidate@2672 }
-    <name not found> = ArrayList@9681[1] { ResolutionCandidate@3974 }
-    <name not found> = ArrayList@9682[1] { ResolutionCandidate@1358 }
-    <name not found> = ArrayList@9683[1] { ResolutionCandidate@6650 }
-    <name not found> = ArrayList@9684[1] { ResolutionCandidate@5699 }
-    <name not found> = ArrayList@9685[1] { ResolutionCandidate@3446 }
-    <name not found> = ArrayList@9686[1] { ResolutionCandidate@4499 }
-    <name not found> = ArrayList@9687[1] { ResolutionCandidate@3956 }
-    <name not found> = ArrayList@9688[1] { ResolutionCandidate@1145 }
-    <name not found> = ArrayList@9689[1] { ResolutionCandidate@7559 }
-    <name not found> = ArrayList@9690[1] { ResolutionCandidate@7343 }
-    <name not found> = ArrayList@9691[1] { ResolutionCandidate@2132 }
-    <name not found> = ArrayList@9692[1] { ResolutionCandidate@3968 }
-    <name not found> = ArrayList@9693[1] { ResolutionCandidate@596 }
-    <name not found> = ArrayList@9694[1] { ResolutionCandidate@5915 }
-    <name not found> = ArrayList@9695[1] { ResolutionCandidate@7052 }
-    <name not found> = ArrayList@9696[1] { ResolutionCandidate@6245 }
-    <name not found> = ArrayList@9697[1] { ResolutionCandidate@6854 }
-    <name not found> = ArrayList@9698[1] { ResolutionCandidate@4688 }
-    <name not found> = ArrayList@9699[1] { ResolutionCandidate@3179 }
-    <name not found> = ArrayList@9700[1] { ResolutionCandidate@2735 }
-    <name not found> = ArrayList@9701[1] { ResolutionCandidate@674 }
-    <name not found> = ArrayList@9702[1] { ResolutionCandidate@7457 }
-    <name not found> = ArrayList@9703[1] { ResolutionCandidate@5606 }
-    <name not found> = ArrayList@9704[1] { ResolutionCandidate@6467 }
-    <name not found> = ArrayList@9705[1] { ResolutionCandidate@6533 }
-    <name not found> = ArrayList@9706[1] { ResolutionCandidate@6296 }
-    <name not found> = ArrayList@9707[1] { ResolutionCandidate@3914 }
-    <name not found> = ArrayList@9708[1] { ResolutionCandidate@1757 }
-    <name not found> = ArrayList@9709[1] { ResolutionCandidate@560 }
-    <name not found> = ArrayList@9710[1] { ResolutionCandidate@5309 }
-    <name not found> = ArrayList@9711[1] { ResolutionCandidate@7211 }
-    <name not found> = ArrayList@9712[1] { ResolutionCandidate@4727 }
-    <name not found> = ArrayList@9713[1] { ResolutionCandidate@5234 }
-    <name not found> = ArrayList@9714[1] { ResolutionCandidate@6998 }
-    <name not found> = ArrayList@9715[1] { ResolutionCandidate@1574 }
-    <name not found> = ArrayList@9716[1] { ResolutionCandidate@3029 }
-    <name not found> = ArrayList@9717[1] { ResolutionCandidate@4304 }
-    <name not found> = ArrayList@9718[1] { ResolutionCandidate@1349 }
-    <name not found> = ArrayList@9719[1] { ResolutionCandidate@4937 }
-    <name not found> = ArrayList@9720[1] { ResolutionCandidate@6455 }
-    <name not found> = ArrayList@9721[1] { ResolutionCandidate@2177 }
-    <name not found> = ArrayList@9722[1] { ResolutionCandidate@2660 }
-    <name not found> = ArrayList@9723[1] { ResolutionCandidate@2018 }
-    <name not found> = ArrayList@9724[1] { ResolutionCandidate@1391 }
-    <name not found> = ArrayList@9725[1] { ResolutionCandidate@7682 }
-    <name not found> = ArrayList@9726[1] { ResolutionCandidate@6071 }
-    <name not found> = ArrayList@9727[1] { ResolutionCandidate@3821 }
-    <name not found> = ArrayList@9728[1] { ResolutionCandidate@4523 }
-    <name not found> = ArrayList@9729[1] { ResolutionCandidate@2081 }
-    <name not found> = ArrayList@9730[1] { ResolutionCandidate@764 }
-    <name not found> = ArrayList@9731[1] { ResolutionCandidate@7649 }
-    <name not found> = ArrayList@9732[1] { ResolutionCandidate@5237 }
-    <name not found> = ArrayList@9733[1] { ResolutionCandidate@2360 }
-    <name not found> = ArrayList@9734[1] { ResolutionCandidate@2720 }
-    <name not found> = ArrayList@9735[1] { ResolutionCandidate@3839 }
-    <name not found> = ArrayList@9736[1] { ResolutionCandidate@1352 }
-    <name not found> = ArrayList@9737[1] { ResolutionCandidate@7652 }
-    <name not found> = ArrayList@9738[1] { ResolutionCandidate@5567 }
-    <name not found> = ArrayList@9739[1] { ResolutionCandidate@4376 }
-    <name not found> = ArrayList@9740[1] { ResolutionCandidate@3674 }
-    <name not found> = ArrayList@9741[1] { ResolutionCandidate@4259 }
-    <name not found> = ArrayList@9742[1] { ResolutionCandidate@1103 }
-    <name not found> = ArrayList@9743[1] { ResolutionCandidate@7220 }
-    <name not found> = ArrayList@9744[1] { ResolutionCandidate@6902 }
-    <name not found> = ArrayList@9745[1] { ResolutionCandidate@2687 }
-    <name not found> = ArrayList@9746[1] { ResolutionCandidate@3506 }
-    <name not found> = ArrayList@9747[1] { ResolutionCandidate@2396 }
-    <name not found> = ArrayList@9748[1] { ResolutionCandidate@377 }
-    <name not found> = ArrayList@9749[1] { ResolutionCandidate@6842 }
-    <name not found> = ArrayList@9750[1] { ResolutionCandidate@6896 }
-    <name not found> = ArrayList@9751[1] { ResolutionCandidate@3773 }
-    <name not found> = ArrayList@9752[1] { ResolutionCandidate@3884 }
-    <name not found> = ArrayList@9753[1] { ResolutionCandidate@3776 }
-    <name not found> = ArrayList@9754[1] { ResolutionCandidate@1451 }
-    <name not found> = ArrayList@9755[1] { ResolutionCandidate@5864 }
-    <name not found> = ArrayList@9756[1] { ResolutionCandidate@4964 }
-    <name not found> = ArrayList@9757[1] { ResolutionCandidate@3590 }
-    <name not found> = ArrayList@9758[1] { ResolutionCandidate@4451 }
-    <name not found> = ArrayList@9759[1] { ResolutionCandidate@1073 }
-    <name not found> = ArrayList@9760[1] { ResolutionCandidate@4634 }
-    <name not found> = ArrayList@9761[1] { ResolutionCandidate@6434 }
-    <name not found> = ArrayList@9762[1] { ResolutionCandidate@4631 }
-    <name not found> = ArrayList@9763[1] { ResolutionCandidate@7391 }
-    <name not found> = ArrayList@9764[1] { ResolutionCandidate@4940 }
-    <name not found> = ArrayList@9765[1] { ResolutionCandidate@2309 }
-    <name not found> = ArrayList@9766[1] { ResolutionCandidate@3272 }
-    <name not found> = ArrayList@9767[1] { ResolutionCandidate@3053 }
-    <name not found> = ArrayList@9768[1] { ResolutionCandidate@1292 }
-    <name not found> = ArrayList@9769[1] { ResolutionCandidate@4808 }
-    <name not found> = ArrayList@9770[1] { ResolutionCandidate@6806 }
-    <name not found> = ArrayList@9771[1] { ResolutionCandidate@3596 }
-    <name not found> = ArrayList@9772[1] { ResolutionCandidate@3740 }
-    <name not found> = ArrayList@9773[1] { ResolutionCandidate@3068 }
-    <name not found> = ArrayList@9774[1] { ResolutionCandidate@1187 }
-    <name not found> = ArrayList@9775[1] { ResolutionCandidate@4979 }
-    <name not found> = ArrayList@9776[1] { ResolutionCandidate@6635 }
-    <name not found> = ArrayList@9777[1] { ResolutionCandidate@2960 }
-    <name not found> = ArrayList@9778[1] { ResolutionCandidate@1826 }
-    <name not found> = ArrayList@9779[1] { ResolutionCandidate@3983 }
-    <name not found> = ArrayList@9780[1] { ResolutionCandidate@1469 }
-    <name not found> = ArrayList@9781[1] { ResolutionCandidate@7664 }
-    <name not found> = ArrayList@9782[1] { ResolutionCandidate@4691 }
-    <name not found> = ArrayList@9783[1] { ResolutionCandidate@2375 }
-    <name not found> = ArrayList@9784[1] { ResolutionCandidate@2255 }
-    <name not found> = ArrayList@9785[1] { ResolutionCandidate@830 }
-    <name not found> = ArrayList@9786[1] { ResolutionCandidate@7175 }
-    <name not found> = ArrayList@9787[1] { ResolutionCandidate@7013 }
-    <name not found> = ArrayList@9788[1] { ResolutionCandidate@6500 }
-    <name not found> = ArrayList@9789[1] { ResolutionCandidate@7616 }
-    <name not found> = ArrayList@9790[1] { ResolutionCandidate@7373 }
-    <name not found> = ArrayList@9791[1] { ResolutionCandidate@1802 }
-    <name not found> = ArrayList@9792[1] { ResolutionCandidate@3107 }
-    <name not found> = ArrayList@9793[1] { ResolutionCandidate@1142 }
-    <name not found> = ArrayList@9794[1] { ResolutionCandidate@5738 }
-    <name not found> = ArrayList@9795[1] { ResolutionCandidate@7199 }
-    <name not found> = ArrayList@9796[1] { ResolutionCandidate@6554 }
-    <name not found> = ArrayList@9797[1] { ResolutionCandidate@4574 }
-    <name not found> = ArrayList@9798[1] { ResolutionCandidate@6791 }
-    <name not found> = ArrayList@9799[1] { ResolutionCandidate@2915 }
-    <name not found> = ArrayList@9800[1] { ResolutionCandidate@3488 }
-    <name not found> = ArrayList@9801[1] { ResolutionCandidate@1061 }
-    <name not found> = ArrayList@9802[1] { ResolutionCandidate@5615 }
-    <name not found> = ArrayList@9803[1] { ResolutionCandidate@6449 }
-    <name not found> = ArrayList@9804[1] { ResolutionCandidate@7070 }
-    <name not found> = ArrayList@9805[1] { ResolutionCandidate@6077 }
-    <name not found> = ArrayList@9806[1] { ResolutionCandidate@7367 }
-    <name not found> = ArrayList@9807[1] { ResolutionCandidate@4013 }
-    <name not found> = ArrayList@9808[1] { ResolutionCandidate@3125 }
-    <name not found> = ArrayList@9809[1] { ResolutionCandidate@620 }
-    <name not found> = ArrayList@9810[1] { ResolutionCandidate@6908 }
-    <name not found> = ArrayList@9811[1] { ResolutionCandidate@4904 }
-    <name not found> = ArrayList@9812[1] { ResolutionCandidate@4781 }
-    <name not found> = ArrayList@9813[1] { ResolutionCandidate@5597 }
-    <name not found> = ArrayList@9814[1] { ResolutionCandidate@6914 }
-    <name not found> = ArrayList@9815[1] { ResolutionCandidate@2522 }
-    <name not found> = ArrayList@9816[1] { ResolutionCandidate@3080 }
-    <name not found> = ArrayList@9817[1] { ResolutionCandidate@3440 }
-    <name not found> = ArrayList@9818[1] { ResolutionCandidate@590 }
-    <name not found> = ArrayList@9819[1] { ResolutionCandidate@6959 }
-    <name not found> = ArrayList@9820[1] { ResolutionCandidate@6104 }
-    <name not found> = ArrayList@9821[1] { ResolutionCandidate@2318 }
-    <name not found> = ArrayList@9822[1] { ResolutionCandidate@1976 }
-    <name not found> = ArrayList@9823[1] { ResolutionCandidate@2063 }
-    <name not found> = ArrayList@9824[1] { ResolutionCandidate@1169 }
-    <name not found> = ArrayList@9825[1] { ResolutionCandidate@7094 }
-    <name not found> = ArrayList@9826[1] { ResolutionCandidate@5873 }
-    <name not found> = ArrayList@9827[1] { ResolutionCandidate@3197 }
-    <name not found> = ArrayList@9828[1] { ResolutionCandidate@1685 }
-    <name not found> = ArrayList@9829[1] { ResolutionCandidate@1688 }
-    <name not found> = ArrayList@9830[1] { ResolutionCandidate@1298 }
-    <name not found> = ArrayList@9831[1] { ResolutionCandidate@6347 }
-    <name not found> = ArrayList@9832[1] { ResolutionCandidate@7532 }
-    <name not found> = ArrayList@9833[1] { ResolutionCandidate@3548 }
-    <name not found> = ArrayList@9834[1] { ResolutionCandidate@4031 }
-    <name not found> = ArrayList@9835[1] { ResolutionCandidate@1163 }
-    <name not found> = ArrayList@9836[1] { ResolutionCandidate@7214 }
-    <name not found> = ArrayList@9837[1] { ResolutionCandidate@6437 }
-    <name not found> = ArrayList@9838[1] { ResolutionCandidate@5390 }
-    <name not found> = ArrayList@9839[1] { ResolutionCandidate@7238 }
-    <name not found> = ArrayList@9840[1] { ResolutionCandidate@6344 }
-    <name not found> = ArrayList@9841[1] { ResolutionCandidate@4163 }
-    <name not found> = ArrayList@9842[1] { ResolutionCandidate@3461 }
-    <name not found> = ArrayList@9843[1] { ResolutionCandidate@494 }
-    <name not found> = ArrayList@9844[1] { ResolutionCandidate@5450 }
-    <name not found> = ArrayList@9845[1] { ResolutionCandidate@6536 }
-    <name not found> = ArrayList@9846[1] { ResolutionCandidate@6788 }
-    <name not found> = ArrayList@9847[1] { ResolutionCandidate@5963 }
-    <name not found> = ArrayList@9848[1] { ResolutionCandidate@7658 }
-    <name not found> = ArrayList@9849[1] { ResolutionCandidate@3086 }
-    <name not found> = ArrayList@9850[1] { ResolutionCandidate@3716 }
-    <name not found> = ArrayList@9851[1] { ResolutionCandidate@1058 }
-    <name not found> = ArrayList@9852[1] { ResolutionCandidate@7289 }
-    <name not found> = ArrayList@9853[1] { ResolutionCandidate@6401 }
-    <name not found> = ArrayList@9854[1] { ResolutionCandidate@4814 }
-    <name not found> = ArrayList@9855[1] { ResolutionCandidate@5819 }
-    <name not found> = ArrayList@9856[1] { ResolutionCandidate@6098 }
-    <name not found> = ArrayList@9857[1] { ResolutionCandidate@2420 }
-    <name not found> = ArrayList@9858[1] { ResolutionCandidate@4085 }
-    <name not found> = ArrayList@9859[1] { ResolutionCandidate@401 }
-    <name not found> = ArrayList@9860[1] { ResolutionCandidate@5528 }
-    <name not found> = ArrayList@9861[1] { ResolutionCandidate@6884 }
-    <name not found> = ArrayList@9862[1] { ResolutionCandidate@7106 }
-    <name not found> = ArrayList@9863[1] { ResolutionCandidate@6194 }
-    <name not found> = ArrayList@9864[1] { ResolutionCandidate@6095 }
-    <name not found> = ArrayList@9865[1] { ResolutionCandidate@1751 }
-    <name not found> = ArrayList@9866[1] { ResolutionCandidate@2795 }
-    <name not found> = ArrayList@9867[1] { ResolutionCandidate@3524 }
-    <name not found> = ArrayList@9868[1] { ResolutionCandidate@362 }
-    <name not found> = ArrayList@9869[1] { ResolutionCandidate@4751 }
-    <name not found> = ArrayList@9870[1] { ResolutionCandidate@7358 }
-    <name not found> = ArrayList@9871[1] { ResolutionCandidate@2033 }
-    <name not found> = ArrayList@9872[1] { ResolutionCandidate@3266 }
-    <name not found> = ArrayList@9873[1] { ResolutionCandidate@4097 }
-    <name not found> = ArrayList@9874[1] { ResolutionCandidate@848 }
-    <name not found> = ArrayList@9875[1] { ResolutionCandidate@7040 }
-    <name not found> = ArrayList@9876[1] { ResolutionCandidate@7421 }
-    <name not found> = ArrayList@9877[1] { ResolutionCandidate@1727 }
-    <name not found> = ArrayList@9878[1] { ResolutionCandidate@2252 }
-    <name not found> = ArrayList@9879[1] { ResolutionCandidate@1616 }
-    <name not found> = ArrayList@9880[1] { ResolutionCandidate@611 }
-    <name not found> = ArrayList@9881[1] { ResolutionCandidate@4766 }
-    <name not found> = ArrayList@9882[1] { ResolutionCandidate@7127 }
-    <name not found> = ArrayList@9883[1] { ResolutionCandidate@3569 }
-    <name not found> = ArrayList@9884[1] { ResolutionCandidate@2024 }
-    <name not found> = ArrayList@9885[1] { ResolutionCandidate@734 }
-    <name not found> = ArrayList@9886[1] { ResolutionCandidate@7466 }
-    <name not found> = ArrayList@9887[1] { ResolutionCandidate@7607 }
-    <name not found> = ArrayList@9888[1] { ResolutionCandidate@6311 }
-    <name not found> = ArrayList@9889[1] { ResolutionCandidate@6719 }
-    <name not found> = ArrayList@9890[1] { ResolutionCandidate@4916 }
-    <name not found> = ArrayList@9891[1] { ResolutionCandidate@1787 }
-    <name not found> = ArrayList@9892[1] { ResolutionCandidate@4268 }
-    <name not found> = ArrayList@9893[1] { ResolutionCandidate@1343 }
-    <name not found> = ArrayList@9894[1] { ResolutionCandidate@7427 }
-    <name not found> = ArrayList@9895[1] { ResolutionCandidate@6068 }
-    <name not found> = ArrayList@9896[1] { ResolutionCandidate@6740 }
-    <name not found> = ArrayList@9897[1] { ResolutionCandidate@7472 }
-    <name not found> = ArrayList@9898[1] { ResolutionCandidate@6383 }
-    <name not found> = ArrayList@9899[1] { ResolutionCandidate@3926 }
-    <name not found> = ArrayList@9900[1] { ResolutionCandidate@4229 }
-    <name not found> = ArrayList@9901[1] { ResolutionCandidate@923 }
-    <name not found> = ArrayList@9902[1] { ResolutionCandidate@5129 }
-    <name not found> = ArrayList@9903[1] { ResolutionCandidate@5279 }
-    <name not found> = ArrayList@9904[1] { ResolutionCandidate@5837 }
-    <name not found> = ArrayList@9905[1] { ResolutionCandidate@5078 }
-    <name not found> = ArrayList@9906[1] { ResolutionCandidate@6374 }
-    <name not found> = ArrayList@9907[1] { ResolutionCandidate@3464 }
-    <name not found> = ArrayList@9908[1] { ResolutionCandidate@2243 }
-    <name not found> = ArrayList@9909[1] { ResolutionCandidate@998 }
-    <name not found> = ArrayList@9910[1] { ResolutionCandidate@5171 }
-    <name not found> = ArrayList@9911[1] { ResolutionCandidate@5939 }
-    <name not found> = ArrayList@9912[1] { ResolutionCandidate@6701 }
-    <name not found> = ArrayList@9913[1] { ResolutionCandidate@6287 }
-    <name not found> = ArrayList@9914[1] { ResolutionCandidate@5261 }
-    <name not found> = ArrayList@9915[1] { ResolutionCandidate@1898 }
-    <name not found> = ArrayList@9916[1] { ResolutionCandidate@3074 }
-    <name not found> = ArrayList@9917[1] { ResolutionCandidate@1556 }
-    <name not found> = ArrayList@9918[1] { ResolutionCandidate@1028 }
-    <name not found> = ArrayList@9919[1] { ResolutionCandidate@7061 }
-    <name not found> = ArrayList@9920[1] { ResolutionCandidate@4805 }
-    <name not found> = ArrayList@9921[1] { ResolutionCandidate@3416 }
-    <name not found> = ArrayList@9922[1] { ResolutionCandidate@4004 }
-    <name not found> = ArrayList@9923[1] { ResolutionCandidate@2075 }
-    <name not found> = ArrayList@9924[1] { ResolutionCandidate@1457 }
-    <name not found> = ArrayList@9925[1] { ResolutionCandidate@7235 }
-    <name not found> = ArrayList@9926[1] { ResolutionCandidate@6956 }
-    <name not found> = ArrayList@9927[1] { ResolutionCandidate@2183 }
-    <name not found> = ArrayList@9928[1] { ResolutionCandidate@3152 }
-    <name not found> = ArrayList@9929[1] { ResolutionCandidate@2933 }
-    <name not found> = ArrayList@9930[1] { ResolutionCandidate@587 }
-    <name not found> = ArrayList@9931[1] { ResolutionCandidate@6407 }
-    <name not found> = ArrayList@9932[1] { ResolutionCandidate@7073 }
-    <name not found> = ArrayList@9933[1] { ResolutionCandidate@3200 }
-    <name not found> = ArrayList@9934[1] { ResolutionCandidate@3401 }
-    <name not found> = ArrayList@9935[1] { ResolutionCandidate@1100 }
-    <name not found> = ArrayList@9936[1] { ResolutionCandidate@5825 }
-    <name not found> = ArrayList@9937[1] { ResolutionCandidate@6314 }
-    <name not found> = ArrayList@9938[1] { ResolutionCandidate@4559 }
-    <name not found> = ArrayList@9939[1] { ResolutionCandidate@5768 }
-    <name not found> = ArrayList@9940[1] { ResolutionCandidate@4778 }
-    <name not found> = ArrayList@9941[1] { ResolutionCandidate@2060 }
-    <name not found> = ArrayList@9942[1] { ResolutionCandidate@3491 }
-    <name not found> = ArrayList@9943[1] { ResolutionCandidate@719 }
-    <name not found> = ArrayList@9944[1] { ResolutionCandidate@6974 }
-    <name not found> = ArrayList@9945[1] { ResolutionCandidate@4775 }
-    <name not found> = ArrayList@9946[1] { ResolutionCandidate@5807 }
-    <name not found> = ArrayList@9947[1] { ResolutionCandidate@5672 }
-    <name not found> = ArrayList@9948[1] { ResolutionCandidate@6491 }
-    <name not found> = ArrayList@9949[1] { ResolutionCandidate@3089 }
-    <name not found> = ArrayList@9950[1] { ResolutionCandidate@4142 }
-    <name not found> = ArrayList@9951[1] { ResolutionCandidate@1472 }
-    <name not found> = ArrayList@9952[1] { ResolutionCandidate@6158 }
-    <name not found> = ArrayList@9953[1] { ResolutionCandidate@7322 }
-    <name not found> = ArrayList@9954[1] { ResolutionCandidate@4703 }
-    <name not found> = ArrayList@9955[1] { ResolutionCandidate@7499 }
-    <name not found> = ArrayList@9956[1] { ResolutionCandidate@7562 }
-    <name not found> = ArrayList@9957[1] { ResolutionCandidate@2540 }
-    <name not found> = ArrayList@9958[1] { ResolutionCandidate@4136 }
-    <name not found> = ArrayList@9959[1] { ResolutionCandidate@3917 }
-    <name not found> = ArrayList@9960[1] { ResolutionCandidate@1394 }
-    <name not found> = ArrayList@9961[1] { ResolutionCandidate@7160 }
-    <name not found> = ArrayList@9962[1] { ResolutionCandidate@6179 }
-    <name not found> = ArrayList@9963[1] { ResolutionCandidate@7133 }
-    <name not found> = ArrayList@9964[1] { ResolutionCandidate@2228 }
-    <name not found> = ArrayList@9965[1] { ResolutionCandidate@3347 }
-    <name not found> = ArrayList@9966[1] { ResolutionCandidate@2423 }
-    <name not found> = ArrayList@9967[1] { ResolutionCandidate@1484 }
-    <name not found> = ArrayList@9968[1] { ResolutionCandidate@6260 }
-    <name not found> = ArrayList@9969[1] { ResolutionCandidate@6860 }
-    <name not found> = ArrayList@9970[1] { ResolutionCandidate@4364 }
-    <name not found> = ArrayList@9971[1] { ResolutionCandidate@4538 }
-    <name not found> = ArrayList@9972[1] { ResolutionCandidate@4058 }
-    <name not found> = ArrayList@9973[1] { ResolutionCandidate@1511 }
-    <name not found> = ArrayList@9974[1] { ResolutionCandidate@7412 }
-    <name not found> = ArrayList@9975[1] { ResolutionCandidate@5927 }
-    <name not found> = ArrayList@9976[1] { ResolutionCandidate@2951 }
-    <name not found> = ArrayList@9977[1] { ResolutionCandidate@3560 }
-    <name not found> = ArrayList@9978[1] { ResolutionCandidate@4487 }
-    <name not found> = ArrayList@9979[1] { ResolutionCandidate@1265 }
-    <name not found> = ArrayList@9980[1] { ResolutionCandidate@4715 }
-    <name not found> = ArrayList@9981[1] { ResolutionCandidate@7598 }
-    <name not found> = ArrayList@9982[1] { ResolutionCandidate@1913 }
-    <name not found> = ArrayList@9983[1] { ResolutionCandidate@3995 }
-    <name not found> = ArrayList@9984[1] { ResolutionCandidate@1796 }
-    <name not found> = ArrayList@9985[1] { ResolutionCandidate@416 }
-    <name not found> = ArrayList@9986[1] { ResolutionCandidate@6341 }
-    <name not found> = ArrayList@9987[1] { ResolutionCandidate@5093 }
-    <name not found> = ArrayList@9988[1] { ResolutionCandidate@3731 }
-    <name not found> = ArrayList@9989[1] { ResolutionCandidate@2120 }
-    <name not found> = ArrayList@9990[1] { ResolutionCandidate@2804 }
-    <name not found> = ArrayList@9991[1] { ResolutionCandidate@659 }
-    <name not found> = ArrayList@9992[1] { ResolutionCandidate@7010 }
-    <name not found> = ArrayList@9993[1] { ResolutionCandidate@4868 }
-    <name not found> = ArrayList@9994[1] { ResolutionCandidate@4193 }
-    <name not found> = ArrayList@9995[1] { ResolutionCandidate@4292 }
-    <name not found> = ArrayList@9996[1] { ResolutionCandidate@4007 }
-    <name not found> = ArrayList@9997[1] { ResolutionCandidate@386 }
-    <name not found> = ArrayList@9998[1] { ResolutionCandidate@6236 }
-    <name not found> = ArrayList@9999[1] { ResolutionCandidate@4943 }
-    <name not found> = ArrayList@10000[1] { ResolutionCandidate@4385 }
-    <name not found> = ArrayList@10001[1] { ResolutionCandidate@2600 }
-    <name not found> = ArrayList@10002[1] { ResolutionCandidate@4160 }
-    <name not found> = ArrayList@10003[1] { ResolutionCandidate@533 }
-    <name not found> = ArrayList@10004[1] { ResolutionCandidate@5360 }
-    <name not found> = ArrayList@10005[1] { ResolutionCandidate@6968 }
-    <name not found> = ArrayList@10006[1] { ResolutionCandidate@2774 }
-    <name not found> = ArrayList@10007[1] { ResolutionCandidate@1769 }
-    <name not found> = ArrayList@10008[1] { ResolutionCandidate@3083 }
-    <name not found> = ArrayList@10009[1] { ResolutionCandidate@1010 }
-    <name not found> = ArrayList@10010[1] { ResolutionCandidate@6410 }
-    <name not found> = ArrayList@10011[1] { ResolutionCandidate@4970 }
-    <name not found> = ArrayList@10012[1] { ResolutionCandidate@2333 }
-    <name not found> = ArrayList@10013[1] { ResolutionCandidate@3494 }
-    <name not found> = ArrayList@10014[1] { ResolutionCandidate@2783 }
-    <name not found> = ArrayList@10015[1] { ResolutionCandidate@1124 }
-    <name not found> = ArrayList@10016[1] { ResolutionCandidate@4934 }
-    <name not found> = ArrayList@10017[1] { ResolutionCandidate@5765 }
-    <name not found> = ArrayList@10018[1] { ResolutionCandidate@1775 }
-    <name not found> = ArrayList@10019[1] { ResolutionCandidate@2513 }
-    <name not found> = ArrayList@10020[1] { ResolutionCandidate@3224 }
-    <name not found> = ArrayList@10021[1] { ResolutionCandidate@1508 }
-    <name not found> = ArrayList@10022[1] { ResolutionCandidate@4694 }
-    <name not found> = ArrayList@10023[1] { ResolutionCandidate@6941 }
-    <name not found> = ArrayList@10024[1] { ResolutionCandidate@3008 }
-    <name not found> = ArrayList@10025[1] { ResolutionCandidate@2426 }
-    <name not found> = ArrayList@10026[1] { ResolutionCandidate@1847 }
-    <name not found> = ArrayList@10027[1] { ResolutionCandidate@557 }
-    <name not found> = ArrayList@10028[1] { ResolutionCandidate@5270 }
-    <name not found> = ArrayList@10029[1] { ResolutionCandidate@6851 }
-    <name not found> = ArrayList@10030[1] { ResolutionCandidate@2495 }
-    <name not found> = ArrayList@10031[1] { ResolutionCandidate@1634 }
-    <name not found> = ArrayList@10032[1] { ResolutionCandidate@4262 }
-    <name not found> = ArrayList@10033[1] { ResolutionCandidate@680 }
-    <name not found> = ArrayList@10034[1] { ResolutionCandidate@5834 }
-    <name not found> = ArrayList@10035[1] { ResolutionCandidate@7433 }
-    <name not found> = ArrayList@10036[1] { ResolutionCandidate@3950 }
-    <name not found> = ArrayList@10037[1] { ResolutionCandidate@1832 }
-    <name not found> = ArrayList@10038[1] { ResolutionCandidate@2801 }
-    <name not found> = ArrayList@10039[1] { ResolutionCandidate@485 }
-    <name not found> = ArrayList@10040[1] { ResolutionCandidate@5897 }
-    <name not found> = ArrayList@10041[1] { ResolutionCandidate@5057 }
-    <name not found> = ArrayList@10042[1] { ResolutionCandidate@3233 }
-    <name not found> = ArrayList@10043[1] { ResolutionCandidate@2387 }
-    <name not found> = ArrayList@10044[1] { ResolutionCandidate@2474 }
-    <name not found> = ArrayList@10045[1] { ResolutionCandidate@1004 }
-    <name not found> = ArrayList@10046[1] { ResolutionCandidate@5252 }
-    <name not found> = ArrayList@10047[1] { ResolutionCandidate@6485 }
-    <name not found> = ArrayList@10048[1] { ResolutionCandidate@3875 }
-    <name not found> = ArrayList@10049[1] { ResolutionCandidate@2210 }
-    <name not found> = ArrayList@10050[1] { ResolutionCandidate@3242 }
-    <name not found> = ArrayList@10051[1] { ResolutionCandidate@398 }
-    <name not found> = ArrayList@10052[1] { ResolutionCandidate@6356 }
-    <name not found> = ArrayList@10053[1] { ResolutionCandidate@6185 }
-    <name not found> = ArrayList@10054[1] { ResolutionCandidate@4466 }
-    <name not found> = ArrayList@10055[1] { ResolutionCandidate@3635 }
-    <name not found> = ArrayList@10056[1] { ResolutionCandidate@1871 }
-    <name not found> = ArrayList@10057[1] { ResolutionCandidate@935 }
-    <name not found> = ArrayList@10058[1] { ResolutionCandidate@5729 }
-    <name not found> = ArrayList@10059[1] { ResolutionCandidate@5354 }
-    <name not found> = ArrayList@10060[1] { ResolutionCandidate@4295 }
-    <name not found> = ArrayList@10061[1] { ResolutionCandidate@2213 }
-    <name not found> = ArrayList@10062[1] { ResolutionCandidate@3455 }
-    <name not found> = ArrayList@10063[1] { ResolutionCandidate@857 }
-    <name not found> = ArrayList@10064[1] { ResolutionCandidate@5942 }
-    <name not found> = ArrayList@10065[1] { ResolutionCandidate@6782 }
-    <name not found> = ArrayList@10066[1] { ResolutionCandidate@2921 }
-    <name not found> = ArrayList@10067[1] { ResolutionCandidate@3308 }
-    <name not found> = ArrayList@10068[1] { ResolutionCandidate@3188 }
-    <name not found> = ArrayList@10069[1] { ResolutionCandidate@1496 }
-    <name not found> = ArrayList@10070[1] { ResolutionCandidate@5798 }
-    <name not found> = ArrayList@10071[1] { ResolutionCandidate@7709 }
-    <name not found> = ArrayList@10072[1] { ResolutionCandidate@3365 }
-    <name not found> = ArrayList@10073[1] { ResolutionCandidate@2552 }
-    <name not found> = ArrayList@10074[1] { ResolutionCandidate@3215 }
-    <name not found> = ArrayList@10075[1] { ResolutionCandidate@1217 }
-    <name not found> = ArrayList@10076[1] { ResolutionCandidate@6188 }
-    <name not found> = ArrayList@10077[1] { ResolutionCandidate@6503 }
-    <name not found> = ArrayList@10078[1] { ResolutionCandidate@2366 }
-    <name not found> = ArrayList@10079[1] { ResolutionCandidate@3971 }
-    <name not found> = ArrayList@10080[1] { ResolutionCandidate@3791 }
-    <name not found> = ArrayList@10081[1] { ResolutionCandidate@821 }
-    <name not found> = ArrayList@10082[1] { ResolutionCandidate@4586 }
-    <name not found> = ArrayList@10083[1] { ResolutionCandidate@6023 }
-    <name not found> = ArrayList@10084[1] { ResolutionCandidate@1808 }
-    <name not found> = ArrayList@10085[1] { ResolutionCandidate@2078 }
-    <name not found> = ArrayList@10086[1] { ResolutionCandidate@2642 }
-    <name not found> = ArrayList@10087[1] { ResolutionCandidate@776 }
-    <name not found> = ArrayList@10088[1] { ResolutionCandidate@6752 }
-    <name not found> = ArrayList@10089[1] { ResolutionCandidate@6332 }
-    <name not found> = ArrayList@10090[1] { ResolutionCandidate@4436 }
-    <name not found> = ArrayList@10091[1] { ResolutionCandidate@2936 }
-    <name not found> = ArrayList@10092[1] { ResolutionCandidate@3758 }
-    <name not found> = ArrayList@10093[1] { ResolutionCandidate@1205 }
-    <name not found> = ArrayList@10094[1] { ResolutionCandidate@4583 }
-    <name not found> = ArrayList@10095[1] { ResolutionCandidate@6575 }
-    <name not found> = ArrayList@10096[1] { ResolutionCandidate@1742 }
-    <name not found> = ArrayList@10097[1] { ResolutionCandidate@4328 }
-    <name not found> = ArrayList@10098[1] { ResolutionCandidate@3662 }
-    <name not found> = ArrayList@10099[1] { ResolutionCandidate@947 }
-    <name not found> = ArrayList@10100[1] { ResolutionCandidate@5480 }
-    <name not found> = ArrayList@10101[1] { ResolutionCandidate@4925 }
-    <name not found> = ArrayList@10102[1] { ResolutionCandidate@1850 }
-    <name not found> = ArrayList@10103[1] { ResolutionCandidate@2285 }
-    <name not found> = ArrayList@10104[1] { ResolutionCandidate@1865 }
-    <name not found> = ArrayList@10105[1] { ResolutionCandidate@1055 }
-    <name not found> = ArrayList@10106[1] { ResolutionCandidate@5849 }
-    <name not found> = ArrayList@10107[1] { ResolutionCandidate@5885 }
-    <name not found> = ArrayList@10108[1] { ResolutionCandidate@2192 }
-    <name not found> = ArrayList@10109[1] { ResolutionCandidate@3572 }
-    <name not found> = ArrayList@10110[1] { ResolutionCandidate@3860 }
-    <name not found> = ArrayList@10111[1] { ResolutionCandidate@608 }
-    <name not found> = ArrayList@10112[1] { ResolutionCandidate@6734 }
-    <name not found> = ArrayList@10113[1] { ResolutionCandidate@5174 }
-    <name not found> = ArrayList@10114[1] { ResolutionCandidate@3485 }
-    <name not found> = ArrayList@10115[1] { ResolutionCandidate@2390 }
-    <name not found> = ArrayList@10116[1] { ResolutionCandidate@3431 }
-    <name not found> = ArrayList@10117[1] { ResolutionCandidate@1115 }
-    <name not found> = ArrayList@10118[1] { ResolutionCandidate@5909 }
-    <name not found> = ArrayList@10119[1] { ResolutionCandidate@5930 }
-    <name not found> = ArrayList@10120[1] { ResolutionCandidate@2150 }
-    <name not found> = ArrayList@10121[1] { ResolutionCandidate@2879 }
-    <name not found> = ArrayList@10122[1] { ResolutionCandidate@3851 }
-    <name not found> = ArrayList@10123[1] { ResolutionCandidate@704 }
-    <name not found> = ArrayList@10124[1] { ResolutionCandidate@6980 }
-    <name not found> = ArrayList@10125[1] { ResolutionCandidate@7436 }
-    <name not found> = ArrayList@10126[1] { ResolutionCandidate@2282 }
-    <name not found> = ArrayList@10127[1] { ResolutionCandidate@3056 }
-    <name not found> = ArrayList@10128[1] { ResolutionCandidate@2234 }
-    <name not found> = ArrayList@10129[1] { ResolutionCandidate@482 }
-    <name not found> = ArrayList@10130[1] { ResolutionCandidate@5024 }
-    <name not found> = ArrayList@10131[1] { ResolutionCandidate@7511 }
-    <name not found> = ArrayList@10132[1] { ResolutionCandidate@4457 }
-    <name not found> = ArrayList@10133[1] { ResolutionCandidate@3155 }
-    <name not found> = ArrayList@10134[1] { ResolutionCandidate@1967 }
-    <name not found> = ArrayList@10135[1] { ResolutionCandidate@869 }
-    <name not found> = ArrayList@10136[1] { ResolutionCandidate@7706 }
-    <name not found> = ArrayList@10137[1] { ResolutionCandidate@6212 }
-    <name not found> = ArrayList@10138[1] { ResolutionCandidate@3638 }
-    <name not found> = ArrayList@10139[1] { ResolutionCandidate@3863 }
-    <name not found> = ArrayList@10140[1] { ResolutionCandidate@1607 }
-    <name not found> = ArrayList@10141[1] { ResolutionCandidate@701 }
-    <name not found> = ArrayList@10142[1] { ResolutionCandidate@7475 }
-    <name not found> = ArrayList@10143[1] { ResolutionCandidate@6551 }
-    <name not found> = ArrayList@10144[1] { ResolutionCandidate@4151 }
-    <name not found> = ArrayList@10145[1] { ResolutionCandidate@3764 }
-    <name not found> = ArrayList@10146[1] { ResolutionCandidate@1784 }
-    <name not found> = ArrayList@10147[1] { ResolutionCandidate@392 }
-    <name not found> = ArrayList@10148[1] { ResolutionCandidate@7478 }
-    <name not found> = ArrayList@10149[1] { ResolutionCandidate@5042 }
-    <name not found> = ArrayList@10150[1] { ResolutionCandidate@1799 }
-    <name not found> = ArrayList@10151[1] { ResolutionCandidate@2693 }
-    <name not found> = ArrayList@10152[1] { ResolutionCandidate@3230 }
-    <name not found> = ArrayList@10153[1] { ResolutionCandidate@581 }
-    <name not found> = ArrayList@10154[1] { ResolutionCandidate@6458 }
-    <name not found> = ArrayList@10155[1] { ResolutionCandidate@6218 }
-    <name not found> = ArrayList@10156[1] { ResolutionCandidate@2897 }
-    <name not found> = ArrayList@10157[1] { ResolutionCandidate@3728 }
-    <name not found> = ArrayList@10158[1] { ResolutionCandidate@4091 }
-    <name not found> = ArrayList@10159[1] { ResolutionCandidate@1070 }
-    <name not found> = ArrayList@10160[1] { ResolutionCandidate@4619 }
-    <name not found> = ArrayList@10161[1] { ResolutionCandidate@7703 }
-    <name not found> = ArrayList@10162[1] { ResolutionCandidate@2840 }
-    <name not found> = ArrayList@10163[1] { ResolutionCandidate@3236 }
-    <name not found> = ArrayList@10164[1] { ResolutionCandidate@2054 }
-    <name not found> = ArrayList@10165[1] { ResolutionCandidate@437 }
-    <name not found> = ArrayList@10166[1] { ResolutionCandidate@6278 }
-    <name not found> = ArrayList@10167[1] { ResolutionCandidate@7637 }
-    <name not found> = ArrayList@10168[1] { ResolutionCandidate@2654 }
-    <name not found> = ArrayList@10169[1] { ResolutionCandidate@2711 }
-    <name not found> = ArrayList@10170[1] { ResolutionCandidate@3782 }
-    <name not found> = ArrayList@10171[1] { ResolutionCandidate@860 }
-    <name not found> = ArrayList@10172[1] { ResolutionCandidate@4649 }
-    <name not found> = ArrayList@10173[1] { ResolutionCandidate@5474 }
-    <name not found> = ArrayList@10174[1] { ResolutionCandidate@3698 }
-    <name not found> = ArrayList@10175[1] { ResolutionCandidate@4139 }
-    <name not found> = ArrayList@10176[1] { ResolutionCandidate@3269 }
-    <name not found> = ArrayList@10177[1] { ResolutionCandidate@1502 }
-    <name not found> = ArrayList@10178[1] { ResolutionCandidate@5840 }
-    <name not found> = ArrayList@10179[1] { ResolutionCandidate@6620 }
-    <name not found> = ArrayList@10180[1] { ResolutionCandidate@1919 }
-    <name not found> = ArrayList@10181[1] { ResolutionCandidate@2957 }
-    <name not found> = ArrayList@10182[1] { ResolutionCandidate@1979 }
-    <name not found> = ArrayList@10183[1] { ResolutionCandidate@989 }
-    <name not found> = ArrayList@10184[1] { ResolutionCandidate@7274 }
-    <name not found> = ArrayList@10185[1] { ResolutionCandidate@5357 }
-    <name not found> = ArrayList@10186[1] { ResolutionCandidate@2948 }
-    <name not found> = ArrayList@10187[1] { ResolutionCandidate@2537 }
-    <name not found> = ArrayList@10188[1] { ResolutionCandidate@2954 }
-    <name not found> = ArrayList@10189[1] { ResolutionCandidate@1064 }
-    <name not found> = ArrayList@10190[1] { ResolutionCandidate@5063 }
-    <name not found> = ArrayList@10191[1] { ResolutionCandidate@6008 }
-    <name not found> = ArrayList@10192[1] { ResolutionCandidate@3902 }
-    <name not found> = ArrayList@10193[1] { ResolutionCandidate@2477 }
-    <name not found> = ArrayList@10194[1] { ResolutionCandidate@3953 }
-    <name not found> = ArrayList@10195[1] { ResolutionCandidate@524 }
-    <name not found> = ArrayList@10196[1] { ResolutionCandidate@6617 }
-    <name not found> = ArrayList@10197[1] { ResolutionCandidate@7193 }
-    <name not found> = ArrayList@10198[1] { ResolutionCandidate@5990 }
-    <name not found> = ArrayList@10199[1] { ResolutionCandidate@2651 }
-    <name not found> = ArrayList@10200[1] { ResolutionCandidate@3251 }
-    <name not found> = ArrayList@10201[1] { ResolutionCandidate@3587 }
-    <name not found> = ArrayList@10202[1] { ResolutionCandidate@467 }
-    <name not found> = ArrayList@10203[1] { ResolutionCandidate@7085 }
-    <name not found> = ArrayList@10204[1] { ResolutionCandidate@5195 }
-    <name not found> = ArrayList@10205[1] { ResolutionCandidate@3476 }
-    <name not found> = ArrayList@10206[1] { ResolutionCandidate@3797 }
-    <name not found> = ArrayList@10207[1] { ResolutionCandidate@2609 }
-    <name not found> = ArrayList@10208[1] { ResolutionCandidate@965 }
-    <name not found> = ArrayList@10209[1] { ResolutionCandidate@5297 }
-    <name not found> = ArrayList@10210[1] { ResolutionCandidate@5900 }
-    <name not found> = ArrayList@10211[1] { ResolutionCandidate@3686 }
-    <name not found> = ArrayList@10212[1] { ResolutionCandidate@2999 }
-    <name not found> = ArrayList@10213[1] { ResolutionCandidate@2453 }
-    <name not found> = ArrayList@10214[1] { ResolutionCandidate@824 }
-    <name not found> = ArrayList@10215[1] { ResolutionCandidate@7031 }
-    <name not found> = ArrayList@10216[1] { ResolutionCandidate@6668 }
-    <name not found> = ArrayList@10217[1] { ResolutionCandidate@3629 }
-    <name not found> = ArrayList@10218[1] { ResolutionCandidate@4145 }
-    <name not found> = ArrayList@10219[1] { ResolutionCandidate@3989 }
-    <name not found> = ArrayList@10220[1] { ResolutionCandidate@1199 }
-    <name not found> = ArrayList@10221[1] { ResolutionCandidate@6857 }
-    <name not found> = ArrayList@10222[1] { ResolutionCandidate@7313 }
-    <name not found> = ArrayList@10223[1] { ResolutionCandidate@3305 }
-    <name not found> = ArrayList@10224[1] { ResolutionCandidate@4067 }
-    <name not found> = ArrayList@10225[1] { ResolutionCandidate@3158 }
-    <name not found> = ArrayList@10226[1] { ResolutionCandidate@356 }
-    <name not found> = ArrayList@10227[1] { ResolutionCandidate@6377 }
-    <name not found> = ArrayList@10228[1] { ResolutionCandidate@5492 }
-    <name not found> = ArrayList@10229[1] { ResolutionCandidate@2198 }
-    <name not found> = ArrayList@10230[1] { ResolutionCandidate@3206 }
-    <name not found> = ArrayList@10231[1] { ResolutionCandidate@1877 }
-    <name not found> = ArrayList@10232[1] { ResolutionCandidate@1034 }
-    <name not found> = ArrayList@10233[1] { ResolutionCandidate@5636 }
-    <name not found> = ArrayList@10234[1] { ResolutionCandidate@7712 }
-    <name not found> = ArrayList@10235[1] { ResolutionCandidate@4526 }
-    <name not found> = ArrayList@10236[1] { ResolutionCandidate@2507 }
-    <name not found> = ArrayList@10237[1] { ResolutionCandidate@2891 }
-    <name not found> = ArrayList@10238[1] { ResolutionCandidate@431 }
-    <name not found> = ArrayList@10239[1] { ResolutionCandidate@7595 }
-    <name not found> = ArrayList@10240[1] { ResolutionCandidate@7643 }
-    <name not found> = ArrayList@10241[1] { ResolutionCandidate@3077 }
-    <name not found> = ArrayList@10242[1] { ResolutionCandidate@3092 }
-    <name not found> = ArrayList@10243[1] { ResolutionCandidate@1625 }
-    <name not found> = ArrayList@10244[1] { ResolutionCandidate@812 }
-    <name not found> = ArrayList@10245[1] { ResolutionCandidate@6074 }
-    <name not found> = ArrayList@10246[1] { ResolutionCandidate@7493 }
-    <name not found> = ArrayList@10247[1] { ResolutionCandidate@2036 }
-    <name not found> = ArrayList@10248[1] { ResolutionCandidate@3893 }
-    <name not found> = ArrayList@10249[1] { ResolutionCandidate@3500 }
-    <name not found> = ArrayList@10250[1] { ResolutionCandidate@914 }
-    <name not found> = ArrayList@10251[1] { ResolutionCandidate@5417 }
-    <name not found> = ArrayList@10252[1] { ResolutionCandidate@6137 }
-    <name not found> = ArrayList@10253[1] { ResolutionCandidate@3680 }
-    <name not found> = ArrayList@10254[1] { ResolutionCandidate@3173 }
-    <name not found> = ArrayList@10255[1] { ResolutionCandidate@4169 }
-    <name not found> = ArrayList@10256[1] { ResolutionCandidate@1181 }
-    <name not found> = ArrayList@10257[1] { ResolutionCandidate@7370 }
-    <name not found> = ArrayList@10258[1] { ResolutionCandidate@6992 }
-    <name not found> = ArrayList@10259[1] { ResolutionCandidate@2267 }
-    <name not found> = ArrayList@10260[1] { ResolutionCandidate@3044 }
-    <name not found> = ArrayList@10261[1] { ResolutionCandidate@4454 }
-    <name not found> = ArrayList@10262[1] { ResolutionCandidate@1049 }
-    <name not found> = ArrayList@10263[1] { ResolutionCandidate@5126 }
-    <name not found> = ArrayList@10264[1] { ResolutionCandidate@4577 }
-    <name not found> = ArrayList@10265[1] { ResolutionCandidate@2135 }
-    <name not found> = ArrayList@10266[1] { ResolutionCandidate@3377 }
-    <name not found> = ArrayList@10267[1] { ResolutionCandidate@3032 }
-    <name not found> = ArrayList@10268[1] { ResolutionCandidate@755 }
-    <name not found> = ArrayList@10269[1] { ResolutionCandidate@5468 }
-    <name not found> = ArrayList@10270[1] { ResolutionCandidate@5066 }
-    <name not found> = ArrayList@10271[1] { ResolutionCandidate@3815 }
-    <name not found> = ArrayList@10272[1] { ResolutionCandidate@3833 }
-    <name not found> = ArrayList@10273[1] { ResolutionCandidate@4133 }
-    <name not found> = ArrayList@10274[1] { ResolutionCandidate@953 }
-    <name not found> = ArrayList@10275[1] { ResolutionCandidate@5150 }
-    <name not found> = ArrayList@10276[1] { ResolutionCandidate@7316 }
-    <name not found> = ArrayList@10277[1] { ResolutionCandidate@1661 }
-    <name not found> = ArrayList@10278[1] { ResolutionCandidate@2798 }
-    <name not found> = ArrayList@10279[1] { ResolutionCandidate@1973 }
-    <name not found> = ArrayList@10280[1] { ResolutionCandidate@731 }
-    <name not found> = ArrayList@10281[1] { ResolutionCandidate@5456 }
-    <name not found> = ArrayList@10282[1] { ResolutionCandidate@7601 }
-    <name not found> = ArrayList@10283[1] { ResolutionCandidate@3332 }
-    <name not found> = ArrayList@10284[1] { ResolutionCandidate@2705 }
-    <name not found> = ArrayList@10285[1] { ResolutionCandidate@2045 }
-    <name not found> = ArrayList@10286[1] { ResolutionCandidate@542 }
-    <name not found> = ArrayList@10287[1] { ResolutionCandidate@5105 }
-    <name not found> = ArrayList@10288[1] { ResolutionCandidate@6869 }
-    <name not found> = ArrayList@10289[1] { ResolutionCandidate@2555 }
-    <name not found> = ArrayList@10290[1] { ResolutionCandidate@3113 }
-    <name not found> = ArrayList@10291[1] { ResolutionCandidate@1658 }
-    <name not found> = ArrayList@10292[1] { ResolutionCandidate@806 }
-    <name not found> = ArrayList@10293[1] { ResolutionCandidate@6560 }
-    <name not found> = ArrayList@10294[1] { ResolutionCandidate@5630 }
-    <name not found> = ArrayList@10295[1] { ResolutionCandidate@3749 }
-    <name not found> = ArrayList@10296[1] { ResolutionCandidate@4448 }
-    <name not found> = ArrayList@10297[1] { ResolutionCandidate@2978 }
-    <name not found> = ArrayList@10298[1] { ResolutionCandidate@974 }
-    <name not found> = ArrayList@10299[1] { ResolutionCandidate@6596 }
-    <name not found> = ArrayList@10300[1] { ResolutionCandidate@7229 }
-    <name not found> = ArrayList@10301[1] { ResolutionCandidate@3002 }
-    <name not found> = ArrayList@10302[1] { ResolutionCandidate@2276 }
-    <name not found> = ArrayList@10303[1] { ResolutionCandidate@2510 }
-    <name not found> = ArrayList@10304[1] { ResolutionCandidate@1538 }
-    <name not found> = ArrayList@10305[1] { ResolutionCandidate@7502 }
-    <name not found> = ArrayList@10306[1] { ResolutionCandidate@6044 }
-    <name not found> = ArrayList@10307[1] { ResolutionCandidate@3602 }
-    <name not found> = ArrayList@10308[1] { ResolutionCandidate@4514 }
-    <name not found> = ArrayList@10309[1] { ResolutionCandidate@4115 }
-    <name not found> = ArrayList@10310[1] { ResolutionCandidate@1430 }
-    <name not found> = ArrayList@10311[1] { ResolutionCandidate@6785 }
-    <name not found> = ArrayList@10312[1] { ResolutionCandidate@6800 }
-    <name not found> = ArrayList@10313[1] { ResolutionCandidate@3290 }
-    <name not found> = ArrayList@10314[1] { ResolutionCandidate@3101 }
-    <name not found> = ArrayList@10315[1] { ResolutionCandidate@1619 }
-    <name not found> = ArrayList@10316[1] { ResolutionCandidate@926 }
-    <name not found> = ArrayList@10317[1] { ResolutionCandidate@5591 }
-    <name not found> = ArrayList@10318[1] { ResolutionCandidate@6845 }
-    <name not found> = ArrayList@10319[1] { ResolutionCandidate@3368 }
-    <name not found> = ArrayList@10320[1] { ResolutionCandidate@1670 }
-    <name not found> = ArrayList@10321[1] { ResolutionCandidate@4010 }
-    <name not found> = ArrayList@10322[1] { ResolutionCandidate@917 }
-    <name not found> = ArrayList@10323[1] { ResolutionCandidate@7265 }
-    <name not found> = ArrayList@10324[1] { ResolutionCandidate@5732 }
-    <name not found> = ArrayList@10325[1] { ResolutionCandidate@3710 }
-    <name not found> = ArrayList@10326[1] { ResolutionCandidate@2072 }
-    <name not found> = ArrayList@10327[1] { ResolutionCandidate@3326 }
-    <name not found> = ArrayList@10328[1] { ResolutionCandidate@410 }
-    <name not found> = ArrayList@10329[1] { ResolutionCandidate@7190 }
-    <name not found> = ArrayList@10330[1] { ResolutionCandidate@5918 }
-    <name not found> = ArrayList@10331[1] { ResolutionCandidate@2270 }
-    <name not found> = ArrayList@10332[1] { ResolutionCandidate@2834 }
-    <name not found> = ArrayList@10333[1] { ResolutionCandidate@4187 }
-    <name not found> = ArrayList@10334[1] { ResolutionCandidate@1001 }
-    <name not found> = ArrayList@10335[1] { ResolutionCandidate@6656 }
-    <name not found> = ArrayList@10336[1] { ResolutionCandidate@6623 }
-    <name not found> = ArrayList@10337[1] { ResolutionCandidate@2273 }
-    <name not found> = ArrayList@10338[1] { ResolutionCandidate@2429 }
-    <name not found> = ArrayList@10339[1] { ResolutionCandidate@4394 }
-    <name not found> = ArrayList@10340[1] { ResolutionCandidate@836 }
-    <name not found> = ArrayList@10341[1] { ResolutionCandidate@5936 }
-    <name not found> = ArrayList@10342[1] { ResolutionCandidate@7295 }
-    <name not found> = ArrayList@10343[1] { ResolutionCandidate@2759 }
-    <name not found> = ArrayList@10344[1] { ResolutionCandidate@3566 }
-    <name not found> = ArrayList@10345[1] { ResolutionCandidate@3941 }
-    <name not found> = ArrayList@10346[1] { ResolutionCandidate@809 }
-    <name not found> = ArrayList@10347[1] { ResolutionCandidate@7166 }
-    <name not found> = ArrayList@10348[1] { ResolutionCandidate@4796 }
-    <name not found> = ArrayList@10349[1] { ResolutionCandidate@4529 }
-    <name not found> = ArrayList@10350[1] { ResolutionCandidate@2168 }
-    <name not found> = ArrayList@10351[1] { ResolutionCandidate@1703 }
-    <name not found> = ArrayList@10352[1] { ResolutionCandidate@899 }
-    <name not found> = ArrayList@10353[1] { ResolutionCandidate@7727 }
-    <name not found> = ArrayList@10354[1] { ResolutionCandidate@7673 }
-    <name not found> = ArrayList@10355[1] { ResolutionCandidate@2732 }
-    <name not found> = ArrayList@10356[1] { ResolutionCandidate@3047 }
-    <name not found> = ArrayList@10357[1] { ResolutionCandidate@4340 }
-    <name not found> = ArrayList@10358[1] { ResolutionCandidate@404 }
-    <name not found> = ArrayList@10359[1] { ResolutionCandidate@7208 }
-    <name not found> = ArrayList@10360[1] { ResolutionCandidate@7538 }
-    <name not found> = ArrayList@10361[1] { ResolutionCandidate@3827 }
-    <name not found> = ArrayList@10362[1] { ResolutionCandidate@1889 }
-    <name not found> = ArrayList@10363[1] { ResolutionCandidate@1928 }
-    <name not found> = ArrayList@10364[1] { ResolutionCandidate@1256 }
-    <name not found> = ArrayList@10365[1] { ResolutionCandidate@6965 }
-    <name not found> = ArrayList@10366[1] { ResolutionCandidate@7148 }
-    <name not found> = ArrayList@10367[1] { ResolutionCandidate@2351 }
-    <name not found> = ArrayList@10368[1] { ResolutionCandidate@1655 }
-    <name not found> = ArrayList@10369[1] { ResolutionCandidate@2303 }
-    <name not found> = ArrayList@10370[1] { ResolutionCandidate@1280 }
-    <name not found> = ArrayList@10371[1] { ResolutionCandidate@5231 }
-    <name not found> = ArrayList@10372[1] { ResolutionCandidate@7388 }
-    <name not found> = ArrayList@10373[1] { ResolutionCandidate@4196 }
-    <name not found> = ArrayList@10374[1] { ResolutionCandidate@3467 }
-    <name not found> = ArrayList@10375[1] { ResolutionCandidate@3770 }
-    <name not found> = ArrayList@10376[1] { ResolutionCandidate@1052 }
-    <name not found> = ArrayList@10377[1] { ResolutionCandidate@5663 }
-    <name not found> = ArrayList@10378[1] { ResolutionCandidate@6083 }
-    <name not found> = ArrayList@10379[1] { ResolutionCandidate@2111 }
-    <name not found> = ArrayList@10380[1] { ResolutionCandidate@2249 }
-    <name not found> = ArrayList@10381[1] { ResolutionCandidate@3704 }
-    <name not found> = ArrayList@10382[1] { ResolutionCandidate@671 }
-    <name not found> = ArrayList@10383[1] { ResolutionCandidate@6749 }
-    <name not found> = ArrayList@10384[1] { ResolutionCandidate@7163 }
-    <name not found> = ArrayList@10385[1] { ResolutionCandidate@4445 }
-    <name not found> = ArrayList@10386[1] { ResolutionCandidate@2279 }
-    <name not found> = ArrayList@10387[1] { ResolutionCandidate@2984 }
-    <name not found> = ArrayList@10388[1] { ResolutionCandidate@887 }
-    <name not found> = ArrayList@10389[1] { ResolutionCandidate@7187 }
-    <name not found> = ArrayList@10390[1] { ResolutionCandidate@7376 }
-    <name not found> = ArrayList@10391[1] { ResolutionCandidate@1715 }
-    <name not found> = ArrayList@10392[1] { ResolutionCandidate@3110 }
-    <name not found> = ArrayList@10393[1] { ResolutionCandidate@2156 }
-    <name not found> = ArrayList@10394[1] { ResolutionCandidate@1415 }
-    <name not found> = ArrayList@10395[1] { ResolutionCandidate@5471 }
-    <name not found> = ArrayList@10396[1] { ResolutionCandidate@4748 }
-    <name not found> = ArrayList@10397[1] { ResolutionCandidate@2723 }
-    <name not found> = ArrayList@10398[1] { ResolutionCandidate@2777 }
-    <name not found> = ArrayList@10399[1] { ResolutionCandidate@4493 }
-    <name not found> = ArrayList@10400[1] { ResolutionCandidate@995 }
-    <name not found> = ArrayList@10401[1] { ResolutionCandidate@7280 }
-    <name not found> = ArrayList@10402[1] { ResolutionCandidate@6014 }
-    <name not found> = ArrayList@10403[1] { ResolutionCandidate@1739 }
-    <name not found> = ArrayList@10404[1] { ResolutionCandidate@4157 }
-    <name not found> = ArrayList@10405[1] { ResolutionCandidate@4094 }
-    <name not found> = ArrayList@10406[1] { ResolutionCandidate@1031 }
-    <name not found> = ArrayList@10407[1] { ResolutionCandidate@5216 }
-    <name not found> = ArrayList@10408[1] { ResolutionCandidate@7442 }
-    <name not found> = ArrayList@10409[1] { ResolutionCandidate@1586 }
-    <name not found> = ArrayList@10410[1] { ResolutionCandidate@4352 }
-    <name not found> = ArrayList@10411[1] { ResolutionCandidate@2084 }
-    <name not found> = ArrayList@10412[1] { ResolutionCandidate@905 }
-    <name not found> = ArrayList@10413[1] { ResolutionCandidate@6461 }
-    <name not found> = ArrayList@10414[1] { ResolutionCandidate@5048 }
-    <name not found> = ArrayList@10415[1] { ResolutionCandidate@3164 }
-    <name not found> = ArrayList@10416[1] { ResolutionCandidate@1712 }
-    <name not found> = ArrayList@10417[1] { ResolutionCandidate@2822 }
-    <name not found> = ArrayList@10418[1] { ResolutionCandidate@845 }
-    <name not found> = ArrayList@10419[1] { ResolutionCandidate@7400 }
-    <name not found> = ArrayList@10420[1] { ResolutionCandidate@5723 }
-    <name not found> = ArrayList@10421[1] { ResolutionCandidate@4301 }
-    <name not found> = ArrayList@10422[1] { ResolutionCandidate@1952 }
-    <name not found> = ArrayList@10423[1] { ResolutionCandidate@3719 }
-    <name not found> = ArrayList@10424[1] { ResolutionCandidate@1091 }
-    <name not found> = ArrayList@10425[1] { ResolutionCandidate@7064 }
-    <name not found> = ArrayList@10426[1] { ResolutionCandidate@4679 }
-    <name not found> = ArrayList@10427[1] { ResolutionCandidate@1730 }
-    <name not found> = ArrayList@10428[1] { ResolutionCandidate@3986 }
-    <name not found> = ArrayList@10429[1] { ResolutionCandidate@1571 }
-    <name not found> = ArrayList@10430[1] { ResolutionCandidate@1478 }
-    <name not found> = ArrayList@10431[1] { ResolutionCandidate@5582 }
-    <name not found> = ArrayList@10432[1] { ResolutionCandidate@7577 }
-    <name not found> = ArrayList@10433[1] { ResolutionCandidate@1748 }
-    <name not found> = ArrayList@10434[1] { ResolutionCandidate@3932 }
-    <name not found> = ArrayList@10435[1] { ResolutionCandidate@2534 }
-    <name not found> = ArrayList@10436[1] { ResolutionCandidate@1367 }
-    <name not found> = ArrayList@10437[1] { ResolutionCandidate@6128 }
-    <name not found> = ArrayList@10438[1] { ResolutionCandidate@7298 }
-    <name not found> = ArrayList@10439[1] { ResolutionCandidate@1922 }
-    <name not found> = ArrayList@10440[1] { ResolutionCandidate@2357 }
-    <name not found> = ArrayList@10441[1] { ResolutionCandidate@3248 }
-    <name not found> = ArrayList@10442[1] { ResolutionCandidate@842 }
-    <name not found> = ArrayList@10443[1] { ResolutionCandidate@6134 }
-    <name not found> = ArrayList@10444[1] { ResolutionCandidate@7196 }
-    <name not found> = ArrayList@10445[1] { ResolutionCandidate@3239 }
-    <name not found> = ArrayList@10446[1] { ResolutionCandidate@2870 }
-    <name not found> = ArrayList@10447[1] { ResolutionCandidate@4319 }
-    <name not found> = ArrayList@10448[1] { ResolutionCandidate@503 }
-    <name not found> = ArrayList@10449[1] { ResolutionCandidate@7445 }
-    <name not found> = ArrayList@10450[1] { ResolutionCandidate@5300 }
-    <name not found> = ArrayList@10451[1] { ResolutionCandidate@6512 }
-    <name not found> = ArrayList@10452[1] { ResolutionCandidate@2483 }
-    <name not found> = ArrayList@10453[1] { ResolutionCandidate@3542 }
-    <name not found> = ArrayList@10454[1] { ResolutionCandidate@3575 }
-    <name not found> = ArrayList@10455[1] { ResolutionCandidate@488 }
-    <name not found> = ArrayList@10456[1] { ResolutionCandidate@4799 }
-    <name not found> = ArrayList@10457[1] { ResolutionCandidate@6794 }
-    <name not found> = ArrayList@10458[1] { ResolutionCandidate@2627 }
-    <name not found> = ArrayList@10459[1] { ResolutionCandidate@2657 }
-    <name not found> = ArrayList@10460[1] { ResolutionCandidate@2648 }
-    <name not found> = ArrayList@10461[1] { ResolutionCandidate@788 }
-    <name not found> = ArrayList@10462[1] { ResolutionCandidate@4952 }
-    <name not found> = ArrayList@10463[1] { ResolutionCandidate@7253 }
-    <name not found> = ArrayList@10464[1] { ResolutionCandidate@1811 }
-    <name not found> = ArrayList@10465[1] { ResolutionCandidate@4100 }
-    <name not found> = ArrayList@10466[1] { ResolutionCandidate@2465 }
-    <name not found> = ArrayList@10467[1] { ResolutionCandidate@1523 }
-    <name not found> = ArrayList@10468[1] { ResolutionCandidate@5657 }
-    <name not found> = ArrayList@10469[1] { ResolutionCandidate@4811 }
-    <name not found> = ArrayList@10470[1] { ResolutionCandidate@2876 }
-    <name not found> = ArrayList@10471[1] { ResolutionCandidate@2066 }
-    <name not found> = ArrayList@10472[1] { ResolutionCandidate@3806 }
-    <name not found> = ArrayList@10473[1] { ResolutionCandidate@944 }
-    <name not found> = ArrayList@10474[1] { ResolutionCandidate@5810 }
-    <name not found> = ArrayList@10475[1] { ResolutionCandidate@4772 }
-    <name not found> = ArrayList@10476[1] { ResolutionCandidate@4379 }
-    <name not found> = ArrayList@10477[1] { ResolutionCandidate@3335 }
-    <name not found> = ArrayList@10478[1] { ResolutionCandidate@4307 }
-    <name not found> = ArrayList@10479[1] { ResolutionCandidate@1364 }
-    <name not found> = ArrayList@10480[1] { ResolutionCandidate@4598 }
-    <name not found> = ArrayList@10481[1] { ResolutionCandidate@6875 }
-    <name not found> = ArrayList@10482[1] { ResolutionCandidate@2525 }
-    <name not found> = ArrayList@10483[1] { ResolutionCandidate@4241 }
-    <name not found> = ArrayList@10484[1] { ResolutionCandidate@1985 }
-    <name not found> = ArrayList@10485[1] { ResolutionCandidate@1112 }
-    <name not found> = ArrayList@10486[1] { ResolutionCandidate@5693 }
-    <name not found> = ArrayList@10487[1] { ResolutionCandidate@6233 }
-    <name not found> = ArrayList@10488[1] { ResolutionCandidate@3065 }
-    <name not found> = ArrayList@10489[1] { ResolutionCandidate@3503 }
-    <name not found> = ArrayList@10490[1] { ResolutionCandidate@2087 }
-    <name not found> = ArrayList@10491[1] { ResolutionCandidate@881 }
-    <name not found> = ArrayList@10492[1] { ResolutionCandidate@5666 }
-    <name not found> = ArrayList@10493[1] { ResolutionCandidate@4790 }
-    <name not found> = ArrayList@10494[1] { ResolutionCandidate@3887 }
-    <name not found> = ArrayList@10495[1] { ResolutionCandidate@1700 }
-    <name not found> = ArrayList@10496[1] { ResolutionCandidate@3938 }
-    <name not found> = ArrayList@10497[1] { ResolutionCandidate@1175 }
-    <name not found> = ArrayList@10498[1] { ResolutionCandidate@7571 }
-    <name not found> = ArrayList@10499[1] { ResolutionCandidate@6893 }
-    <name not found> = ArrayList@10500[1] { ResolutionCandidate@3890 }
-    <name not found> = ArrayList@10501[1] { ResolutionCandidate@2408 }
-    <name not found> = ArrayList@10502[1] { ResolutionCandidate@3689 }
-    <name not found> = ArrayList@10503[1] { ResolutionCandidate@695 }
-    <name not found> = ArrayList@10504[1] { ResolutionCandidate@4550 }
-    <name not found> = ArrayList@10505[1] { ResolutionCandidate@4655 }
-    <name not found> = ArrayList@10506[1] { ResolutionCandidate@2186 }
-    <name not found> = ArrayList@10507[1] { ResolutionCandidate@3203 }
-    <name not found> = ArrayList@10508[1] { ResolutionCandidate@4148 }
-    <name not found> = ArrayList@10509[1] { ResolutionCandidate@1553 }
-    <name not found> = ArrayList@10510[1] { ResolutionCandidate@5402 }
-    <name not found> = ArrayList@10511[1] { ResolutionCandidate@6161 }
-    <name not found> = ArrayList@10512[1] { ResolutionCandidate@2291 }
-    <name not found> = ArrayList@10513[1] { ResolutionCandidate@3422 }
-    <name not found> = ArrayList@10514[1] { ResolutionCandidate@4517 }
-    <name not found> = ArrayList@10515[1] { ResolutionCandidate@920 }
-    <name not found> = ArrayList@10516[1] { ResolutionCandidate@7139 }
-    <name not found> = ArrayList@10517[1] { ResolutionCandidate@4571 }
-    <name not found> = ArrayList@10518[1] { ResolutionCandidate@2471 }
-    <name not found> = ArrayList@10519[1] { ResolutionCandidate@3059 }
-    <name not found> = ArrayList@10520[1] { ResolutionCandidate@1931 }
-    <name not found> = ArrayList@10521[1] { ResolutionCandidate@1082 }
-    <name not found> = ArrayList@10522[1] { ResolutionCandidate@5645 }
-    <name not found> = ArrayList@10523[1] { ResolutionCandidate@6107 }
-    <name not found> = ArrayList@10524[1] { ResolutionCandidate@2924 }
-    <name not found> = ArrayList@10525[1] { ResolutionCandidate@4265 }
-    <name not found> = ArrayList@10526[1] { ResolutionCandidate@2702 }
-    <name not found> = ArrayList@10527[1] { ResolutionCandidate@521 }
-    <name not found> = ArrayList@10528[1] { ResolutionCandidate@6716 }
-    <name not found> = ArrayList@10529[1] { ResolutionCandidate@5258 }
-    <name not found> = ArrayList@10530[1] { ResolutionCandidate@3071 }
-    <name not found> = ArrayList@10531[1] { ResolutionCandidate@3707 }
-    <name not found> = ArrayList@10532[1] { ResolutionCandidate@2828 }
-    <name not found> = ArrayList@10533[1] { ResolutionCandidate@758 }
-    <name not found> = ArrayList@10534[1] { ResolutionCandidate@6173 }
-    <name not found> = ArrayList@10535[1] { ResolutionCandidate@5561 }
-    <name not found> = ArrayList@10536[1] { ResolutionCandidate@4184 }
-    <name not found> = ArrayList@10537[1] { ResolutionCandidate@3647 }
-    <name not found> = ArrayList@10538[1] { ResolutionCandidate@3209 }
-    <name not found> = ArrayList@10539[1] { ResolutionCandidate@473 }
-    <name not found> = ArrayList@10540[1] { ResolutionCandidate@4673 }
-    <name not found> = ArrayList@10541[1] { ResolutionCandidate@6080 }
-    <name not found> = ArrayList@10542[1] { ResolutionCandidate@2696 }
-    <name not found> = ArrayList@10543[1] { ResolutionCandidate@3746 }
-    <name not found> = ArrayList@10544[1] { ResolutionCandidate@2015 }
-    <name not found> = ArrayList@10545[1] { ResolutionCandidate@500 }
-    <name not found> = ArrayList@10546[1] { ResolutionCandidate@7688 }
-    <name not found> = ArrayList@10547[1] { ResolutionCandidate@6302 }
-    <name not found> = ArrayList@10548[1] { ResolutionCandidate@2306 }
-    <name not found> = ArrayList@10549[1] { ResolutionCandidate@3182 }
-    <name not found> = ArrayList@10550[1] { ResolutionCandidate@4001 }
-    <name not found> = ArrayList@10551[1] { ResolutionCandidate@1127 }
-    <name not found> = ArrayList@10552[1] { ResolutionCandidate@4718 }
-    <name not found> = ArrayList@10553[1] { ResolutionCandidate@6497 }
-    <name not found> = ArrayList@10554[1] { ResolutionCandidate@3146 }
-    <name not found> = ArrayList@10555[1] { ResolutionCandidate@3812 }
-    <name not found> = ArrayList@10556[1] { ResolutionCandidate@3299 }
-    <name not found> = ArrayList@10557[1] { ResolutionCandidate@422 }
-    <name not found> = ArrayList@10558[1] { ResolutionCandidate@6419 }
-    <name not found> = ArrayList@10559[1] { ResolutionCandidate@5294 }
-    <name not found> = ArrayList@10560[1] { ResolutionCandidate@1955 }
-    <name not found> = ArrayList@10561[1] { ResolutionCandidate@4397 }
-    <name not found> = ArrayList@10562[1] { ResolutionCandidate@3398 }
-    <name not found> = ArrayList@10563[1] { ResolutionCandidate@653 }
-    <name not found> = ArrayList@10564[1] { ResolutionCandidate@7487 }
-    <name not found> = ArrayList@10565[1] { ResolutionCandidate@5882 }
-    <name not found> = ArrayList@10566[1] { ResolutionCandidate@4361 }
-    <name not found> = ArrayList@10567[1] { ResolutionCandidate@3737 }
-    <name not found> = ArrayList@10568[1] { ResolutionCandidate@2294 }
-    <name not found> = ArrayList@10569[1] { ResolutionCandidate@1397 }
-    <name not found> = ArrayList@10570[1] { ResolutionCandidate@7334 }
-    <name not found> = ArrayList@10571[1] { ResolutionCandidate@6926 }
-    <name not found> = ArrayList@10572[1] { ResolutionCandidate@2057 }
-    <name not found> = ArrayList@10573[1] { ResolutionCandidate@4061 }
-    <name not found> = ArrayList@10574[1] { ResolutionCandidate@2222 }
-    <name not found> = ArrayList@10575[1] { ResolutionCandidate@803 }
-    <name not found> = ArrayList@10576[1] { ResolutionCandidate@4820 }
-    <name not found> = ArrayList@10577[1] { ResolutionCandidate@6359 }
-    <name not found> = ArrayList@10578[1] { ResolutionCandidate@2414 }
-    <name not found> = ArrayList@10579[1] { ResolutionCandidate@3800 }
-    <name not found> = ArrayList@10580[1] { ResolutionCandidate@2864 }
-    <name not found> = ArrayList@10581[1] { ResolutionCandidate@1520 }
-    <name not found> = ArrayList@10582[1] { ResolutionCandidate@5315 }
-    <name not found> = ArrayList@10583[1] { ResolutionCandidate@7349 }
-    <name not found> = ArrayList@10584[1] { ResolutionCandidate@1805 }
-    <name not found> = ArrayList@10585[1] { ResolutionCandidate@4238 }
-    <name not found> = ArrayList@10586[1] { ResolutionCandidate@4220 }
-    <name not found> = ArrayList@10587[1] { ResolutionCandidate@902 }
-    <name not found> = ArrayList@10588[1] { ResolutionCandidate@6479 }
-    <name not found> = ArrayList@10589[1] { ResolutionCandidate@7430 }
-    <name not found> = ArrayList@10590[1] { ResolutionCandidate@4235 }
-    <name not found> = ArrayList@10591[1] { ResolutionCandidate@1568 }
-    <name not found> = ArrayList@10592[1] { ResolutionCandidate@3614 }
-    <name not found> = ArrayList@10593[1] { ResolutionCandidate@1427 }
-    <name not found> = ArrayList@10594[1] { ResolutionCandidate@5687 }
-    <name not found> = ArrayList@10595[1] { ResolutionCandidate@5519 }
-    <name not found> = ArrayList@10596[1] { ResolutionCandidate@2123 }
-    <name not found> = ArrayList@10597[1] { ResolutionCandidate@2096 }
-    <name not found> = ArrayList@10598[1] { ResolutionCandidate@2297 }
-    <name not found> = ArrayList@10599[1] { ResolutionCandidate@446 }
-    <name not found> = ArrayList@10600[1] { ResolutionCandidate@7448 }
-    <name not found> = ArrayList@10601[1] { ResolutionCandidate@7067 }
-    <name not found> = ArrayList@10602[1] { ResolutionCandidate@3620 }
-    <name not found> = ArrayList@10603[1] { ResolutionCandidate@4460 }
-    <name not found> = ArrayList@10604[1] { ResolutionCandidate@1934 }
-    <name not found> = ArrayList@10605[1] { ResolutionCandidate@1463 }
-    <name not found> = ArrayList@10606[1] { ResolutionCandidate@6428 }
-    <name not found> = ArrayList@10607[1] { ResolutionCandidate@4592 }
-    <name not found> = ArrayList@10608[1] { ResolutionCandidate@3617 }
-    <name not found> = ArrayList@10609[1] { ResolutionCandidate@2990 }
-    <name not found> = ArrayList@10610[1] { ResolutionCandidate@1598 }
-    <name not found> = ArrayList@10611[1] { ResolutionCandidate@1040 }
-    <name not found> = ArrayList@10612[1] { ResolutionCandidate@5870 }
-    <name not found> = ArrayList@10613[1] { ResolutionCandidate@5987 }
-    <name not found> = ArrayList@10614[1] { ResolutionCandidate@4475 }
-    <name not found> = ArrayList@10615[1] { ResolutionCandidate@3878 }
-    <name not found> = ArrayList@10616[1] { ResolutionCandidate@2543 }
-    <name not found> = ArrayList@10617[1] { ResolutionCandidate@746 }
-    <name not found> = ArrayList@10618[1] { ResolutionCandidate@5192 }
-    <name not found> = ArrayList@10619[1] { ResolutionCandidate@4721 }
-    <name not found> = ArrayList@10620[1] { ResolutionCandidate@3413 }
-    <name not found> = ArrayList@10621[1] { ResolutionCandidate@1646 }
-    <name not found> = ArrayList@10622[1] { ResolutionCandidate@2981 }
-    <name not found> = ArrayList@10623[1] { ResolutionCandidate@1196 }
-    <name not found> = ArrayList@10624[1] { ResolutionCandidate@4670 }
-    <name not found> = ArrayList@10625[1] { ResolutionCandidate@5801 }
-    <name not found> = ArrayList@10626[1] { ResolutionCandidate@4406 }
-    <name not found> = ArrayList@10627[1] { ResolutionCandidate@3404 }
-    <name not found> = ArrayList@10628[1] { ResolutionCandidate@2585 }
-    <name not found> = ArrayList@10629[1] { ResolutionCandidate@986 }
-    <name not found> = ArrayList@10630[1] { ResolutionCandidate@6041 }
-    <name not found> = ArrayList@10631[1] { ResolutionCandidate@5816 }
-    <name not found> = ArrayList@10632[1] { ResolutionCandidate@4172 }
-    <name not found> = ArrayList@10633[1] { ResolutionCandidate@3593 }
-    <name not found> = ArrayList@10634[1] { ResolutionCandidate@2330 }
-    <name not found> = ArrayList@10635[1] { ResolutionCandidate@443 }
-    <name not found> = ArrayList@10636[1] { ResolutionCandidate@7292 }
-    <name not found> = ArrayList@10637[1] { ResolutionCandidate@6827 }
-    <name not found> = ArrayList@10638[1] { ResolutionCandidate@2459 }
-    <name not found> = ArrayList@10639[1] { ResolutionCandidate@4034 }
-    <name not found> = ArrayList@10640[1] { ResolutionCandidate@4286 }
-    <name not found> = ArrayList@10641[1] { ResolutionCandidate@1379 }
-    <name not found> = ArrayList@10642[1] { ResolutionCandidate@5072 }
-    <name not found> = ArrayList@10643[1] { ResolutionCandidate@7034 }
-    <name not found> = ArrayList@10644[1] { ResolutionCandidate@2645 }
-    <name not found> = ArrayList@10645[1] { ResolutionCandidate@2726 }
-    <name not found> = ArrayList@10646[1] { ResolutionCandidate@2765 }
-    <name not found> = ArrayList@10647[1] { ResolutionCandidate@374 }
-    <name not found> = ArrayList@10648[1] { ResolutionCandidate@6743 }
-    <name not found> = ArrayList@10649[1] { ResolutionCandidate@6026 }
-    <name not found> = ArrayList@10650[1] { ResolutionCandidate@2942 }
-    <name not found> = ArrayList@10651[1] { ResolutionCandidate@1682 }
-    <name not found> = ArrayList@10652[1] { ResolutionCandidate@3221 }
-    <name not found> = ArrayList@10653[1] { ResolutionCandidate@650 }
-    <name not found> = ArrayList@10654[1] { ResolutionCandidate@6815 }
-    <name not found> = ArrayList@10655[1] { ResolutionCandidate@5180 }
-    <name not found> = ArrayList@10656[1] { ResolutionCandidate@3149 }
-    <name not found> = ArrayList@10657[1] { ResolutionCandidate@3734 }
-    <name not found> = ArrayList@10658[1] { ResolutionCandidate@3836 }
-    <name not found> = ArrayList@10659[1] { ResolutionCandidate@1157 }
-    <name not found> = ArrayList@10660[1] { ResolutionCandidate@6899 }
-    <name not found> = ArrayList@10661[1] { ResolutionCandidate@5525 }
-    <name not found> = ArrayList@10662[1] { ResolutionCandidate@2159 }
-    <name not found> = ArrayList@10663[1] { ResolutionCandidate@3035 }
-    <name not found> = ArrayList@10664[1] { ResolutionCandidate@3428 }
-    <name not found> = ArrayList@10665[1] { ResolutionCandidate@1400 }
-    <name not found> = ArrayList@10666[1] { ResolutionCandidate@4667 }
-    <name not found> = ArrayList@10667[1] { ResolutionCandidate@7001 }
-    <name not found> = ArrayList@10668[1] { ResolutionCandidate@3653 }
-    <name not found> = ArrayList@10669[1] { ResolutionCandidate@3512 }
-    <name not found> = ArrayList@10670[1] { ResolutionCandidate@4310 }
-    <name not found> = ArrayList@10671[1] { ResolutionCandidate@413 }
-    <name not found> = ArrayList@10672[1] { ResolutionCandidate@4745 }
-    <name not found> = ArrayList@10673[1] { ResolutionCandidate@6329 }
-    <name not found> = ArrayList@10674[1] { ResolutionCandidate@2699 }
-    <name not found> = ArrayList@10675[1] { ResolutionCandidate@2246 }
-    <name not found> = ArrayList@10676[1] { ResolutionCandidate@3632 }
-    <name not found> = ArrayList@10677[1] { ResolutionCandidate@677 }
-    <name not found> = ArrayList@10678[1] { ResolutionCandidate@5423 }
-    <name not found> = ArrayList@10679[1] { ResolutionCandidate@6170 }
-    <name not found> = ArrayList@10680[1] { ResolutionCandidate@3509 }
-    <name not found> = ArrayList@10681[1] { ResolutionCandidate@2816 }
-    <name not found> = ArrayList@10682[1] { ResolutionCandidate@3929 }
-    <name not found> = ArrayList@10683[1] { ResolutionCandidate@1019 }
-    <name not found> = ArrayList@10684[1] { ResolutionCandidate@6101 }
-    <name not found> = ArrayList@10685[1] { ResolutionCandidate@4883 }
-    <name not found> = ArrayList@10686[1] { ResolutionCandidate@4214 }
-    <name not found> = ArrayList@10687[1] { ResolutionCandidate@4508 }
-    <name not found> = ArrayList@10688[1] { ResolutionCandidate@1562 }
-    <name not found> = ArrayList@10689[1] { ResolutionCandidate@1535 }
-    <name not found> = ArrayList@10690[1] { ResolutionCandidate@5741 }
-    <name not found> = ArrayList@10691[1] { ResolutionCandidate@5813 }
-    <name not found> = ArrayList@10692[1] { ResolutionCandidate@4127 }
-    <name not found> = ArrayList@10693[1] { ResolutionCandidate@1706 }
-    <name not found> = ArrayList@10694[1] { ResolutionCandidate@3470 }
-    <name not found> = ArrayList@10695[1] { ResolutionCandidate@956 }
-    <name not found> = ArrayList@10696[1] { ResolutionCandidate@7100 }
-    <name not found> = ArrayList@10697[1] { ResolutionCandidate@4739 }
-    <name not found> = ArrayList@10698[1] { ResolutionCandidate@3383 }
-    <name not found> = ArrayList@10699[1] { ResolutionCandidate@2567 }
-    <name not found> = ArrayList@10700[1] { ResolutionCandidate@3557 }
-    <name not found> = ArrayList@10701[1] { ResolutionCandidate@1118 }
-    <name not found> = ArrayList@10702[1] { ResolutionCandidate@7724 }
-    <name not found> = ArrayList@10703[1] { ResolutionCandidate@7352 }
-    <name not found> = ArrayList@10704[1] { ResolutionCandidate@3434 }
-    <name not found> = ArrayList@10705[1] { ResolutionCandidate@2321 }
-    <name not found> = ArrayList@10706[1] { ResolutionCandidate@2531 }
-    <name not found> = ArrayList@10707[1] { ResolutionCandidate@632 }
-    <name not found> = ArrayList@10708[1] { ResolutionCandidate@5351 }
-    <name not found> = ArrayList@10709[1] { ResolutionCandidate@6059 }
-    <name not found> = ArrayList@10710[1] { ResolutionCandidate@5141 }
-    <name not found> = ArrayList@10711[1] { ResolutionCandidate@2564 }
-    <name not found> = ArrayList@10712[1] { ResolutionCandidate@1856 }
-    <name not found> = ArrayList@10713[1] { ResolutionCandidate@1823 }
-    <name not found> = ArrayList@10714[1] { ResolutionCandidate@773 }
-    <name not found> = ArrayList@10715[1] { ResolutionCandidate@5453 }
-    <name not found> = ArrayList@10716[1] { ResolutionCandidate@5384 }
-    <name not found> = ArrayList@10717[1] { ResolutionCandidate@2591 }
-    <name not found> = ArrayList@10718[1] { ResolutionCandidate@3320 }
-    <name not found> = ArrayList@10719[1] { ResolutionCandidate@3143 }
-    <name not found> = ArrayList@10720[1] { ResolutionCandidate@1109 }
-    <name not found> = ArrayList@10721[1] { ResolutionCandidate@4865 }
-    <name not found> = ArrayList@10722[1] { ResolutionCandidate@4637 }
-    <name not found> = ArrayList@10723[1] { ResolutionCandidate@2885 }
-    <name not found> = ArrayList@10724[1] { ResolutionCandidate@3062 }
-    <name not found> = ArrayList@10725[1] { ResolutionCandidate@4415 }
-    <name not found> = ArrayList@10726[1] { ResolutionCandidate@710 }
-    <name not found> = ArrayList@10727[1] { ResolutionCandidate@4913 }
-    <name not found> = ArrayList@10728[1] { ResolutionCandidate@7115 }
-    <name not found> = ArrayList@10729[1] { ResolutionCandidate@3302 }
-    <name not found> = ArrayList@10730[1] { ResolutionCandidate@2489 }
-    <name not found> = ArrayList@10731[1] { ResolutionCandidate@2171 }
-    <name not found> = ArrayList@10732[1] { ResolutionCandidate@827 }
-    <name not found> = ArrayList@10733[1] { ResolutionCandidate@5588 }
-    <name not found> = ArrayList@10734[1] { ResolutionCandidate@6446 }
-    <name not found> = ArrayList@10735[1] { ResolutionCandidate@4370 }
-    <name not found> = ArrayList@10736[1] { ResolutionCandidate@4403 }
-    <name not found> = ArrayList@10737[1] { ResolutionCandidate@3026 }
-    <name not found> = ArrayList@10738[1] { ResolutionCandidate@452 }
-    <name not found> = ArrayList@10739[1] { ResolutionCandidate@4907 }
-    <name not found> = ArrayList@10740[1] { ResolutionCandidate@5447 }
-    <name not found> = ArrayList@10741[1] { ResolutionCandidate@2381 }
-    <name not found> = ArrayList@10742[1] { ResolutionCandidate@2108 }
-    <name not found> = ArrayList@10743[1] { ResolutionCandidate@1820 }
-    <name not found> = ArrayList@10744[1] { ResolutionCandidate@548 }
-    <name not found> = ArrayList@10745[1] { ResolutionCandidate@6662 }
-    <name not found> = ArrayList@10746[1] { ResolutionCandidate@5570 }
-    <name not found> = ArrayList@10747[1] { ResolutionCandidate@1595 }
-    <name not found> = ArrayList@10748[1] { ResolutionCandidate@4382 }
-    <name not found> = ArrayList@10749[1] { ResolutionCandidate@4223 }
-    <name not found> = ArrayList@10750[1] { ResolutionCandidate@839 }
-    <name not found> = ArrayList@10751[1] { ResolutionCandidate@4601 }
-    <name not found> = ArrayList@10752[1] { ResolutionCandidate@5624 }
-    <name not found> = ArrayList@10753[1] { ResolutionCandidate@2579 }
-    <name not found> = ArrayList@10754[1] { ResolutionCandidate@2561 }
-    <name not found> = ArrayList@10755[1] { ResolutionCandidate@863 }
-    <name not found> = ArrayList@10756[1] { ResolutionCandidate@7130 }
-    <name not found> = ArrayList@10757[1] { ResolutionCandidate@7646 }
-    <name not found> = ArrayList@10758[1] { ResolutionCandidate@7547 }
-    <name not found> = ArrayList@10759[1] { ResolutionCandidate@6890 }
-    <name not found> = ArrayList@10760[1] { ResolutionCandidate@5717 }
-    <name not found> = ArrayList@10761[1] { ResolutionCandidate@2966 }
-    <name not found> = ArrayList@10762[1] { ResolutionCandidate@2162 }
-    <name not found> = ArrayList@10763[1] { ResolutionCandidate@4484 }
-    <name not found> = ArrayList@10764[1] { ResolutionCandidate@1319 }
-    <name not found> = ArrayList@10765[1] { ResolutionCandidate@6197 }
-    <name not found> = ArrayList@10766[1] { ResolutionCandidate@7169 }
-    <name not found> = ArrayList@10767[1] { ResolutionCandidate@2399 }
-    <name not found> = ArrayList@10768[1] { ResolutionCandidate@3344 }
-    <name not found> = ArrayList@10769[1] { ResolutionCandidate@2888 }
-    <name not found> = ArrayList@10770[1] { ResolutionCandidate@629 }
-    <name not found> = ArrayList@10771[1] { ResolutionCandidate@6464 }
-    <name not found> = ArrayList@10772[1] { ResolutionCandidate@4919 }
-    <name not found> = ArrayList@10773[1] { ResolutionCandidate@3278 }
-    <name not found> = ArrayList@10774[1] { ResolutionCandidate@1868 }
-    <name not found> = ArrayList@10775[1] { ResolutionCandidate@2675 }
-    <name not found> = ArrayList@10776[1] { ResolutionCandidate@1382 }
-    <name not found> = ArrayList@10777[1] { ResolutionCandidate@6938 }
-    <name not found> = ArrayList@10778[1] { ResolutionCandidate@5621 }
-    <name not found> = ArrayList@10779[1] { ResolutionCandidate@2492 }
-    <name not found> = ArrayList@10780[1] { ResolutionCandidate@1904 }
-    <name not found> = ArrayList@10781[1] { ResolutionCandidate@359 }
-    <name not found> = ArrayList@10782[1] { ResolutionCandidate@5153 }
-    <name not found> = ArrayList@10783[1] { ResolutionCandidate@4973 }
-    <name not found> = ArrayList@10784[1] { ResolutionCandidate@5264 }
-    <name not found> = ArrayList@10785[1] { ResolutionCandidate@4622 }
-    <name not found> = ArrayList@10786[1] { ResolutionCandidate@7109 }
-    <name not found> = ArrayList@10787[1] { ResolutionCandidate@1982 }
-    <name not found> = ArrayList@10788[1] { ResolutionCandidate@2039 }
-    <name not found> = ArrayList@10789[1] { ResolutionCandidate@512 }
-    <name not found> = ArrayList@10790[1] { ResolutionCandidate@6089 }
-    <name not found> = ArrayList@10791[1] { ResolutionCandidate@5363 }
-    <name not found> = ArrayList@10792[1] { ResolutionCandidate@7415 }
-    <name not found> = ArrayList@10793[1] { ResolutionCandidate@4874 }
-    <name not found> = ArrayList@10794[1] { ResolutionCandidate@5660 }
-    <name not found> = ArrayList@10795[1] { ResolutionCandidate@2882 }
-    <name not found> = ArrayList@10796[1] { ResolutionCandidate@1949 }
-    <name not found> = ArrayList@10797[1] { ResolutionCandidate@992 }
-    <name not found> = ArrayList@10798[1] { ResolutionCandidate@6779 }
-    <name not found> = ArrayList@10799[1] { ResolutionCandidate@7526 }
-    <name not found> = ArrayList@10800[1] { ResolutionCandidate@6689 }
-    <name not found> = ArrayList@10801[1] { ResolutionCandidate@6593 }
-    <name not found> = ArrayList@10802[1] { ResolutionCandidate@5414 }
-    <name not found> = ArrayList@10803[1] { ResolutionCandidate@3611 }
-    <name not found> = ArrayList@10804[1] { ResolutionCandidate@4283 }
-    <name not found> = ArrayList@10805[1] { ResolutionCandidate@1637 }
-    <name not found> = ArrayList@10806[1] { ResolutionCandidate@1151 }
-    <name not found> = ArrayList@10807[1] { ResolutionCandidate@7157 }
-    <name not found> = ArrayList@10808[1] { ResolutionCandidate@6215 }
-    <name not found> = ArrayList@10809[1] { ResolutionCandidate@5822 }
-    <name not found> = ArrayList@10810[1] { ResolutionCandidate@3176 }
-    <name not found> = ArrayList@10811[1] { ResolutionCandidate@4496 }
-    <name not found> = ArrayList@10812[1] { ResolutionCandidate@2138 }
-    <name not found> = ArrayList@10813[1] { ResolutionCandidate@1403 }
-    <name not found> = ArrayList@10814[1] { ResolutionCandidate@6335 }
-    <name not found> = ArrayList@10815[1] { ResolutionCandidate@4961 }
-    <name not found> = ArrayList@10816[1] { ResolutionCandidate@7481 }
-    <name not found> = ArrayList@10817[1] { ResolutionCandidate@3023 }
-    <name not found> = ArrayList@10818[1] { ResolutionCandidate@3218 }
-    <name not found> = ArrayList@10819[1] { ResolutionCandidate@689 }
-    <name not found> = ArrayList@10820[1] { ResolutionCandidate@7055 }
-    <name not found> = ArrayList@10821[1] { ResolutionCandidate@6542 }
-    <name not found> = ArrayList@10822[1] { ResolutionCandidate@6977 }
-    <name not found> = ArrayList@10823[1] { ResolutionCandidate@7124 }
-    <name not found> = ArrayList@10824[1] { ResolutionCandidate@6563 }
-    <name not found> = ArrayList@10825[1] { ResolutionCandidate@3752 }
-    <name not found> = ArrayList@10826[1] { ResolutionCandidate@3824 }
-    <name not found> = ArrayList@10827[1] { ResolutionCandidate@3017 }
-    <name not found> = ArrayList@10828[1] { ResolutionCandidate@743 }
-    <name not found> = ArrayList@10829[1] { ResolutionCandidate@6809 }
-    <name not found> = ArrayList@10830[1] { ResolutionCandidate@5600 }
-    <name not found> = ArrayList@10831[1] { ResolutionCandidate@4289 }
-    <name not found> = ArrayList@10832[1] { ResolutionCandidate@2447 }
-    <name not found> = ArrayList@10833[1] { ResolutionCandidate@2846 }
-    <name not found> = ArrayList@10834[1] { ResolutionCandidate@1166 }
-    <name not found> = ArrayList@10835[1] { ResolutionCandidate@6020 }
-    <name not found> = ArrayList@10836[1] { ResolutionCandidate@4787 }
-    <name not found> = ArrayList@10837[1] { ResolutionCandidate@1691 }
-    <name not found> = ArrayList@10838[1] { ResolutionCandidate@3104 }
-    <name not found> = ArrayList@10839[1] { ResolutionCandidate@2927 }
-    <name not found> = ArrayList@10840[1] { ResolutionCandidate@434 }
-    <name not found> = ArrayList@10841[1] { ResolutionCandidate@6641 }
-    <name not found> = ArrayList@10842[1] { ResolutionCandidate@6539 }
-    <name not found> = ArrayList@10843[1] { ResolutionCandidate@3518 }
-    <name not found> = ArrayList@10844[1] { ResolutionCandidate@3194 }
-    <name not found> = ArrayList@10845[1] { ResolutionCandidate@389 }
-    <name not found> = ArrayList@10846[1] { ResolutionCandidate@6353 }
-    <name not found> = ArrayList@10847[1] { ResolutionCandidate@5906 }
-    <name not found> = ArrayList@10848[1] { ResolutionCandidate@7583 }
-    <name not found> = ArrayList@10849[1] { ResolutionCandidate@7604 }
-    <name not found> = ArrayList@10850[1] { ResolutionCandidate@7145 }
-    <name not found> = ArrayList@10851[1] { ResolutionCandidate@2342 }
-    <name not found> = ArrayList@10852[1] { ResolutionCandidate@4511 }
-    <name not found> = ArrayList@10853[1] { ResolutionCandidate@395 }
-    <name not found> = ArrayList@10854[1] { ResolutionCandidate@7112 }
-    <name not found> = ArrayList@10855[1] { ResolutionCandidate@7382 }
-    <name not found> = ArrayList@10856[1] { ResolutionCandidate@5210 }
-    <name not found> = ArrayList@10857[1] { ResolutionCandidate@5399 }
-    <name not found> = ArrayList@10858[1] { ResolutionCandidate@6371 }
-    <name not found> = ArrayList@10859[1] { ResolutionCandidate@2189 }
-    <name not found> = ArrayList@10860[1] { ResolutionCandidate@3473 }
-    <name not found> = ArrayList@10861[1] { ResolutionCandidate@602 }
-    <name not found> = ArrayList@10862[1] { ResolutionCandidate@5855 }
-    <name not found> = ArrayList@10863[1] { ResolutionCandidate@7508 }
-    <name not found> = ArrayList@10864[1] { ResolutionCandidate@4544 }
-    <name not found> = ArrayList@10865[1] { ResolutionCandidate@5894 }
-    <name not found> = ArrayList@10866[1] { ResolutionCandidate@6644 }
-    <name not found> = ArrayList@10867[1] { ResolutionCandidate@2858 }
-    <name not found> = ArrayList@10868[1] { ResolutionCandidate@2117 }
-    <name not found> = ArrayList@10869[1] { ResolutionCandidate@1610 }
-    <name not found> = ArrayList@10870[1] { ResolutionCandidate@1202 }
-    <name not found> = ArrayList@10871[1] { ResolutionCandidate@5438 }
-    <name not found> = ArrayList@10872[1] { ResolutionCandidate@7496 }
-    <name not found> = ArrayList@10873[1] { ResolutionCandidate@7241 }
-    <name not found> = ArrayList@10874[1] { ResolutionCandidate@1667 }
-    <name not found> = ArrayList@10875[1] { ResolutionCandidate@4388 }
-    <name not found> = ArrayList@10876[1] { ResolutionCandidate@1268 }
-    <name not found> = ArrayList@10877[1] { ResolutionCandidate@5690 }
-    <name not found> = ArrayList@10878[1] { ResolutionCandidate@4826 }
-    <name not found> = ArrayList@10879[1] { ResolutionCandidate@7394 }
-    <name not found> = ArrayList@10880[1] { ResolutionCandidate@6320 }
-    <name not found> = ArrayList@10881[1] { ResolutionCandidate@5159 }
-    <name not found> = ArrayList@10882[1] { ResolutionCandidate@3935 }
-    <name not found> = ArrayList@10883[1] { ResolutionCandidate@3605 }
-    <name not found> = ArrayList@10884[1] { ResolutionCandidate@2480 }
-    <name not found> = ArrayList@10885[1] { ResolutionCandidate@1271 }
-    <name not found> = ArrayList@10886[1] { ResolutionCandidate@7184 }
-    <name not found> = ArrayList@10887[1] { ResolutionCandidate@7226 }
-    <name not found> = ArrayList@10888[1] { ResolutionCandidate@1592 }
-    <name not found> = ArrayList@10889[1] { ResolutionCandidate@4439 }
-    <name not found> = ArrayList@10890[1] { ResolutionCandidate@4016 }
-    <name not found> = ArrayList@10891[1] { ResolutionCandidate@1025 }
-    <name not found> = ArrayList@10892[1] { ResolutionCandidate@4859 }
-    <name not found> = ArrayList@10893[1] { ResolutionCandidate@4922 }
-    <name not found> = ArrayList@10894[1] { ResolutionCandidate@2630 }
-    <name not found> = ArrayList@10895[1] { ResolutionCandidate@3911 }
-    <name not found> = ArrayList@10896[1] { ResolutionCandidate@3857 }
-    <name not found> = ArrayList@10897[1] { ResolutionCandidate@941 }
-    <name not found> = ArrayList@10898[1] { ResolutionCandidate@5888 }
-    <name not found> = ArrayList@10899[1] { ResolutionCandidate@6989 }
-    <name not found> = ArrayList@10900[1] { ResolutionCandidate@4247 }
-    <name not found> = ArrayList@10901[1] { ResolutionCandidate@1559 }
-    <name not found> = ArrayList@10902[1] { ResolutionCandidate@476 }
-    <name not found> = ArrayList@10903[1] { ResolutionCandidate@4877 }
-    <name not found> = ArrayList@10904[1] { ResolutionCandidate@6866 }
-    <name not found> = ArrayList@10905[1] { ResolutionCandidate@6935 }
-    <name not found> = ArrayList@10906[1] { ResolutionCandidate@4895 }
-    <name not found> = ArrayList@10907[1] { ResolutionCandidate@5495 }
-    <name not found> = ArrayList@10908[1] { ResolutionCandidate@4190 }
-    <name not found> = ArrayList@10909[1] { ResolutionCandidate@1814 }
-    <name not found> = ArrayList@10910[1] { ResolutionCandidate@983 }
-    <name not found> = ArrayList@10911[1] { ResolutionCandidate@5255 }
-    <name not found> = ArrayList@10912[1] { ResolutionCandidate@7529 }
-    <name not found> = ArrayList@10913[1] { ResolutionCandidate@7268 }
-    <name not found> = ArrayList@10914[1] { ResolutionCandidate@6647 }
-    <name not found> = ArrayList@10915[1] { ResolutionCandidate@5609 }
-    <name not found> = ArrayList@10916[1] { ResolutionCandidate@3761 }
-    <name not found> = ArrayList@10917[1] { ResolutionCandidate@1916 }
-    <name not found> = ArrayList@10918[1] { ResolutionCandidate@779 }
-    <name not found> = ArrayList@10919[1] { ResolutionCandidate@7685 }
-    <name not found> = ArrayList@10920[1] { ResolutionCandidate@6365 }
-    <name not found> = ArrayList@10921[1] { ResolutionCandidate@5378 }
-    <name not found> = ArrayList@10922[1] { ResolutionCandidate@5144 }
-    <name not found> = ArrayList@10923[1] { ResolutionCandidate@5045 }
-    <name not found> = ArrayList@10924[1] { ResolutionCandidate@2441 }
-    <name not found> = ArrayList@10925[1] { ResolutionCandidate@2588 }
-    <name not found> = ArrayList@10926[1] { ResolutionCandidate@818 }
-    <name not found> = ArrayList@10927[1] { ResolutionCandidate@7424 }
-    <name not found> = ArrayList@10928[1] { ResolutionCandidate@6665 }
-    <name not found> = ArrayList@10929[1] { ResolutionCandidate@7409 }
-    <name not found> = ArrayList@10930[1] { ResolutionCandidate@6368 }
-    <name not found> = ArrayList@10931[1] { ResolutionCandidate@5015 }
-    <name not found> = ArrayList@10932[1] { ResolutionCandidate@2837 }
-    <name not found> = ArrayList@10933[1] { ResolutionCandidate@2819 }
-    <name not found> = ArrayList@10934[1] { ResolutionCandidate@2570 }
-    <name not found> = ArrayList@10935[1] { ResolutionCandidate@1247 }
-    <name not found> = ArrayList@10936[1] { ResolutionCandidate@5429 }
-    <name not found> = ArrayList@10937[1] { ResolutionCandidate@7283 }
-    <name not found> = ArrayList@10938[1] { ResolutionCandidate@2963 }
-    <name not found> = ArrayList@10939[1] { ResolutionCandidate@1895 }
-    <name not found> = ArrayList@10940[1] { ResolutionCandidate@3872 }
-    <name not found> = ArrayList@10941[1] { ResolutionCandidate@530 }
-    <name not found> = ArrayList@10942[1] { ResolutionCandidate@5483 }
-    <name not found> = ArrayList@10943[1] { ResolutionCandidate@7403 }
-    <name not found> = ArrayList@10944[1] { ResolutionCandidate@3371 }
-    <name not found> = ArrayList@10945[1] { ResolutionCandidate@2417 }
-    <name not found> = ArrayList@10946[1] { ResolutionCandidate@4043 }
-    <name not found> = ArrayList@10947[1] { ResolutionCandidate@662 }
-    <name not found> = ArrayList@10948[1] { ResolutionCandidate@6290 }
-    <name not found> = ArrayList@10949[1] { ResolutionCandidate@6797 }
-    <name not found> = ArrayList@10950[1] { ResolutionCandidate@3050 }
-    <name not found> = ArrayList@10951[1] { ResolutionCandidate@3212 }
-    <name not found> = ArrayList@10952[1] { ResolutionCandidate@1481 }
-    <name not found> = ArrayList@10953[1] { ResolutionCandidate@5051 }
-    <name not found> = ArrayList@10954[1] { ResolutionCandidate@6362 }
-    <name not found> = ArrayList@10955[1] { ResolutionCandidate@6944 }
-    <name not found> = ArrayList@10956[1] { ResolutionCandidate@4553 }
-    <name not found> = ArrayList@10957[1] { ResolutionCandidate@4580 }
-    <name not found> = ArrayList@10958[1] { ResolutionCandidate@1673 }
-    <name not found> = ArrayList@10959[1] { ResolutionCandidate@2354 }
-    <name not found> = ArrayList@10960[1] { ResolutionCandidate@1088 }
-    <name not found> = ArrayList@10961[1] { ResolutionCandidate@4886 }
-    <name not found> = ArrayList@10962[1] { ResolutionCandidate@6836 }
-    <name not found> = ArrayList@10963[1] { ResolutionCandidate@6530 }
-    <name not found> = ArrayList@10964[1] { ResolutionCandidate@5783 }
-    <name not found> = ArrayList@10965[1] { ResolutionCandidate@6113 }
-    <name not found> = ArrayList@10966[1] { ResolutionCandidate@3896 }
-    <name not found> = ArrayList@10967[1] { ResolutionCandidate@4490 }
-    <name not found> = ArrayList@10968[1] { ResolutionCandidate@1172 }
-    <name not found> = ArrayList@10969[1] { ResolutionCandidate@5081 }
-    <name not found> = ArrayList@10970[1] { ResolutionCandidate@7469 }
-    <name not found> = ArrayList@10971[1] { ResolutionCandidate@5432 }
-    <name not found> = ArrayList@10972[1] { ResolutionCandidate@4757 }
-    <name not found> = ArrayList@10973[1] { ResolutionCandidate@6599 }
-    <name not found> = ArrayList@10974[1] { ResolutionCandidate@2573 }
-    <name not found> = ArrayList@10975[1] { ResolutionCandidate@1772 }
-    <name not found> = ArrayList@10976[1] { ResolutionCandidate@1178 }
-    <name not found> = ArrayList@10977[1] { ResolutionCandidate@7202 }
-    <name not found> = ArrayList@10978[1] { ResolutionCandidate@6731 }
-    <name not found> = ArrayList@10979[1] { ResolutionCandidate@6638 }
-    <name not found> = ArrayList@10980[1] { ResolutionCandidate@6887 }
-    <name not found> = ArrayList@10981[1] { ResolutionCandidate@6950 }
-    <name not found> = ArrayList@10982[1] { ResolutionCandidate@5318 }
-    <name not found> = ArrayList@10983[1] { ResolutionCandidate@2204 }
-    <name not found> = ArrayList@10984[1] { ResolutionCandidate@2615 }
-    <name not found> = ArrayList@10985[1] { ResolutionCandidate@1310 }
-    <name not found> = ArrayList@10986[1] { ResolutionCandidate@7286 }
-    <name not found> = ArrayList@10987[1] { ResolutionCandidate@5207 }
-    <name not found> = ArrayList@10988[1] { ResolutionCandidate@6812 }
-    <name not found> = ArrayList@10989[1] { ResolutionCandidate@5891 }
-    <name not found> = ArrayList@10990[1] { ResolutionCandidate@7700 }
-    <name not found> = ArrayList@10991[1] { ResolutionCandidate@2411 }
-    <name not found> = ArrayList@10992[1] { ResolutionCandidate@2786 }
-    <name not found> = ArrayList@10993[1] { ResolutionCandidate@1943 }
-    <name not found> = ArrayList@10994[1] { ResolutionCandidate@1421 }
-    <name not found> = ArrayList@10995[1] { ResolutionCandidate@4610 }
-    <name not found> = ArrayList@10996[1] { ResolutionCandidate@5312 }
-    <name not found> = ArrayList@10997[1] { ResolutionCandidate@3098 }
-    <name not found> = ArrayList@10998[1] { ResolutionCandidate@1724 }
-    <name not found> = ArrayList@10999[1] { ResolutionCandidate@1880 }
-    <name not found> = ArrayList@11000[1] { ResolutionCandidate@1190 }
-    <name not found> = ArrayList@11001[1] { ResolutionCandidate@6548 }
-    <name not found> = ArrayList@11002[1] { ResolutionCandidate@5033 }
-    <name not found> = ArrayList@11003[1] { ResolutionCandidate@3227 }
-    <name not found> = ArrayList@11004[1] { ResolutionCandidate@2738 }
-    <name not found> = ArrayList@11005[1] { ResolutionCandidate@4250 }
-    <name not found> = ArrayList@11006[1] { ResolutionCandidate@1094 }
-    <name not found> = ArrayList@11007[1] { ResolutionCandidate@5678 }
-    <name not found> = ArrayList@11008[1] { ResolutionCandidate@4862 }
-    <name not found> = ArrayList@11009[1] { ResolutionCandidate@3665 }
-    <name not found> = ArrayList@11010[1] { ResolutionCandidate@4112 }
-    <name not found> = ArrayList@11011[1] { ResolutionCandidate@896 }
-    <name not found> = ArrayList@11012[1] { ResolutionCandidate@7142 }
-    <name not found> = ArrayList@11013[1] { ResolutionCandidate@7730 }
-    <name not found> = ArrayList@11014[1] { ResolutionCandidate@5537 }
-    <name not found> = ArrayList@11015[1] { ResolutionCandidate@5324 }
-    <name not found> = ArrayList@11016[1] { ResolutionCandidate@5489 }
-    <name not found> = ArrayList@11017[1] { ResolutionCandidate@1718 }
-    <name not found> = ArrayList@11018[1] { ResolutionCandidate@3038 }
-    <name not found> = ArrayList@11019[1] { ResolutionCandidate@575 }
-    <name not found> = ArrayList@11020[1] { ResolutionCandidate@5777 }
-    <name not found> = ArrayList@11021[1] { ResolutionCandidate@7505 }
-    <name not found> = ArrayList@11022[1] { ResolutionCandidate@5246 }
-    <name not found> = ArrayList@11023[1] { ResolutionCandidate@4991 }
-    <name not found> = ArrayList@11024[1] { ResolutionCandidate@7118 }
-    <name not found> = ArrayList@11025[1] { ResolutionCandidate@4076 }
-    <name not found> = ArrayList@11026[1] { ResolutionCandidate@2684 }
-    <name not found> = ArrayList@11027[1] { ResolutionCandidate@1289 }
-    <name not found> = ArrayList@11028[1] { ResolutionCandidate@6029 }
-    <name not found> = ArrayList@11029[1] { ResolutionCandidate@7670 }
-    <name not found> = ArrayList@11030[1] { ResolutionCandidate@6002 }
-    <name not found> = ArrayList@11031[1] { ResolutionCandidate@5504 }
-    <name not found> = ArrayList@11032[1] { ResolutionCandidate@5594 }
-    <name not found> = ArrayList@11033[1] { ResolutionCandidate@1907 }
-    <name not found> = ArrayList@11034[1] { ResolutionCandidate@3656 }
-    <name not found> = ArrayList@11035[1] { ResolutionCandidate@686 }
-    <name not found> = ArrayList@11036[1] { ResolutionCandidate@7574 }
-    <name not found> = ArrayList@11037[1] { ResolutionCandidate@5516 }
-    <name not found> = ArrayList@11038[1] { ResolutionCandidate@4955 }
-    <name not found> = ArrayList@11039[1] { ResolutionCandidate@4547 }
-    <name not found> = ArrayList@11040[1] { ResolutionCandidate@5786 }
-    <name not found> = ArrayList@11041[1] { ResolutionCandidate@5978 }
-    <name not found> = ArrayList@11042[1] { ResolutionCandidate@4463 }
-    <name not found> = ArrayList@11043[1] { ResolutionCandidate@1793 }
-    <name not found> = ArrayList@11044[1] { ResolutionCandidate@572 }
-    <name not found> = ArrayList@11045[1] { ResolutionCandidate@4898 }
-    <name not found> = ArrayList@11046[1] { ResolutionCandidate@6251 }
-    <name not found> = ArrayList@11047[1] { ResolutionCandidate@5408 }
-    <name not found> = ArrayList@11048[1] { ResolutionCandidate@5030 }
-    <name not found> = ArrayList@11049[1] { ResolutionCandidate@7379 }
-    <name not found> = ArrayList@11050[1] { ResolutionCandidate@6227 }
-    <name not found> = ArrayList@11051[1] { ResolutionCandidate@3137 }
-    <name not found> = ArrayList@11052[1] { ResolutionCandidate@3341 }
-    <name not found> = ArrayList@11053[1] { ResolutionCandidate@2174 }
-    <name not found> = ArrayList@11054[1] { ResolutionCandidate@1466 }
-    <name not found> = ArrayList@11055[1] { ResolutionCandidate@5147 }
-    <name not found> = ArrayList@11056[1] { ResolutionCandidate@5708 }
-    <name not found> = ArrayList@11057[1] { ResolutionCandidate@5720 }
-    <name not found> = ArrayList@11058[1] { ResolutionCandidate@1925 }
-    <name not found> = ArrayList@11059[1] { ResolutionCandidate@3881 }
-    <name not found> = ArrayList@11060[1] { ResolutionCandidate@4367 }
-    <name not found> = ArrayList@11061[1] { ResolutionCandidate@1160 }
-    <name not found> = ArrayList@11062[1] { ResolutionCandidate@6824 }
-    <name not found> = ArrayList@11063[1] { ResolutionCandidate@6584 }
-    <name not found> = ArrayList@11064[1] { ResolutionCandidate@2621 }
-    <name not found> = ArrayList@11065[1] { ResolutionCandidate@1961 }
-    <name not found> = ArrayList@11066[1] { ResolutionCandidate@3497 }
-    <name not found> = ArrayList@11067[1] { ResolutionCandidate@614 }
-    <name not found> = ArrayList@11068[1] { ResolutionCandidate@6692 }
-    <name not found> = ArrayList@11069[1] { ResolutionCandidate@5747 }
-    <name not found> = ArrayList@11070[1] { ResolutionCandidate@2873 }
-    <name not found> = ArrayList@11071[1] { ResolutionCandidate@3788 }
-    <name not found> = ArrayList@11072[1] { ResolutionCandidate@4343 }
-    <name not found> = ArrayList@11073[1] { ResolutionCandidate@599 }
-    <name not found> = ArrayList@11074[1] { ResolutionCandidate@4853 }
-    <name not found> = ArrayList@11075[1] { ResolutionCandidate@5306 }
-    <name not found> = ArrayList@11076[1] { ResolutionCandidate@4244 }
-    <name not found> = ArrayList@11077[1] { ResolutionCandidate@3170 }
-    <name not found> = ArrayList@11078[1] { ResolutionCandidate@4346 }
-    <name not found> = ArrayList@11079[1] { ResolutionCandidate@1388 }
-    <name not found> = ArrayList@11080[1] { ResolutionCandidate@5618 }
-    <name not found> = ArrayList@11081[1] { ResolutionCandidate@5168 }
-    <name not found> = ArrayList@11082[1] { ResolutionCandidate@2231 }
-    <name not found> = ArrayList@11083[1] { ResolutionCandidate@4088 }
-    <name not found> = ArrayList@11084[1] { ResolutionCandidate@2195 }
-    <name not found> = ArrayList@11085[1] { ResolutionCandidate@716 }
-    <name not found> = ArrayList@11086[1] { ResolutionCandidate@5006 }
-    <name not found> = ArrayList@11087[1] { ResolutionCandidate@4850 }
-    <name not found> = ArrayList@11088[1] { ResolutionCandidate@4154 }
-    <name not found> = ArrayList@11089[1] { ResolutionCandidate@4532 }
-    <name not found> = ArrayList@11090[1] { ResolutionCandidate@1940 }
-    <name not found> = ArrayList@11091[1] { ResolutionCandidate@1304 }
-    <name not found> = ArrayList@11092[1] { ResolutionCandidate@6122 }
-    <name not found> = ArrayList@11093[1] { ResolutionCandidate@7217 }
-    <name not found> = ArrayList@11094[1] { ResolutionCandidate@4106 }
-    <name not found> = ArrayList@11095[1] { ResolutionCandidate@3545 }
-    <name not found> = ArrayList@11096[1] { ResolutionCandidate@1892 }
-    <name not found> = ArrayList@11097[1] { ResolutionCandidate@1490 }
-    <name not found> = ArrayList@11098[1] { ResolutionCandidate@7043 }
-    <name not found> = ArrayList@11099[1] { ResolutionCandidate@5648 }
-    <name not found> = ArrayList@11100[1] { ResolutionCandidate@3410 }
-    <name not found> = ArrayList@11101[1] { ResolutionCandidate@1760 }
-    <name not found> = ArrayList@11102[1] { ResolutionCandidate@1517 }
-    <name not found> = ArrayList@11103[1] { ResolutionCandidate@6284 }
-    <name not found> = ArrayList@11104[1] { ResolutionCandidate@6254 }
-    <name not found> = ArrayList@11105[1] { ResolutionCandidate@6248 }
-    <name not found> = ArrayList@11106[1] { ResolutionCandidate@5498 }
-    <name not found> = ArrayList@11107[1] { ResolutionCandidate@7301 }
-    <name not found> = ArrayList@11108[1] { ResolutionCandidate@2462 }
-    <name not found> = ArrayList@11109[1] { ResolutionCandidate@2093 }
-    <name not found> = ArrayList@11110[1] { ResolutionCandidate@3374 }
-    <name not found> = ArrayList@11111[1] { ResolutionCandidate@884 }
-    <name not found> = ArrayList@11112[1] { ResolutionCandidate@7049 }
-    <name not found> = ArrayList@11113[1] { ResolutionCandidate@5543 }
-    <name not found> = ArrayList@11114[1] { ResolutionCandidate@3848 }
-    <name not found> = ArrayList@11115[1] { ResolutionCandidate@2042 }
-    <name not found> = ArrayList@11116[1] { ResolutionCandidate@2438 }
-    <name not found> = ArrayList@11117[1] { ResolutionCandidate@527 }
-    <name not found> = ArrayList@11118[1] { ResolutionCandidate@5075 }
-    <name not found> = ArrayList@11119[1] { ResolutionCandidate@7088 }
-    <name not found> = ArrayList@11120[1] { ResolutionCandidate@2894 }
-    <name not found> = ArrayList@11121[1] { ResolutionCandidate@3998 }
-    <name not found> = ArrayList@11122[1] { ResolutionCandidate@1859 }
-    <name not found> = ArrayList@11123[1] { ResolutionCandidate@782 }
-    <name not found> = ArrayList@11124[1] { ResolutionCandidate@5069 }
-    <name not found> = ArrayList@11125[1] { ResolutionCandidate@5903 }
-    <name not found> = ArrayList@11126[1] { ResolutionCandidate@4472 }
-    <name not found> = ArrayList@11127[1] { ResolutionCandidate@4337 }
-    <name not found> = ArrayList@11128[1] { ResolutionCandidate@407 }
-    <name not found> = ArrayList@11129[1] { ResolutionCandidate@5879 }
-    <name not found> = ArrayList@11130[1] { ResolutionCandidate@7025 }
-    <name not found> = ArrayList@11131[1] { ResolutionCandidate@5369 }
-    <name not found> = ArrayList@11132[1] { ResolutionCandidate@5333 }
-    <name not found> = ArrayList@11133[1] { ResolutionCandidate@5018 }
-    <name not found> = ArrayList@11134[1] { ResolutionCandidate@2582 }
-    <name not found> = ArrayList@11135[1] { ResolutionCandidate@3245 }
-    <name not found> = ArrayList@11136[1] { ResolutionCandidate@1532 }
-    <name not found> = ArrayList@11137[1] { ResolutionCandidate@5036 }
-    <name not found> = ArrayList@11138[1] { ResolutionCandidate@4967 }
-    <name not found> = ArrayList@11139[1] { ResolutionCandidate@6878 }
-    <name not found> = ArrayList@11140[1] { ResolutionCandidate@6929 }
-    <name not found> = ArrayList@11141[1] { ResolutionCandidate@5546 }
-    <name not found> = ArrayList@11142[1] { ResolutionCandidate@2618 }
-    <name not found> = ArrayList@11143[1] { ResolutionCandidate@4166 }
-    <name not found> = ArrayList@11144[1] { ResolutionCandidate@1448 }
-    <name not found> = ArrayList@11145[1] { ResolutionCandidate@6431 }
-    <name not found> = ArrayList@11146[1] { ResolutionCandidate@5087 }
-    <name not found> = ArrayList@11147[1] { ResolutionCandidate@5276 }
-    <name not found> = ArrayList@11148[1] { ResolutionCandidate@7151 }
-    <name not found> = ArrayList@11149[1] { ResolutionCandidate@5996 }
-    <name not found> = ArrayList@11150[1] { ResolutionCandidate@2207 }
-    <name not found> = ArrayList@11151[1] { ResolutionCandidate@2021 }
-    <name not found> = ArrayList@11152[1] { ResolutionCandidate@3899 }
-    <name not found> = ArrayList@11153[1] { ResolutionCandidate@683 }
-    <name not found> = ArrayList@11154[1] { ResolutionCandidate@4682 }
-    <name not found> = ArrayList@11155[1] { ResolutionCandidate@6338 }
-    <name not found> = ArrayList@11156[1] { ResolutionCandidate@7244 }
-    <name not found> = ArrayList@11157[1] { ResolutionCandidate@3818 }
-    <name not found> = ArrayList@11158[1] { ResolutionCandidate@2315 }
-    <name not found> = ArrayList@11159[1] { ResolutionCandidate@3458 }
-    <name not found> = ArrayList@11160[1] { ResolutionCandidate@368 }
-    <name not found> = ArrayList@11161[1] { ResolutionCandidate@6011 }
-    <name not found> = ArrayList@11162[1] { ResolutionCandidate@5345 }
-    <name not found> = ArrayList@11163[1] { ResolutionCandidate@4931 }
-    <name not found> = ArrayList@11164[1] { ResolutionCandidate@3317 }
-    <name not found> = ArrayList@11165[1] { ResolutionCandidate@2003 }
-    <name not found> = ArrayList@11166[1] { ResolutionCandidate@380 }
-    <name not found> = ArrayList@11167[1] { ResolutionCandidate@4640 }
-    <name not found> = ArrayList@11168[1] { ResolutionCandidate@7451 }
-    <name not found> = ArrayList@11169[1] { ResolutionCandidate@6143 }
-    <name not found> = ArrayList@11170[1] { ResolutionCandidate@7259 }
-    <name not found> = ArrayList@11171[1] { ResolutionCandidate@6032 }
-    <name not found> = ArrayList@11172[1] { ResolutionCandidate@2153 }
-    <name not found> = ArrayList@11173[1] { ResolutionCandidate@3581 }
-    <name not found> = ArrayList@11174[1] { ResolutionCandidate@4064 }
-    <name not found> = ArrayList@11175[1] { ResolutionCandidate@1238 }
-    <name not found> = ArrayList@11176[1] { ResolutionCandidate@7592 }
-    <name not found> = ArrayList@11177[1] { ResolutionCandidate@5933 }
-    <name not found> = ArrayList@11178[1] { ResolutionCandidate@2348 }
-    <name not found> = ArrayList@11179[1] { ResolutionCandidate@2987 }
-    <name not found> = ArrayList@11180[1] { ResolutionCandidate@3521 }
-    <name not found> = ArrayList@11181[1] { ResolutionCandidate@1016 }
-    <name not found> = ArrayList@11182[1] { ResolutionCandidate@5828 }
-    <name not found> = ArrayList@11183[1] { ResolutionCandidate@4946 }
-    <name not found> = ArrayList@11184[1] { ResolutionCandidate@3287 }
-    <name not found> = ArrayList@11185[1] { ResolutionCandidate@4535 }
-    <name not found> = ArrayList@11186[1] { ResolutionCandidate@3116 }
-    <name not found> = ArrayList@11187[1] { ResolutionCandidate@458 }
-    <name not found> = ArrayList@11188[1] { ResolutionCandidate@5372 }
-    <name not found> = ArrayList@11189[1] { ResolutionCandidate@5099 }
-    <name not found> = ArrayList@11190[1] { ResolutionCandidate@3563 }
-    <name not found> = ArrayList@11191[1] { ResolutionCandidate@2909 }
-    <name not found> = ArrayList@11192[1] { ResolutionCandidate@605 }
-    <name not found> = ArrayList@11193[1] { ResolutionCandidate@6206 }
-    <name not found> = ArrayList@11194[1] { ResolutionCandidate@4565 }
-    <name not found> = ArrayList@11195[1] { ResolutionCandidate@6737 }
-    <name not found> = ArrayList@11196[1] { ResolutionCandidate@6350 }
-    <name not found> = ArrayList@11197[1] { ResolutionCandidate@5132 }
-    <name not found> = ArrayList@11198[1] { ResolutionCandidate@3128 }
-    <name not found> = ArrayList@11199[1] { ResolutionCandidate@3392 }
-    <name not found> = ArrayList@11200[1] { ResolutionCandidate@761 }
-    <name not found> = ArrayList@11201[1] { ResolutionCandidate@5426 }
-    <name not found> = ArrayList@11202[1] { ResolutionCandidate@6725 }
-    <name not found> = ArrayList@11203[1] { ResolutionCandidate@5477 }
-    <name not found> = ArrayList@11204[1] { ResolutionCandidate@7097 }
-    <name not found> = ArrayList@11205[1] { ResolutionCandidate@7568 }
-    <name not found> = ArrayList@11206[1] { ResolutionCandidate@2912 }
-    <name not found> = ArrayList@11207[1] { ResolutionCandidate@2216 }
-    <name not found> = ArrayList@11208[1] { ResolutionCandidate@1208 }
-    <name not found> = ArrayList@11209[1] { ResolutionCandidate@6299 }
-    <name not found> = ArrayList@11210[1] { ResolutionCandidate@5633 }
-    <name not found> = ArrayList@11211[1] { ResolutionCandidate@6863 }
-    <name not found> = ArrayList@11212[1] { ResolutionCandidate@6773 }
-    <name not found> = ArrayList@11213[1] { ResolutionCandidate@6611 }
-    <name not found> = ArrayList@11214[1] { ResolutionCandidate@1628 }
-    <name not found> = ArrayList@11215[1] { ResolutionCandidate@1964 }
-    <name not found> = ArrayList@11216[1] { ResolutionCandidate@3257 }
-    <name not found> = ArrayList@11217[1] { ResolutionCandidate@1316 }
-    <name not found> = ArrayList@11218[1] { ResolutionCandidate@5651 }
-    <name not found> = ArrayList@11219[1] { ResolutionCandidate@5273 }
-    <name not found> = ArrayList@11220[1] { ResolutionCandidate@4607 }
-    <name not found> = ArrayList@11221[1] { ResolutionCandidate@1589 }
-    <name not found> = ArrayList@11222[1] { ResolutionCandidate@3419 }
-    <name not found> = ArrayList@11223[1] { ResolutionCandidate@1229 }
-    <name not found> = ArrayList@11224[1] { ResolutionCandidate@6521 }
-    <name not found> = ArrayList@11225[1] { ResolutionCandidate@6062 }
-    <name not found> = ArrayList@11226[1] { ResolutionCandidate@7385 }
-    <name not found> = ArrayList@11227[1] { ResolutionCandidate@7586 }
-    <name not found> = ArrayList@11228[1] { ResolutionCandidate@4676 }
-    <name not found> = ArrayList@11229[1] { ResolutionCandidate@2747 }
-    <name not found> = ArrayList@11230[1] { ResolutionCandidate@3167 }
-    <name not found> = ArrayList@11231[1] { ResolutionCandidate@2996 }
-    <name not found> = ArrayList@11232[1] { ResolutionCandidate@1235 }
-    <name not found> = ArrayList@11233[1] { ResolutionCandidate@5639 }
-    <name not found> = ArrayList@11234[1] { ResolutionCandidate@6839 }
-    <name not found> = ArrayList@11235[1] { ResolutionCandidate@2861 }
-    <name not found> = ArrayList@11236[1] { ResolutionCandidate@3539 }
-    <name not found> = ArrayList@11237[1] { ResolutionCandidate@4400 }
-    <name not found> = ArrayList@11238[1] { ResolutionCandidate@698 }
-    <name not found> = ArrayList@11239[1] { ResolutionCandidate@6065 }
-    <name not found> = ArrayList@11240[1] { ResolutionCandidate@7691 }
-    <name not found> = ArrayList@11241[1] { ResolutionCandidate@4082 }
-    <name not found> = ArrayList@11242[1] { ResolutionCandidate@4355 }
-    <name not found> = ArrayList@11243[1] { ResolutionCandidate@4079 }
-    <name not found> = ArrayList@11244[1] { ResolutionCandidate@1322 }
-    <name not found> = ArrayList@11245[1] { ResolutionCandidate@6167 }
-    <name not found> = ArrayList@11246[1] { ResolutionCandidate@4829 }
-    <name not found> = ArrayList@11247[1] { ResolutionCandidate@1901 }
-    <name not found> = ArrayList@11248[1] { ResolutionCandidate@2444 }
-    <name not found> = ArrayList@11249[1] { ResolutionCandidate@797 }
-    <name not found> = ArrayList@11250[1] { ResolutionCandidate@7232 }
-    <name not found> = ArrayList@11251[1] { ResolutionCandidate@6488 }
-    <name not found> = ArrayList@11252[1] { ResolutionCandidate@5039 }
-    <name not found> = ArrayList@11253[1] { ResolutionCandidate@6053 }
-    <name not found> = ArrayList@11254[1] { ResolutionCandidate@5972 }
-    <name not found> = ArrayList@11255[1] { ResolutionCandidate@3122 }
-    <name not found> = ArrayList@11256[1] { ResolutionCandidate@2546 }
-    <name not found> = ArrayList@11257[1] { ResolutionCandidate@647 }
-    <name not found> = ArrayList@11258[1] { ResolutionCandidate@5969 }
-    <name not found> = ArrayList@11259[1] { ResolutionCandidate@5240 }
-    <name not found> = ArrayList@11260[1] { ResolutionCandidate@7667 }
-    <name not found> = ArrayList@11261[1] { ResolutionCandidate@6092 }
-    <name not found> = ArrayList@11262[1] { ResolutionCandidate@7304 }
-    <name not found> = ArrayList@11263[1] { ResolutionCandidate@3722 }
-    <name not found> = ArrayList@11264[1] { ResolutionCandidate@1778 }
-    <name not found> = ArrayList@11265[1] { ResolutionCandidate@794 }
-    <name not found> = ArrayList@11266[1] { ResolutionCandidate@5654 }
-    <name not found> = ArrayList@11267[1] { ResolutionCandidate@6767 }
-    <name not found> = ArrayList@11268[1] { ResolutionCandidate@6704 }
-    <name not found> = ArrayList@11269[1] { ResolutionCandidate@5303 }
-    <name not found> = ArrayList@11270[1] { ResolutionCandidate@6758 }
-    <name not found> = ArrayList@11271[1] { ResolutionCandidate@3854 }
-    <name not found> = ArrayList@11272[1] { ResolutionCandidate@2789 }
-    <name not found> = ArrayList@11273[1] { ResolutionCandidate@1550 }
-    <name not found> = ArrayList@11274[1] { ResolutionCandidate@6905 }
-    <name not found> = ArrayList@11275[1] { ResolutionCandidate@5579 }
-    <name not found> = ArrayList@11276[1] { ResolutionCandidate@6524 }
-    <name not found> = ArrayList@11277[1] { ResolutionCandidate@6494 }
-    <name not found> = ArrayList@11278[1] { ResolutionCandidate@7439 }
-    <name not found> = ArrayList@11279[1] { ResolutionCandidate@2486 }
-    <name not found> = ArrayList@11280[1] { ResolutionCandidate@3809 }
-    <name not found> = ArrayList@11281[1] { ResolutionCandidate@1652 }
-    <name not found> = ArrayList@11282[1] { ResolutionCandidate@1439 }
-    <name not found> = ArrayList@11283[1] { ResolutionCandidate@6953 }
-    <name not found> = ArrayList@11284[1] { ResolutionCandidate@6566 }
-    <name not found> = ArrayList@11285[1] { ResolutionCandidate@2264 }
-    <name not found> = ArrayList@11286[1] { ResolutionCandidate@2369 }
-    <name not found> = ArrayList@11287[1] { ResolutionCandidate@2519 }
-    <name not found> = ArrayList@11288[1] { ResolutionCandidate@1301 }
-    <name not found> = ArrayList@11289[1] { ResolutionCandidate@5219 }
-    <name not found> = ArrayList@11290[1] { ResolutionCandidate@6149 }
-    <name not found> = ArrayList@11291[1] { ResolutionCandidate@3923 }
-    <name not found> = ArrayList@11292[1] { ResolutionCandidate@4478 }
-    <name not found> = ArrayList@11293[1] { ResolutionCandidate@3536 }
-    <name not found> = ArrayList@11294[1] { ResolutionCandidate@1079 }
-    <name not found> = ArrayList@11295[1] { ResolutionCandidate@4988 }
-    <name not found> = ArrayList@11296[1] { ResolutionCandidate@7022 }
-    <name not found> = ArrayList@11297[1] { ResolutionCandidate@4280 }
-    <name not found> = ArrayList@11298[1] { ResolutionCandidate@3695 }
-    <name not found> = ArrayList@11299[1] { ResolutionCandidate@1121 }
-    <name not found> = ArrayList@11300[1] { ResolutionCandidate@6182 }
-    <name not found> = ArrayList@11301[1] { ResolutionCandidate@7082 }
-    <name not found> = ArrayList@11302[1] { ResolutionCandidate@6266 }
-    <name not found> = ArrayList@11303[1] { ResolutionCandidate@5756 }
-    <name not found> = ArrayList@11304[1] { ResolutionCandidate@6224 }
-    <name not found> = ArrayList@11305[1] { ResolutionCandidate@2678 }
-    <name not found> = ArrayList@11306[1] { ResolutionCandidate@1763 }
-    <name not found> = ArrayList@11307[1] { ResolutionCandidate@1007 }
-    <name not found> = ArrayList@11308[1] { ResolutionCandidate@5999 }
-    <name not found> = ArrayList@11309[1] { ResolutionCandidate@6317 }
-    <name not found> = ArrayList@11310[1] { ResolutionCandidate@5981 }
-    <name not found> = ArrayList@11311[1] { ResolutionCandidate@5858 }
-    <name not found> = ArrayList@11312[1] { ResolutionCandidate@6152 }
-    <name not found> = ArrayList@11313[1] { ResolutionCandidate@3191 }
-    <name not found> = ArrayList@11314[1] { ResolutionCandidate@1958 }
-    <name not found> = ArrayList@11315[1] { ResolutionCandidate@713 }
-    <name not found> = ArrayList@11316[1] { ResolutionCandidate@6038 }
-    <name not found> = ArrayList@11317[1] { ResolutionCandidate@4556 }
-    <name not found> = ArrayList@11318[1] { ResolutionCandidate@5696 }
-    <name not found> = ArrayList@11319[1] { ResolutionCandidate@5675 }
-    <name not found> = ArrayList@11320[1] { ResolutionCandidate@5012 }
-    <name not found> = ArrayList@11321[1] { ResolutionCandidate@2930 }
-    <name not found> = ArrayList@11322[1] { ResolutionCandidate@2666 }
-    <name not found> = ArrayList@11323[1] { ResolutionCandidate@1148 }
-    <name not found> = ArrayList@11324[1] { ResolutionCandidate@5420 }
-    <name not found> = ArrayList@11325[1] { ResolutionCandidate@6680 }
-    <name not found> = ArrayList@11326[1] { ResolutionCandidate@5486 }
-    <name not found> = ArrayList@11327[1] { ResolutionCandidate@4733 }
-    <name not found> = ArrayList@11328[1] { ResolutionCandidate@5540 }
-    <name not found> = ArrayList@11329[1] { ResolutionCandidate@5507 }
-    <name not found> = ArrayList@11330[1] { ResolutionCandidate@4019 }
-    <name not found> = ArrayList@11331[1] { ResolutionCandidate@3743 }
-    <name not found> = ArrayList@11332[1] { ResolutionCandidate@353 }
-    <name not found> = ArrayList@11333[1] { ResolutionCandidate@4736 }
-    <name not found> = ArrayList@11334[1] { ResolutionCandidate@4706 }
-    <name not found> = ArrayList@11335[1] { ResolutionCandidate@4709 }
-    <name not found> = ArrayList@11336[1] { ResolutionCandidate@6821 }
-    <name not found> = ArrayList@11337[1] { ResolutionCandidate@5966 }
-    <name not found> = ArrayList@11338[1] { ResolutionCandidate@2558 }
-    <name not found> = ArrayList@11339[1] { ResolutionCandidate@4052 }
-    <name not found> = ArrayList@11340[1] { ResolutionCandidate@3947 }
-    <name not found> = ArrayList@11341[1] { ResolutionCandidate@1067 }
-    <name not found> = ArrayList@11342[1] { ResolutionCandidate@6581 }
-    <name not found> = ArrayList@11343[1] { ResolutionCandidate@7337 }
-    <name not found> = ArrayList@11344[1] { ResolutionCandidate@2345 }
-    <name not found> = ArrayList@11345[1] { ResolutionCandidate@1790 }
-    <name not found> = ArrayList@11346[1] { ResolutionCandidate@2714 }
-    <name not found> = ArrayList@11347[1] { ResolutionCandidate@347 }
-    <name not found> = ArrayList@11348[1] { ResolutionCandidate@5090 }
-    <name not found> = ArrayList@11349[1] { ResolutionCandidate@5405 }
-    <name not found> = ArrayList@11350[1] { ResolutionCandidate@3380 }
-    <name not found> = ArrayList@11351[1] { ResolutionCandidate@2624 }
-    <name not found> = ArrayList@11352[1] { ResolutionCandidate@1844 }
-    <name not found> = ArrayList@11353[1] { ResolutionCandidate@833 }
-    <name not found> = ArrayList@11354[1] { ResolutionCandidate@6086 }
-    <name not found> = ArrayList@11355[1] { ResolutionCandidate@4700 }
-    <name not found> = ArrayList@11356[1] { ResolutionCandidate@4211 }
-    <name not found> = ArrayList@11357[1] { ResolutionCandidate@2219 }
-    <name not found> = ArrayList@11358[1] { ResolutionCandidate@1253 }
-    <name not found> = ArrayList@11359[1] { ResolutionCandidate@7625 }
-    <name not found> = ArrayList@11360[1] { ResolutionCandidate@6293 }
-    <name not found> = ArrayList@11361[1] { ResolutionCandidate@4742 }
-    <name not found> = ArrayList@11362[1] { ResolutionCandidate@6728 }
-    <name not found> = ArrayList@11363[1] { ResolutionCandidate@5957 }
-    <name not found> = ArrayList@11364[1] { ResolutionCandidate@3551 }
-    <name not found> = ArrayList@11365[1] { ResolutionCandidate@3407 }
-    <name not found> = ArrayList@11366[1] { ResolutionCandidate@1385 }
-    <name not found> = ArrayList@11367[1] { ResolutionCandidate@5096 }
-    <name not found> = ArrayList@11368[1] { ResolutionCandidate@5009 }
-    <name not found> = ArrayList@11369[1] { ResolutionCandidate@6119 }
-    <name not found> = ArrayList@11370[1] { ResolutionCandidate@5435 }
-    <name not found> = ArrayList@11371[1] { ResolutionCandidate@5393 }
-    <name not found> = ArrayList@11372[1] { ResolutionCandidate@2972 }
-    <name not found> = ArrayList@11373[1] { ResolutionCandidate@3671 }
-    <name not found> = ArrayList@11374[1] { ResolutionCandidate@707 }
-    <name not found> = ArrayList@11375[1] { ResolutionCandidate@4604 }
-    <name not found> = ArrayList@11376[1] { ResolutionCandidate@5714 }
-    <name not found> = ArrayList@11377[1] { ResolutionCandidate@5945 }
-    <name not found> = ArrayList@11378[1] { ResolutionCandidate@6569 }
-    <name not found> = ArrayList@11379[1] { ResolutionCandidate@4835 }
-    <name not found> = ArrayList@11380[1] { ResolutionCandidate@3443 }
-    <name not found> = ArrayList@11381[1] { ResolutionCandidate@3533 }
-    <name not found> = ArrayList@11382[1] { ResolutionCandidate@1460 }
-    <name not found> = ArrayList@11383[1] { ResolutionCandidate@7103 }
-    <name not found> = ArrayList@11384[1] { ResolutionCandidate@5267 }
-    <name not found> = ArrayList@11385[1] { ResolutionCandidate@4697 }
-    <name not found> = ArrayList@11386[1] { ResolutionCandidate@4562 }
-    <name not found> = ArrayList@11387[1] { ResolutionCandidate@6602 }
-    <name not found> = ArrayList@11388[1] { ResolutionCandidate@5084 }
-    <name not found> = ArrayList@11389[1] { ResolutionCandidate@3353 }
-    <name not found> = ArrayList@11390[1] { ResolutionCandidate@2918 }
-    <name not found> = ArrayList@11391[1] { ResolutionCandidate@1355 }
-    <name not found> = ArrayList@11392[1] { ResolutionCandidate@5114 }
-    <name not found> = ArrayList@11393[1] { ResolutionCandidate@7460 }
-    <name not found> = ArrayList@11394[1] { ResolutionCandidate@5774 }
-    <name not found> = ArrayList@11395[1] { ResolutionCandidate@7361 }
-    <name not found> = ArrayList@11396[1] { ResolutionCandidate@7340 }
-    <name not found> = ArrayList@11397[1] { ResolutionCandidate@7628 }
-    <name not found> = ArrayList@11398[1] { ResolutionCandidate@4469 }
-    <name not found> = ArrayList@11399[1] { ResolutionCandidate@1946 }
-    <name not found> = ArrayList@11400[1] { ResolutionCandidate@1853 }
-    <name not found> = ArrayList@11401[1] { ResolutionCandidate@1412 }
-    <name not found> = ArrayList@11402[1] { ResolutionCandidate@6386 }
-    <name not found> = ArrayList@11403[1] { ResolutionCandidate@7517 }
-    <name not found> = ArrayList@11404[1] { ResolutionCandidate@4646 }
-    <name not found> = ArrayList@11405[1] { ResolutionCandidate@3527 }
-    <name not found> = ArrayList@11406[1] { ResolutionCandidate@4208 }
-    <name not found> = ArrayList@11407[1] { ResolutionCandidate@770 }
-    <name not found> = ArrayList@11408[1] { ResolutionCandidate@4838 }
-    <name not found> = ArrayList@11409[1] { ResolutionCandidate@5165 }
-    <name not found> = ArrayList@11410[1] { ResolutionCandidate@6422 }
-    <name not found> = ArrayList@11411[1] { ResolutionCandidate@6305 }
-    <name not found> = ArrayList@11412[1] { ResolutionCandidate@7631 }
-    <name not found> = ArrayList@11413[1] { ResolutionCandidate@2048 }
-    <name not found> = ArrayList@11414[1] { ResolutionCandidate@2201 }
-    <name not found> = ArrayList@11415[1] { ResolutionCandidate@3641 }
-    <name not found> = ArrayList@11416[1] { ResolutionCandidate@635 }
-    <name not found> = ArrayList@11417[1] { ResolutionCandidate@6923 }
-    <name not found> = ArrayList@11418[1] { ResolutionCandidate@5975 }
-    <name not found> = ArrayList@11419[1] { ResolutionCandidate@2606 }
-    <name not found> = ArrayList@11420[1] { ResolutionCandidate@4253 }
-    <name not found> = ArrayList@11421[1] { ResolutionCandidate@4271 }
-    <name not found> = ArrayList@11422[1] { ResolutionCandidate@815 }
-    <name not found> = ArrayList@11423[1] { ResolutionCandidate@7418 }
-    <name not found> = ArrayList@11424[1] { ResolutionCandidate@5177 }
-    <name not found> = ArrayList@11425[1] { ResolutionCandidate@2099 }
-    <name not found> = ArrayList@11426[1] { ResolutionCandidate@2012 }
-    <name not found> = ArrayList@11427[1] { ResolutionCandidate@3284 }
-    <name not found> = ArrayList@11428[1] { ResolutionCandidate@977 }
-    <name not found> = ArrayList@11429[1] { ResolutionCandidate@6146 }
-    <name not found> = ArrayList@11430[1] { ResolutionCandidate@6557 }
-    <name not found> = ArrayList@11431[1] { ResolutionCandidate@1835 }
-    <name not found> = ArrayList@11432[1] { ResolutionCandidate@2327 }
-    <name not found> = ArrayList@11433[1] { ResolutionCandidate@1487 }
-    <name not found> = ArrayList@11434[1] { ResolutionCandidate@5228 }
-    <name not found> = ArrayList@11435[1] { ResolutionCandidate@4856 }
-    <name not found> = ArrayList@11436[1] { ResolutionCandidate@4616 }
-    <name not found> = ArrayList@11437[1] { ResolutionCandidate@6545 }
-    <name not found> = ArrayList@11438[1] { ResolutionCandidate@5513 }
-    <name not found> = ArrayList@11439[1] { ResolutionCandidate@4175 }
-    <name not found> = ArrayList@11440[1] { ResolutionCandidate@4199 }
-    <name not found> = ArrayList@11441[1] { ResolutionCandidate@1445 }
-    <name not found> = ArrayList@11442[1] { ResolutionCandidate@4595 }
-    <name not found> = ArrayList@11443[1] { ResolutionCandidate@6761 }
-    <name not found> = ArrayList@11444[1] { ResolutionCandidate@5948 }
-    <name not found> = ArrayList@11445[1] { ResolutionCandidate@6281 }
-    <name not found> = ArrayList@11446[1] { ResolutionCandidate@7247 }
-    <name not found> = ArrayList@11447[1] { ResolutionCandidate@2729 }
-    <name not found> = ArrayList@11448[1] { ResolutionCandidate@4046 }
-    <name not found> = ArrayList@11449[1] { ResolutionCandidate@1337 }
-    <name not found> = ArrayList@11450[1] { ResolutionCandidate@4985 }
-    <name not found> = ArrayList@11451[1] { ResolutionCandidate@5222 }
-    <name not found> = ArrayList@11452[1] { ResolutionCandidate@4910 }
-    <name not found> = ArrayList@11453[1] { ResolutionCandidate@5282 }
-    <name not found> = ArrayList@11454[1] { ResolutionCandidate@5921 }
-    <name not found> = ArrayList@11455[1] { ResolutionCandidate@3701 }
-    <name not found> = ArrayList@11456[1] { ResolutionCandidate@1937 }
-    <name not found> = ArrayList@11457[1] { ResolutionCandidate@2456 }
-    <name not found> = ArrayList@11458[1] { ResolutionCandidate@752 }
-    <name not found> = ArrayList@11459[1] { ResolutionCandidate@7058 }
-    <name not found> = ArrayList@11460[1] { ResolutionCandidate@7355 }
-    <name not found> = ArrayList@11461[1] { ResolutionCandidate@2900 }
-    <name not found> = ArrayList@11462[1] { ResolutionCandidate@1694 }
-    <name not found> = ArrayList@11463[1] { ResolutionCandidate@3119 }
-    <name not found> = ArrayList@11464[1] { ResolutionCandidate@872 }
-    <name not found> = ArrayList@11465[1] { ResolutionCandidate@4802 }
-    <name not found> = ArrayList@11466[1] { ResolutionCandidate@6698 }
-    <name not found> = ArrayList@11467[1] { ResolutionCandidate@4202 }
-    <name not found> = ArrayList@11468[1] { ResolutionCandidate@2945 }
-    <name not found> = ArrayList@11469[1] { ResolutionCandidate@3767 }
-    <name not found> = ArrayList@11470[1] { ResolutionCandidate@1325 }
-    <name not found> = ArrayList@11471[1] { ResolutionCandidate@5558 }
-    <name not found> = ArrayList@11472[1] { ResolutionCandidate@6578 }
-    <name not found> = ArrayList@11473[1] { ResolutionCandidate@2009 }
-    <name not found> = ArrayList@11474[1] { ResolutionCandidate@4205 }
-    <name not found> = ArrayList@11475[1] { ResolutionCandidate@4421 }
-    <name not found> = ArrayList@11476[1] { ResolutionCandidate@1214 }
-    <name not found> = ArrayList@11477[1] { ResolutionCandidate@7550 }
-    <name not found> = ArrayList@11478[1] { ResolutionCandidate@5750 }
-    <name not found> = ArrayList@11479[1] { ResolutionCandidate@3659 }
-    <name not found> = ArrayList@11480[1] { ResolutionCandidate@4130 }
-    <name not found> = ArrayList@11481[1] { ResolutionCandidate@1580 }
-    <name not found> = ArrayList@11482[1] { ResolutionCandidate@1340 }
-    <name not found> = ArrayList@11483[1] { ResolutionCandidate@7622 }
-    <name not found> = ArrayList@11484[1] { ResolutionCandidate@6674 }
-    <name not found> = ArrayList@11485[1] { ResolutionCandidate@3779 }
-    <name not found> = ArrayList@11486[1] { ResolutionCandidate@2576 }
-    <name not found> = ArrayList@11487[1] { ResolutionCandidate@2105 }
-    <name not found> = ArrayList@11488[1] { ResolutionCandidate@950 }
-    <name not found> = ArrayList@11489[1] { ResolutionCandidate@6659 }
-    <name not found> = ArrayList@11490[1] { ResolutionCandidate@5348 }
-    <name not found> = ArrayList@11491[1] { ResolutionCandidate@4121 }
-    <name not found> = ArrayList@11492[1] { ResolutionCandidate@3425 }
-    <name not found> = ArrayList@11493[1] { ResolutionCandidate@4109 }
-    <name not found> = ArrayList@11494[1] { ResolutionCandidate@1046 }
-    <name not found> = ArrayList@11495[1] { ResolutionCandidate@4712 }
-    <name not found> = ArrayList@11496[1] { ResolutionCandidate@6272 }
-    <name not found> = ArrayList@11497[1] { ResolutionCandidate@3683 }
-    <name not found> = ArrayList@11498[1] { ResolutionCandidate@2843 }
-    <name not found> = ArrayList@11499[1] { ResolutionCandidate@578 }
-    <name not found> = ArrayList@11500[1] { ResolutionCandidate@5954 }
-    <name not found> = ArrayList@11501[1] { ResolutionCandidate@5366 }
-    <name not found> = ArrayList@11502[1] { ResolutionCandidate@6125 }
-    <name not found> = ArrayList@11503[1] { ResolutionCandidate@4928 }
-    <name not found> = ArrayList@11504[1] { ResolutionCandidate@7019 }
-    <name not found> = ArrayList@11505[1] { ResolutionCandidate@1766 }
-    <name not found> = ArrayList@11506[1] { ResolutionCandidate@3677 }
-    <name not found> = ArrayList@11507[1] { ResolutionCandidate@2855 }
-    <name not found> = ArrayList@11508[1] { ResolutionCandidate@1313 }
-    <name not found> = ArrayList@11509[1] { ResolutionCandidate@5852 }
-    <name not found> = ArrayList@11510[1] { ResolutionCandidate@6587 }
-    <name not found> = ArrayList@11511[1] { ResolutionCandidate@1721 }
-    <name not found> = ArrayList@11512[1] { ResolutionCandidate@1994 }
-    <name not found> = ArrayList@11513[1] { ResolutionCandidate@2339 }
-    <name not found> = ArrayList@11514[1] { ResolutionCandidate@1499 }
-    <name not found> = ArrayList@11515[1] { ResolutionCandidate@5552 }
-    <name not found> = ArrayList@11516[1] { ResolutionCandidate@6140 }
-    <name not found> = ArrayList@11517[1] { ResolutionCandidate@4412 }
-    <name not found> = ArrayList@11518[1] { ResolutionCandidate@4022 }
-    <name not found> = ArrayList@11519[1] { ResolutionCandidate@2939 }
-    <name not found> = ArrayList@11520[1] { ResolutionCandidate@536 }
-    <name not found> = ArrayList@11521[1] { ResolutionCandidate@6275 }
-    <name not found> = ArrayList@11522[1] { ResolutionCandidate@6677 }
-    <name not found> = ArrayList@11523[1] { ResolutionCandidate@3281 }
-    <name not found> = ArrayList@11524[1] { ResolutionCandidate@2780 }
-    <name not found> = ArrayList@11525[1] { ResolutionCandidate@1418 }
-    <name not found> = ArrayList@11526[1] { ResolutionCandidate@5744 }
-    <name not found> = ArrayList@11527[1] { ResolutionCandidate@7136 }
-    <name not found> = ArrayList@11528[1] { ResolutionCandidate@6392 }
-    <name not found> = ArrayList@11529[1] { ResolutionCandidate@7454 }
-    <name not found> = ArrayList@11530[1] { ResolutionCandidate@4889 }
-    <name not found> = ArrayList@11531[1] { ResolutionCandidate@4274 }
-    <name not found> = ArrayList@11532[1] { ResolutionCandidate@2501 }
-    <name not found> = ArrayList@11533[1] { ResolutionCandidate@638 }
-    <name not found> = ArrayList@11534[1] { ResolutionCandidate@5792 }
-    <name not found> = ArrayList@11535[1] { ResolutionCandidate@7277 }
-    <name not found> = ArrayList@11536[1] { ResolutionCandidate@7250 }
-    <name not found> = ArrayList@11537[1] { ResolutionCandidate@5843 }
-    <name not found> = ArrayList@11538[1] { ResolutionCandidate@5876 }
-    <name not found> = ArrayList@11539[1] { ResolutionCandidate@4124 }
-    <name not found> = ArrayList@11540[1] { ResolutionCandidate@4391 }
-    <name not found> = ArrayList@11541[1] { ResolutionCandidate@1505 }
-    <name not found> = ArrayList@11542[1] { ResolutionCandidate@4892 }
-    <name not found> = ArrayList@11543[1] { ResolutionCandidate@5444 }
-    <name not found> = ArrayList@11544[1] { ResolutionCandidate@7076 }
-    <name not found> = ArrayList@11545[1] { ResolutionCandidate@5753 }
-    <name not found> = ArrayList@11546[1] { ResolutionCandidate@5162 }
-    <name not found> = ArrayList@11547[1] { ResolutionCandidate@2975 }
-    <name not found> = ArrayList@11548[1] { ResolutionCandidate@2831 }
-    <name not found> = ArrayList@11549[1] { ResolutionCandidate@1406 }
-    <name not found> = ArrayList@11550[1] { ResolutionCandidate@6653 }
-    <name not found> = ArrayList@11551[1] { ResolutionCandidate@5249 }
-    <name not found> = ArrayList@11552[1] { ResolutionCandidate@6608 }
-    <name not found> = ArrayList@11553[1] { ResolutionCandidate@4724 }
-    <name not found> = ArrayList@11554[1] { ResolutionCandidate@5684 }
-    <name not found> = ArrayList@11555[1] { ResolutionCandidate@2372 }
-    <name not found> = ArrayList@11556[1] { ResolutionCandidate@2969 }
-    <name not found> = ArrayList@11557[1] { ResolutionCandidate@2867 }
-    <name not found> = ArrayList@11558[1] { ResolutionCandidate@665 }
-    <name not found> = ArrayList@11559[1] { ResolutionCandidate@7331 }
-    <name not found> = ArrayList@11560[1] { ResolutionCandidate@4949 }
-    <name not found> = ArrayList@11561[1] { ResolutionCandidate@2450 }
-    <name not found> = ArrayList@11562[1] { ResolutionCandidate@1829 }
-    <name not found> = ArrayList@11563[1] { ResolutionCandidate@3254 }
-    <name not found> = ArrayList@11564[1] { ResolutionCandidate@728 }
-    <name not found> = ArrayList@11565[1] { ResolutionCandidate@7484 }
-    <name not found> = ArrayList@11566[1] { ResolutionCandidate@4832 }
-    <name not found> = ArrayList@11567[1] { ResolutionCandidate@1997 }
-    <name not found> = ArrayList@11568[1] { ResolutionCandidate@3725 }
-    <name not found> = ArrayList@11569[1] { ResolutionCandidate@2114 }
-    <name not found> = ArrayList@11570[1] { ResolutionCandidate@1097 }
-    <name not found> = ArrayList@11571[1] { ResolutionCandidate@5285 }
-    <name not found> = ArrayList@11572[1] { ResolutionCandidate@7178 }
-    <name not found> = ArrayList@11573[1] { ResolutionCandidate@2225 }
-    <name not found> = ArrayList@11574[1] { ResolutionCandidate@1886 }
-    <name not found> = ArrayList@11575[1] { ResolutionCandidate@1241 }
-    <name not found> = ArrayList@11576[1] { ResolutionCandidate@4541 }
-    <name not found> = ArrayList@11577[1] { ResolutionCandidate@7556 }
-    <name not found> = ArrayList@11578[1] { ResolutionCandidate@4643 }
-    <name not found> = ArrayList@11579[1] { ResolutionCandidate@7154 }
-    <name not found> = ArrayList@11580[1] { ResolutionCandidate@4844 }
-    <name not found> = ArrayList@11581[1] { ResolutionCandidate@1643 }
-    <name not found> = ArrayList@11582[1] { ResolutionCandidate@2597 }
-    <name not found> = ArrayList@11583[1] { ResolutionCandidate@854 }
-    <name not found> = ArrayList@11584[1] { ResolutionCandidate@5867 }
-    <name not found> = ArrayList@11585[1] { ResolutionCandidate@5531 }
-    <name not found> = ArrayList@11586[1] { ResolutionCandidate@6713 }
-    <name not found> = ArrayList@11587[1] { ResolutionCandidate@7205 }
-    <name not found> = ArrayList@11588[1] { ResolutionCandidate@4664 }
-    <name not found> = ArrayList@11589[1] { ResolutionCandidate@3785 }
-    <name not found> = ArrayList@11590[1] { ResolutionCandidate@3977 }
-    <name not found> = ArrayList@11591[1] { ResolutionCandidate@971 }
-    <name not found> = ArrayList@11592[1] { ResolutionCandidate@7676 }
-    <name not found> = ArrayList@11593[1] { ResolutionCandidate@7037 }
-    <name not found> = ArrayList@11594[1] { ResolutionCandidate@6614 }
-    <name not found> = ArrayList@11595[1] { ResolutionCandidate@7655 }
-    <name not found> = ArrayList@11596[1] { ResolutionCandidate@5924 }
-    <name not found> = ArrayList@11597[1] { ResolutionCandidate@2312 }
-    <name not found> = ArrayList@11598[1] { ResolutionCandidate@2849 }
-    <name not found> = ArrayList@11599[1] { ResolutionCandidate@509 }
-    <name not found> = ArrayList@11600[1] { ResolutionCandidate@5108 }
-    <name not found> = ArrayList@11601[1] { ResolutionCandidate@5213 }
-    <name not found> = ArrayList@11602[1] { ResolutionCandidate@5411 }
-    <name not found> = ArrayList@11603[1] { ResolutionCandidate@6155 }
-    <name not found> = ArrayList@11604[1] { ResolutionCandidate@7310 }
-    <name not found> = ArrayList@11605[1] { ResolutionCandidate@3599 }
-    <name not found> = ArrayList@11606[1] { ResolutionCandidate@2753 }
-    <name not found> = ArrayList@11607[1] { ResolutionCandidate@3692 }
-    <name not found> = ArrayList@11608[1] { ResolutionCandidate@1409 }
-    <name not found> = ArrayList@11609[1] { ResolutionCandidate@6221 }
-    <name not found> = ArrayList@11610[1] { ResolutionCandidate@4589 }
-    <name not found> = ArrayList@11611[1] { ResolutionCandidate@4037 }
-    <name not found> = ArrayList@11612[1] { ResolutionCandidate@3803 }
-    <name not found> = ArrayList@11613[1] { ResolutionCandidate@3965 }
-    <name not found> = ArrayList@11614[1] { ResolutionCandidate@425 }
-    <name not found> = ArrayList@11615[1] { ResolutionCandidate@5501 }
-    <name not found> = ArrayList@11616[1] { ResolutionCandidate@7565 }
-    <name not found> = ArrayList@11617[1] { ResolutionCandidate@2030 }
-    <name not found> = ArrayList@11618[1] { ResolutionCandidate@2669 }
-    <name not found> = ArrayList@11619[1] { ResolutionCandidate@4103 }
-    <name not found> = ArrayList@11620[1] { ResolutionCandidate@1283 }
-    <name not found> = ArrayList@11621[1] { ResolutionCandidate@7589 }
-    <name not found> = ArrayList@11622[1] { ResolutionCandidate@4763 }
-    <name not found> = ArrayList@11623[1] { ResolutionCandidate@3311 }
-    <name not found> = ArrayList@11624[1] { ResolutionCandidate@2768 }
-    <name not found> = ArrayList@11625[1] { ResolutionCandidate@1454 }
-    <name not found> = ArrayList@11626[1] { ResolutionCandidate@7325 }
-    <name not found> = ArrayList@11627[1] { ResolutionCandidate@6590 }
-    <name not found> = ArrayList@11628[1] { ResolutionCandidate@5375 }
-    <name not found> = ArrayList@11629[1] { ResolutionCandidate@5027 }
-    <name not found> = ArrayList@11630[1] { ResolutionCandidate@4658 }
-    <name not found> = ArrayList@11631[1] { ResolutionCandidate@1622 }
-    <name not found> = ArrayList@11632[1] { ResolutionCandidate@2690 }
-    <name not found> = ArrayList@11633[1] { ResolutionCandidate@932 }
-    <name not found> = ArrayList@11634[1] { ResolutionCandidate@5846 }
-    <name not found> = ArrayList@11635[1] { ResolutionCandidate@4976 }
-    <name not found> = ArrayList@11636[1] { ResolutionCandidate@6440 }
-    <name not found> = ArrayList@11637[1] { ResolutionCandidate@6764 }
-    <name not found> = ArrayList@11638[1] { ResolutionCandidate@6572 }
-    <name not found> = ArrayList@11639[1] { ResolutionCandidate@4505 }
-    <name not found> = ArrayList@11640[1] { ResolutionCandidate@2906 }
-    <name not found> = ArrayList@11641[1] { ResolutionCandidate@1295 }
-    <name not found> = ArrayList@11642[1] { ResolutionCandidate@6005 }
-    <name not found> = ArrayList@11643[1] { ResolutionCandidate@6404 }
-    <name not found> = ArrayList@11644[1] { ResolutionCandidate@6209 }
-    <name not found> = ArrayList@11645[1] { ResolutionCandidate@5111 }
-    <name not found> = ArrayList@11646[1] { ResolutionCandidate@6017 }
-    <name not found> = ArrayList@11647[1] { ResolutionCandidate@4232 }
-    <name not found> = ArrayList@11648[1] { ResolutionCandidate@3293 }
-    <name not found> = ArrayList@11649[1] { ResolutionCandidate@1547 }
-    <name not found> = ArrayList@11650[1] { ResolutionCandidate@7535 }
-    <name not found> = ArrayList@11651[1] { ResolutionCandidate@7694 }
-    <name not found> = ArrayList@11652[1] { ResolutionCandidate@4841 }
-    <name not found> = ArrayList@11653[1] { ResolutionCandidate@6473 }
-    <name not found> = ArrayList@11654[1] { ResolutionCandidate@6830 }
-    <name not found> = ArrayList@11655[1] { ResolutionCandidate@3095 }
-    <name not found> = ArrayList@11656[1] { ResolutionCandidate@3338 }
-    <name not found> = ArrayList@11657[1] { ResolutionCandidate@3389 }
-    <name not found> = ArrayList@11658[1] { ResolutionCandidate@518 }
-    <name not found> = ArrayList@11659[1] { ResolutionCandidate@7364 }
-    <name not found> = ArrayList@11660[1] { ResolutionCandidate@6707 }
-    <name not found> = ArrayList@11661[1] { ResolutionCandidate@3437 }
-    <name not found> = ArrayList@11662[1] { ResolutionCandidate@3962 }
-    <name not found> = ArrayList@11663[1] { ResolutionCandidate@2336 }
-    <name not found> = ArrayList@11664[1] { ResolutionCandidate@1106 }
-    <name not found> = ArrayList@11665[1] { ResolutionCandidate@6203 }
-    <name not found> = ArrayList@11666[1] { ResolutionCandidate@6911 }
-    <name not found> = ArrayList@11667[1] { ResolutionCandidate@3959 }
-    <name not found> = ArrayList@11668[1] { ResolutionCandidate@4322 }
-    <name not found> = ArrayList@11669[1] { ResolutionCandidate@3866 }
-    <name not found> = ArrayList@11670[1] { ResolutionCandidate@497 }
-    <name not found> = ArrayList@11671[1] { ResolutionCandidate@5336 }
-    <name not found> = ArrayList@11672[1] { ResolutionCandidate@6482 }
-    <name not found> = ArrayList@11673[1] { ResolutionCandidate@3014 }
-    <name not found> = ArrayList@11674[1] { ResolutionCandidate@4049 }
-    <name not found> = ArrayList@11675[1] { ResolutionCandidate@1361 }
-    <name not found> = ArrayList@11676[1] { ResolutionCandidate@4817 }
-    <name not found> = ArrayList@11677[1] { ResolutionCandidate@4685 }
-    <name not found> = ArrayList@11678[1] { ResolutionCandidate@5186 }
-    <name not found> = ArrayList@11679[1] { ResolutionCandidate@5993 }
-    <name not found> = ArrayList@11680[1] { ResolutionCandidate@7544 }
-    <name not found> = ArrayList@11681[1] { ResolutionCandidate@2636 }
-    <name not found> = ArrayList@11682[1] { ResolutionCandidate@2612 }
-    <name not found> = ArrayList@11683[1] { ResolutionCandidate@539 }
-    <name not found> = ArrayList@11684[1] { ResolutionCandidate@6932 }
-    <name not found> = ArrayList@11685[1] { ResolutionCandidate@4994 }
-    <name not found> = ArrayList@11686[1] { ResolutionCandidate@7679 }
-    <name not found> = ArrayList@11687[1] { ResolutionCandidate@6308 }
-    <name not found> = ArrayList@11688[1] { ResolutionCandidate@5462 }
-    <name not found> = ArrayList@11689[1] { ResolutionCandidate@2126 }
-    <name not found> = ArrayList@11690[1] { ResolutionCandidate@1817 }
-    <name not found> = ArrayList@11691[1] { ResolutionCandidate@383 }
-    <name not found> = ArrayList@11692[1] { ResolutionCandidate@4613 }
-    <name not found> = ArrayList@11693[1] { ResolutionCandidate@6671 }
-    <name not found> = ArrayList@11694[1] { ResolutionCandidate@5912 }
-    <name not found> = ArrayList@11695[1] { ResolutionCandidate@6230 }
-    <name not found> = ArrayList@11696[1] { ResolutionCandidate@6416 }
-    <name not found> = ArrayList@11697[1] { ResolutionCandidate@2027 }
-    <name not found> = ArrayList@11698[1] { ResolutionCandidate@4226 }
-    <name not found> = ArrayList@11699[1] { ResolutionCandidate@2744 }
-    <name not found> = ArrayList@11700[1] { ResolutionCandidate@980 }
-    <name not found> = ArrayList@11701[1] { ResolutionCandidate@5225 }
-    <name not found> = ArrayList@11702[1] { ResolutionCandidate@5198 }
-    <name not found> = ArrayList@11703[1] { ResolutionCandidate@5459 }
-    <name not found> = ArrayList@11704[1] { ResolutionCandidate@3905 }
-    <name not found> = ArrayList@11705[1] { ResolutionCandidate@2237 }
-    <name not found> = ArrayList@11706[1] { ResolutionCandidate@1613 }
-    <name not found> = ArrayList@11707[1] { ResolutionCandidate@551 }
-    <name not found> = ArrayList@11708[1] { ResolutionCandidate@5681 }
-    <name not found> = ArrayList@11709[1] { ResolutionCandidate@6176 }
-    <name not found> = ArrayList@11710[1] { ResolutionCandidate@5288 }
-    <name not found> = ArrayList@11711[1] { ResolutionCandidate@2825 }
-    <name not found> = ArrayList@11712[1] { ResolutionCandidate@4028 }
-    <name not found> = ArrayList@11713[1] { ResolutionCandidate@3980 }
-    <name not found> = ArrayList@11714[1] { ResolutionCandidate@1331 }
-    <name not found> = ArrayList@11715[1] { ResolutionCandidate@5735 }
-    <name not found> = ArrayList@11716[1] { ResolutionCandidate@5243 }
-    <name not found> = ArrayList@11717[1] { ResolutionCandidate@6848 }
-    <name not found> = ArrayList@11718[1] { ResolutionCandidate@1970 }
-    <name not found> = ArrayList@11719[1] { ResolutionCandidate@3263 }
-    <name not found> = ArrayList@11720[1] { ResolutionCandidate@3452 }
-    <name not found> = ArrayList@11721[1] { ResolutionCandidate@1493 }
-    <name not found> = ArrayList@11722[1] { ResolutionCandidate@6506 }
-    <name not found> = ArrayList@11723[1] { ResolutionCandidate@4652 }
-    <name not found> = ArrayList@11724[1] { ResolutionCandidate@6239 }
-    <name not found> = ArrayList@11725[1] { ResolutionCandidate@1649 }
-    <name not found> = ArrayList@11726[1] { ResolutionCandidate@3296 }
-    <name not found> = ArrayList@11727[1] { ResolutionCandidate@2717 }
-    <name not found> = ArrayList@11728[1] { ResolutionCandidate@1250 }
-    <name not found> = ArrayList@11729[1] { ResolutionCandidate@5120 }
-    <name not found> = ArrayList@11730[1] { ResolutionCandidate@6395 }
-    <name not found> = ArrayList@11731[1] { ResolutionCandidate@4982 }
-    <name not found> = ArrayList@11732[1] { ResolutionCandidate@890 }
-    <name not found> = ArrayList@11733[1] { ResolutionCandidate@5564 }
-    <name not found> = ArrayList@11734[1] { ResolutionCandidate@6629 }
-    <name not found> = ArrayList@11735[1] { ResolutionCandidate@6116 }
-    <name not found> = ArrayList@11736[1] { ResolutionCandidate@7553 }
-    <name not found> = ArrayList@11737[1] { ResolutionCandidate@5951 }
-    <name not found> = ArrayList@11738[1] { ResolutionCandidate@5000 }
-    <name not found> = ArrayList@11739[1] { ResolutionCandidate@7016 }
-    <name not found> = ArrayList@11740[1] { ResolutionCandidate@6695 }
-    <name not found> = ArrayList@11741[1] { ResolutionCandidate@4823 }
-    <name not found> = ArrayList@11742[1] { ResolutionCandidate@6920 }
-    <name not found> = ArrayList@11743[6] { ResolutionCandidate@7848, ResolutionCandidate@7849, ResolutionCandidate@7850, ... }
-    <name not found> = ArrayList@11744[6] { ResolutionCandidate@7833, ResolutionCandidate@7834, ResolutionCandidate@7835, ... }
-    <name not found> = ArrayList@11745[6] { ResolutionCandidate@7733, ResolutionCandidate@7734, ResolutionCandidate@7735, ... }
-    <name not found> = ArrayList@11746[6] { ResolutionCandidate@7778, ResolutionCandidate@7779, ResolutionCandidate@7780, ... }
-    <name not found> = ArrayList@11747[6] { ResolutionCandidate@7828, ResolutionCandidate@7829, ResolutionCandidate@7830, ... }
-    <name not found> = ArrayList@11748[6] { ResolutionCandidate@7793, ResolutionCandidate@7794, ResolutionCandidate@7795, ... }
-    <name not found> = ArrayList@11749[6] { ResolutionCandidate@7758, ResolutionCandidate@7759, ResolutionCandidate@7760, ... }
-    <name not found> = ArrayList@11750[6] { ResolutionCandidate@7743, ResolutionCandidate@7744, ResolutionCandidate@7745, ... }
-    <name not found> = ArrayList@11751[6] { ResolutionCandidate@7803, ResolutionCandidate@7804, ResolutionCandidate@7805, ... }
-    <name not found> = ArrayList@11752[6] { ResolutionCandidate@7843, ResolutionCandidate@7844, ResolutionCandidate@7845, ... }
-    <name not found> = ArrayList@11753[6] { ResolutionCandidate@7818, ResolutionCandidate@7819, ResolutionCandidate@7820, ... }
-    <name not found> = ArrayList@11754[6] { ResolutionCandidate@7838, ResolutionCandidate@7839, ResolutionCandidate@7840, ... }
-    <name not found> = ArrayList@11755[6] { ResolutionCandidate@7813, ResolutionCandidate@7814, ResolutionCandidate@7815, ... }
-    <name not found> = ArrayList@11756[6] { ResolutionCandidate@7768, ResolutionCandidate@7769, ResolutionCandidate@7770, ... }
-    <name not found> = ArrayList@11757[6] { ResolutionCandidate@7823, ResolutionCandidate@7824, ResolutionCandidate@7825, ... }
-    <name not found> = ArrayList@11758[6] { ResolutionCandidate@7808, ResolutionCandidate@7809, ResolutionCandidate@7810, ... }
-    <name not found> = ArrayList@11759[6] { ResolutionCandidate@7763, ResolutionCandidate@7764, ResolutionCandidate@7765, ... }
-    <name not found> = ArrayList@11760[6] { ResolutionCandidate@7753, ResolutionCandidate@7754, ResolutionCandidate@7755, ... }
-    <name not found> = ArrayList@11761[6] { ResolutionCandidate@7773, ResolutionCandidate@7774, ResolutionCandidate@7775, ... }
-    <name not found> = ArrayList@11762[6] { ResolutionCandidate@7738, ResolutionCandidate@7739, ResolutionCandidate@7740, ... }
-    <name not found> = ArrayList@11763[6] { ResolutionCandidate@7788, ResolutionCandidate@7789, ResolutionCandidate@7790, ... }
-    <name not found> = ArrayList@11764[6] { ResolutionCandidate@7798, ResolutionCandidate@7799, ResolutionCandidate@7800, ... }
-    <name not found> = ArrayList@11765[6] { ResolutionCandidate@7748, ResolutionCandidate@7749, ResolutionCandidate@7750, ... }
-    <name not found> = ArrayList@11766[6] { ResolutionCandidate@7783, ResolutionCandidate@7784, ResolutionCandidate@7785, ... }
-    <name not found> = ArrayList@11767[7] { ResolutionCandidate@8253, ResolutionCandidate@8254, ResolutionCandidate@8255, ... }
-    <name not found> = ArrayList@11768[7] { ResolutionCandidate@8538, ResolutionCandidate@8539, ResolutionCandidate@8540, ... }
-    <name not found> = ArrayList@11769[7] { ResolutionCandidate@8723, ResolutionCandidate@8724, ResolutionCandidate@8725, ... }
-    <name not found> = ArrayList@11770[7] { ResolutionCandidate@8143, ResolutionCandidate@8144, ResolutionCandidate@8145, ... }
-    <name not found> = ArrayList@11771[7] { ResolutionCandidate@8168, ResolutionCandidate@8169, ResolutionCandidate@8170, ... }
-    <name not found> = ArrayList@11772[7] { ResolutionCandidate@7853, ResolutionCandidate@7854, ResolutionCandidate@7855, ... }
-    <name not found> = ArrayList@11773[7] { ResolutionCandidate@8363, ResolutionCandidate@8364, ResolutionCandidate@8365, ... }
-    <name not found> = ArrayList@11774[7] { ResolutionCandidate@8558, ResolutionCandidate@8559, ResolutionCandidate@8560, ... }
-    <name not found> = ArrayList@11775[7] { ResolutionCandidate@8383, ResolutionCandidate@8384, ResolutionCandidate@8385, ... }
-    <name not found> = ArrayList@11776[7] { ResolutionCandidate@8413, ResolutionCandidate@8414, ResolutionCandidate@8415, ... }
-    <name not found> = ArrayList@11777[7] { ResolutionCandidate@8328, ResolutionCandidate@8329, ResolutionCandidate@8330, ... }
-    <name not found> = ArrayList@11778[7] { ResolutionCandidate@8283, ResolutionCandidate@8284, ResolutionCandidate@8285, ... }
-    <name not found> = ArrayList@11779[7] { ResolutionCandidate@7983, ResolutionCandidate@7984, ResolutionCandidate@7985, ... }
-    <name not found> = ArrayList@11780[7] { ResolutionCandidate@8408, ResolutionCandidate@8409, ResolutionCandidate@8410, ... }
-    <name not found> = ArrayList@11781[7] { ResolutionCandidate@8263, ResolutionCandidate@8264, ResolutionCandidate@8265, ... }
-    <name not found> = ArrayList@11782[7] { ResolutionCandidate@7958, ResolutionCandidate@7959, ResolutionCandidate@7960, ... }
-    <name not found> = ArrayList@11783[7] { ResolutionCandidate@8078, ResolutionCandidate@8079, ResolutionCandidate@8080, ... }
-    <name not found> = ArrayList@11784[7] { ResolutionCandidate@7993, ResolutionCandidate@7994, ResolutionCandidate@7995, ... }
-    <name not found> = ArrayList@11785[7] { ResolutionCandidate@8678, ResolutionCandidate@8679, ResolutionCandidate@8680, ... }
-    <name not found> = ArrayList@11786[7] { ResolutionCandidate@7953, ResolutionCandidate@7954, ResolutionCandidate@7955, ... }
-    <name not found> = ArrayList@11787[7] { ResolutionCandidate@8288, ResolutionCandidate@8289, ResolutionCandidate@8290, ... }
-    <name not found> = ArrayList@11788[7] { ResolutionCandidate@8233, ResolutionCandidate@8234, ResolutionCandidate@8235, ... }
-    <name not found> = ArrayList@11789[7] { ResolutionCandidate@8533, ResolutionCandidate@8534, ResolutionCandidate@8535, ... }
-    <name not found> = ArrayList@11790[7] { ResolutionCandidate@8493, ResolutionCandidate@8494, ResolutionCandidate@8495, ... }
-    <name not found> = ArrayList@11791[7] { ResolutionCandidate@8228, ResolutionCandidate@8229, ResolutionCandidate@8230, ... }
-    <name not found> = ArrayList@11792[7] { ResolutionCandidate@8158, ResolutionCandidate@8159, ResolutionCandidate@8160, ... }
-    <name not found> = ArrayList@11793[7] { ResolutionCandidate@7923, ResolutionCandidate@7924, ResolutionCandidate@7925, ... }
-    <name not found> = ArrayList@11794[7] { ResolutionCandidate@8638, ResolutionCandidate@8639, ResolutionCandidate@8640, ... }
-    <name not found> = ArrayList@11795[7] { ResolutionCandidate@8238, ResolutionCandidate@8239, ResolutionCandidate@8240, ... }
-    <name not found> = ArrayList@11796[7] { ResolutionCandidate@8028, ResolutionCandidate@8029, ResolutionCandidate@8030, ... }
-    <name not found> = ArrayList@11797[7] { ResolutionCandidate@8038, ResolutionCandidate@8039, ResolutionCandidate@8040, ... }
-    <name not found> = ArrayList@11798[7] { ResolutionCandidate@7913, ResolutionCandidate@7914, ResolutionCandidate@7915, ... }
-    <name not found> = ArrayList@11799[7] { ResolutionCandidate@8573, ResolutionCandidate@8574, ResolutionCandidate@8575, ... }
-    <name not found> = ArrayList@11800[7] { ResolutionCandidate@7918, ResolutionCandidate@7919, ResolutionCandidate@7920, ... }
-    <name not found> = ArrayList@11801[7] { ResolutionCandidate@8343, ResolutionCandidate@8344, ResolutionCandidate@8345, ... }
-    <name not found> = ArrayList@11802[7] { ResolutionCandidate@7973, ResolutionCandidate@7974, ResolutionCandidate@7975, ... }
-    <name not found> = ArrayList@11803[7] { ResolutionCandidate@8073, ResolutionCandidate@8074, ResolutionCandidate@8075, ... }
-    <name not found> = ArrayList@11804[7] { ResolutionCandidate@8113, ResolutionCandidate@8114, ResolutionCandidate@8115, ... }
-    <name not found> = ArrayList@11805[7] { ResolutionCandidate@8003, ResolutionCandidate@8004, ResolutionCandidate@8005, ... }
-    <name not found> = ArrayList@11806[7] { ResolutionCandidate@8448, ResolutionCandidate@8449, ResolutionCandidate@8450, ... }
-    <name not found> = ArrayList@11807[7] { ResolutionCandidate@8103, ResolutionCandidate@8104, ResolutionCandidate@8105, ... }
-    <name not found> = ArrayList@11808[7] { ResolutionCandidate@7988, ResolutionCandidate@7989, ResolutionCandidate@7990, ... }
-    <name not found> = ArrayList@11809[7] { ResolutionCandidate@8198, ResolutionCandidate@8199, ResolutionCandidate@8200, ... }
-    <name not found> = ArrayList@11810[7] { ResolutionCandidate@8338, ResolutionCandidate@8339, ResolutionCandidate@8340, ... }
-    <name not found> = ArrayList@11811[7] { ResolutionCandidate@8138, ResolutionCandidate@8139, ResolutionCandidate@8140, ... }
-    <name not found> = ArrayList@11812[7] { ResolutionCandidate@8423, ResolutionCandidate@8424, ResolutionCandidate@8425, ... }
-    <name not found> = ArrayList@11813[7] { ResolutionCandidate@8008, ResolutionCandidate@8009, ResolutionCandidate@8010, ... }
-    <name not found> = ArrayList@11814[7] { ResolutionCandidate@8478, ResolutionCandidate@8479, ResolutionCandidate@8480, ... }
-    <name not found> = ArrayList@11815[7] { ResolutionCandidate@8688, ResolutionCandidate@8689, ResolutionCandidate@8690, ... }
-    <name not found> = ArrayList@11816[7] { ResolutionCandidate@8323, ResolutionCandidate@8324, ResolutionCandidate@8325, ... }
-    <name not found> = ArrayList@11817[7] { ResolutionCandidate@8373, ResolutionCandidate@8374, ResolutionCandidate@8375, ... }
-    <name not found> = ArrayList@11818[7] { ResolutionCandidate@7868, ResolutionCandidate@7869, ResolutionCandidate@7870, ... }
-    <name not found> = ArrayList@11819[7] { ResolutionCandidate@8523, ResolutionCandidate@8524, ResolutionCandidate@8525, ... }
-    <name not found> = ArrayList@11820[7] { ResolutionCandidate@8543, ResolutionCandidate@8544, ResolutionCandidate@8545, ... }
-    <name not found> = ArrayList@11821[7] { ResolutionCandidate@7858, ResolutionCandidate@7859, ResolutionCandidate@7860, ... }
-    <name not found> = ArrayList@11822[7] { ResolutionCandidate@8683, ResolutionCandidate@8684, ResolutionCandidate@8685, ... }
-    <name not found> = ArrayList@11823[7] { ResolutionCandidate@7943, ResolutionCandidate@7944, ResolutionCandidate@7945, ... }
-    <name not found> = ArrayList@11824[7] { ResolutionCandidate@8473, ResolutionCandidate@8474, ResolutionCandidate@8475, ... }
-    <name not found> = ArrayList@11825[7] { ResolutionCandidate@8053, ResolutionCandidate@8054, ResolutionCandidate@8055, ... }
-    <name not found> = ArrayList@11826[7] { ResolutionCandidate@8153, ResolutionCandidate@8154, ResolutionCandidate@8155, ... }
-    <name not found> = ArrayList@11827[7] { ResolutionCandidate@8463, ResolutionCandidate@8464, ResolutionCandidate@8465, ... }
-    <name not found> = ArrayList@11828[7] { ResolutionCandidate@8708, ResolutionCandidate@8709, ResolutionCandidate@8710, ... }
-    <name not found> = ArrayList@11829[7] { ResolutionCandidate@8668, ResolutionCandidate@8669, ResolutionCandidate@8670, ... }
-    <name not found> = ArrayList@11830[7] { ResolutionCandidate@8183, ResolutionCandidate@8184, ResolutionCandidate@8185, ... }
-    <name not found> = ArrayList@11831[7] { ResolutionCandidate@8553, ResolutionCandidate@8554, ResolutionCandidate@8555, ... }
-    <name not found> = ArrayList@11832[7] { ResolutionCandidate@8518, ResolutionCandidate@8519, ResolutionCandidate@8520, ... }
-    <name not found> = ArrayList@11833[7] { ResolutionCandidate@8083, ResolutionCandidate@8084, ResolutionCandidate@8085, ... }
-    <name not found> = ArrayList@11834[7] { ResolutionCandidate@8403, ResolutionCandidate@8404, ResolutionCandidate@8405, ... }
-    <name not found> = ArrayList@11835[7] { ResolutionCandidate@8023, ResolutionCandidate@8024, ResolutionCandidate@8025, ... }
-    <name not found> = ArrayList@11836[7] { ResolutionCandidate@8248, ResolutionCandidate@8249, ResolutionCandidate@8250, ... }
-    <name not found> = ArrayList@11837[7] { ResolutionCandidate@8508, ResolutionCandidate@8509, ResolutionCandidate@8510, ... }
-    <name not found> = ArrayList@11838[7] { ResolutionCandidate@8393, ResolutionCandidate@8394, ResolutionCandidate@8395, ... }
-    <name not found> = ArrayList@11839[7] { ResolutionCandidate@8203, ResolutionCandidate@8204, ResolutionCandidate@8205, ... }
-    <name not found> = ArrayList@11840[7] { ResolutionCandidate@8693, ResolutionCandidate@8694, ResolutionCandidate@8695, ... }
-    <name not found> = ArrayList@11841[7] { ResolutionCandidate@8268, ResolutionCandidate@8269, ResolutionCandidate@8270, ... }
-    <name not found> = ArrayList@11842[7] { ResolutionCandidate@8618, ResolutionCandidate@8619, ResolutionCandidate@8620, ... }
-    <name not found> = ArrayList@11843[7] { ResolutionCandidate@8703, ResolutionCandidate@8704, ResolutionCandidate@8705, ... }
-    <name not found> = ArrayList@11844[7] { ResolutionCandidate@8528, ResolutionCandidate@8529, ResolutionCandidate@8530, ... }
-    <name not found> = ArrayList@11845[7] { ResolutionCandidate@7893, ResolutionCandidate@7894, ResolutionCandidate@7895, ... }
-    <name not found> = ArrayList@11846[7] { ResolutionCandidate@8658, ResolutionCandidate@8659, ResolutionCandidate@8660, ... }
-    <name not found> = ArrayList@11847[7] { ResolutionCandidate@8613, ResolutionCandidate@8614, ResolutionCandidate@8615, ... }
-    <name not found> = ArrayList@11848[7] { ResolutionCandidate@8628, ResolutionCandidate@8629, ResolutionCandidate@8630, ... }
-    <name not found> = ArrayList@11849[7] { ResolutionCandidate@8058, ResolutionCandidate@8059, ResolutionCandidate@8060, ... }
-    <name not found> = ArrayList@11850[7] { ResolutionCandidate@8568, ResolutionCandidate@8569, ResolutionCandidate@8570, ... }
-    <name not found> = ArrayList@11851[7] { ResolutionCandidate@8388, ResolutionCandidate@8389, ResolutionCandidate@8390, ... }
-    <name not found> = ArrayList@11852[7] { ResolutionCandidate@8128, ResolutionCandidate@8129, ResolutionCandidate@8130, ... }
-    <name not found> = ArrayList@11853[7] { ResolutionCandidate@8603, ResolutionCandidate@8604, ResolutionCandidate@8605, ... }
-    <name not found> = ArrayList@11854[7] { ResolutionCandidate@8488, ResolutionCandidate@8489, ResolutionCandidate@8490, ... }
-    <name not found> = ArrayList@11855[7] { ResolutionCandidate@8713, ResolutionCandidate@8714, ResolutionCandidate@8715, ... }
-    <name not found> = ArrayList@11856[7] { ResolutionCandidate@8208, ResolutionCandidate@8209, ResolutionCandidate@8210, ... }
-    <name not found> = ArrayList@11857[7] { ResolutionCandidate@8428, ResolutionCandidate@8429, ResolutionCandidate@8430, ... }
-    <name not found> = ArrayList@11858[7] { ResolutionCandidate@8318, ResolutionCandidate@8319, ResolutionCandidate@8320, ... }
-    <name not found> = ArrayList@11859[7] { ResolutionCandidate@8358, ResolutionCandidate@8359, ResolutionCandidate@8360, ... }
-    <name not found> = ArrayList@11860[7] { ResolutionCandidate@8418, ResolutionCandidate@8419, ResolutionCandidate@8420, ... }
-    <name not found> = ArrayList@11861[7] { ResolutionCandidate@8513, ResolutionCandidate@8514, ResolutionCandidate@8515, ... }
-    <name not found> = ArrayList@11862[7] { ResolutionCandidate@8633, ResolutionCandidate@8634, ResolutionCandidate@8635, ... }
-    <name not found> = ArrayList@11863[7] { ResolutionCandidate@8043, ResolutionCandidate@8044, ResolutionCandidate@8045, ... }
-    <name not found> = ArrayList@11864[7] { ResolutionCandidate@8178, ResolutionCandidate@8179, ResolutionCandidate@8180, ... }
-    <name not found> = ArrayList@11865[7] { ResolutionCandidate@8433, ResolutionCandidate@8434, ResolutionCandidate@8435, ... }
-    <name not found> = ArrayList@11866[7] { ResolutionCandidate@7948, ResolutionCandidate@7949, ResolutionCandidate@7950, ... }
-    <name not found> = ArrayList@11867[7] { ResolutionCandidate@8068, ResolutionCandidate@8069, ResolutionCandidate@8070, ... }
-    <name not found> = ArrayList@11868[7] { ResolutionCandidate@8548, ResolutionCandidate@8549, ResolutionCandidate@8550, ... }
-    <name not found> = ArrayList@11869[7] { ResolutionCandidate@7903, ResolutionCandidate@7904, ResolutionCandidate@7905, ... }
-    <name not found> = ArrayList@11870[7] { ResolutionCandidate@8163, ResolutionCandidate@8164, ResolutionCandidate@8165, ... }
-    <name not found> = ArrayList@11871[7] { ResolutionCandidate@8088, ResolutionCandidate@8089, ResolutionCandidate@8090, ... }
-    <name not found> = ArrayList@11872[7] { ResolutionCandidate@8673, ResolutionCandidate@8674, ResolutionCandidate@8675, ... }
-    <name not found> = ArrayList@11873[7] { ResolutionCandidate@8093, ResolutionCandidate@8094, ResolutionCandidate@8095, ... }
-    <name not found> = ArrayList@11874[7] { ResolutionCandidate@8643, ResolutionCandidate@8644, ResolutionCandidate@8645, ... }
-    <name not found> = ArrayList@11875[7] { ResolutionCandidate@7928, ResolutionCandidate@7929, ResolutionCandidate@7930, ... }
-    <name not found> = ArrayList@11876[7] { ResolutionCandidate@8123, ResolutionCandidate@8124, ResolutionCandidate@8125, ... }
-    <name not found> = ArrayList@11877[7] { ResolutionCandidate@8218, ResolutionCandidate@8219, ResolutionCandidate@8220, ... }
-    <name not found> = ArrayList@11878[7] { ResolutionCandidate@8193, ResolutionCandidate@8194, ResolutionCandidate@8195, ... }
-    <name not found> = ArrayList@11879[7] { ResolutionCandidate@8133, ResolutionCandidate@8134, ResolutionCandidate@8135, ... }
-    <name not found> = ArrayList@11880[7] { ResolutionCandidate@7888, ResolutionCandidate@7889, ResolutionCandidate@7890, ... }
-    <name not found> = ArrayList@11881[7] { ResolutionCandidate@8648, ResolutionCandidate@8649, ResolutionCandidate@8650, ... }
-    <name not found> = ArrayList@11882[7] { ResolutionCandidate@7933, ResolutionCandidate@7934, ResolutionCandidate@7935, ... }
-    <name not found> = ArrayList@11883[7] { ResolutionCandidate@8453, ResolutionCandidate@8454, ResolutionCandidate@8455, ... }
-    <name not found> = ArrayList@11884[7] { ResolutionCandidate@7898, ResolutionCandidate@7899, ResolutionCandidate@7900, ... }
-    <name not found> = ArrayList@11885[7] { ResolutionCandidate@7978, ResolutionCandidate@7979, ResolutionCandidate@7980, ... }
-    <name not found> = ArrayList@11886[7] { ResolutionCandidate@8608, ResolutionCandidate@8609, ResolutionCandidate@8610, ... }
-    <name not found> = ArrayList@11887[7] { ResolutionCandidate@7998, ResolutionCandidate@7999, ResolutionCandidate@8000, ... }
-    <name not found> = ArrayList@11888[7] { ResolutionCandidate@8118, ResolutionCandidate@8119, ResolutionCandidate@8120, ... }
-    <name not found> = ArrayList@11889[7] { ResolutionCandidate@8258, ResolutionCandidate@8259, ResolutionCandidate@8260, ... }
-    <name not found> = ArrayList@11890[7] { ResolutionCandidate@8583, ResolutionCandidate@8584, ResolutionCandidate@8585, ... }
-    <name not found> = ArrayList@11891[7] { ResolutionCandidate@8348, ResolutionCandidate@8349, ResolutionCandidate@8350, ... }
-    <name not found> = ArrayList@11892[7] { ResolutionCandidate@8503, ResolutionCandidate@8504, ResolutionCandidate@8505, ... }
-    <name not found> = ArrayList@11893[7] { ResolutionCandidate@8188, ResolutionCandidate@8189, ResolutionCandidate@8190, ... }
-    <name not found> = ArrayList@11894[7] { ResolutionCandidate@8048, ResolutionCandidate@8049, ResolutionCandidate@8050, ... }
-    <name not found> = ArrayList@11895[7] { ResolutionCandidate@7968, ResolutionCandidate@7969, ResolutionCandidate@7970, ... }
-    <name not found> = ArrayList@11896[7] { ResolutionCandidate@8578, ResolutionCandidate@8579, ResolutionCandidate@8580, ... }
-    <name not found> = ArrayList@11897[7] { ResolutionCandidate@8378, ResolutionCandidate@8379, ResolutionCandidate@8380, ... }
-    <name not found> = ArrayList@11898[7] { ResolutionCandidate@8278, ResolutionCandidate@8279, ResolutionCandidate@8280, ... }
-    <name not found> = ArrayList@11899[7] { ResolutionCandidate@8213, ResolutionCandidate@8214, ResolutionCandidate@8215, ... }
-    <name not found> = ArrayList@11900[7] { ResolutionCandidate@8598, ResolutionCandidate@8599, ResolutionCandidate@8600, ... }
-    <name not found> = ArrayList@11901[7] { ResolutionCandidate@8588, ResolutionCandidate@8589, ResolutionCandidate@8590, ... }
-    <name not found> = ArrayList@11902[7] { ResolutionCandidate@8353, ResolutionCandidate@8354, ResolutionCandidate@8355, ... }
-    <name not found> = ArrayList@11903[7] { ResolutionCandidate@7873, ResolutionCandidate@7874, ResolutionCandidate@7875, ... }
-    <name not found> = ArrayList@11904[7] { ResolutionCandidate@8653, ResolutionCandidate@8654, ResolutionCandidate@8655, ... }
-    <name not found> = ArrayList@11905[7] { ResolutionCandidate@8148, ResolutionCandidate@8149, ResolutionCandidate@8150, ... }
-    <name not found> = ArrayList@11906[7] { ResolutionCandidate@8593, ResolutionCandidate@8594, ResolutionCandidate@8595, ... }
-    <name not found> = ArrayList@11907[7] { ResolutionCandidate@7878, ResolutionCandidate@7879, ResolutionCandidate@7880, ... }
-    <name not found> = ArrayList@11908[7] { ResolutionCandidate@8173, ResolutionCandidate@8174, ResolutionCandidate@8175, ... }
-    <name not found> = ArrayList@11909[7] { ResolutionCandidate@8368, ResolutionCandidate@8369, ResolutionCandidate@8370, ... }
-    <name not found> = ArrayList@11910[7] { ResolutionCandidate@8293, ResolutionCandidate@8294, ResolutionCandidate@8295, ... }
-    <name not found> = ArrayList@11911[7] { ResolutionCandidate@8458, ResolutionCandidate@8459, ResolutionCandidate@8460, ... }
-    <name not found> = ArrayList@11912[7] { ResolutionCandidate@8298, ResolutionCandidate@8299, ResolutionCandidate@8300, ... }
-    <name not found> = ArrayList@11913[7] { ResolutionCandidate@8663, ResolutionCandidate@8664, ResolutionCandidate@8665, ... }
-    <name not found> = ArrayList@11914[7] { ResolutionCandidate@8273, ResolutionCandidate@8274, ResolutionCandidate@8275, ... }
-    <name not found> = ArrayList@11915[7] { ResolutionCandidate@8498, ResolutionCandidate@8499, ResolutionCandidate@8500, ... }
-    <name not found> = ArrayList@11916[7] { ResolutionCandidate@8108, ResolutionCandidate@8109, ResolutionCandidate@8110, ... }
-    <name not found> = ArrayList@11917[7] { ResolutionCandidate@8223, ResolutionCandidate@8224, ResolutionCandidate@8225, ... }
-    <name not found> = ArrayList@11918[7] { ResolutionCandidate@8333, ResolutionCandidate@8334, ResolutionCandidate@8335, ... }
-    <name not found> = ArrayList@11919[7] { ResolutionCandidate@7908, ResolutionCandidate@7909, ResolutionCandidate@7910, ... }
-    <name not found> = ArrayList@11920[7] { ResolutionCandidate@8308, ResolutionCandidate@8309, ResolutionCandidate@8310, ... }
-    <name not found> = ArrayList@11921[7] { ResolutionCandidate@8063, ResolutionCandidate@8064, ResolutionCandidate@8065, ... }
-    <name not found> = ArrayList@11922[7] { ResolutionCandidate@8468, ResolutionCandidate@8469, ResolutionCandidate@8470, ... }
-    <name not found> = ArrayList@11923[7] { ResolutionCandidate@8313, ResolutionCandidate@8314, ResolutionCandidate@8315, ... }
-    <name not found> = ArrayList@11924[7] { ResolutionCandidate@8623, ResolutionCandidate@8624, ResolutionCandidate@8625, ... }
-    <name not found> = ArrayList@11925[7] { ResolutionCandidate@7938, ResolutionCandidate@7939, ResolutionCandidate@7940, ... }
-    <name not found> = ArrayList@11926[7] { ResolutionCandidate@8243, ResolutionCandidate@8244, ResolutionCandidate@8245, ... }
-    <name not found> = ArrayList@11927[7] { ResolutionCandidate@7863, ResolutionCandidate@7864, ResolutionCandidate@7865, ... }
-    <name not found> = ArrayList@11928[7] { ResolutionCandidate@8018, ResolutionCandidate@8019, ResolutionCandidate@8020, ... }
-    <name not found> = ArrayList@11929[7] { ResolutionCandidate@7963, ResolutionCandidate@7964, ResolutionCandidate@7965, ... }
-    <name not found> = ArrayList@11930[7] { ResolutionCandidate@8563, ResolutionCandidate@8564, ResolutionCandidate@8565, ... }
-    <name not found> = ArrayList@11931[7] { ResolutionCandidate@8483, ResolutionCandidate@8484, ResolutionCandidate@8485, ... }
-    <name not found> = ArrayList@11932[7] { ResolutionCandidate@8033, ResolutionCandidate@8034, ResolutionCandidate@8035, ... }
-    <name not found> = ArrayList@11933[7] { ResolutionCandidate@8443, ResolutionCandidate@8444, ResolutionCandidate@8445, ... }
-    <name not found> = ArrayList@11934[7] { ResolutionCandidate@8718, ResolutionCandidate@8719, ResolutionCandidate@8720, ... }
-    <name not found> = ArrayList@11935[7] { ResolutionCandidate@8303, ResolutionCandidate@8304, ResolutionCandidate@8305, ... }
-    <name not found> = ArrayList@11936[7] { ResolutionCandidate@8698, ResolutionCandidate@8699, ResolutionCandidate@8700, ... }
-    <name not found> = ArrayList@11937[7] { ResolutionCandidate@8398, ResolutionCandidate@8399, ResolutionCandidate@8400, ... }
-    <name not found> = ArrayList@11938[7] { ResolutionCandidate@8438, ResolutionCandidate@8439, ResolutionCandidate@8440, ... }
-    <name not found> = ArrayList@11939[7] { ResolutionCandidate@8013, ResolutionCandidate@8014, ResolutionCandidate@8015, ... }
-    <name not found> = ArrayList@11940[7] { ResolutionCandidate@7883, ResolutionCandidate@7884, ResolutionCandidate@7885, ... }
-    <name not found> = ArrayList@11941[7] { ResolutionCandidate@8098, ResolutionCandidate@8099, ResolutionCandidate@8100, ... }
-    <name not found> = ArrayList@11942[8] { ResolutionCandidate@9238, ResolutionCandidate@9239, ResolutionCandidate@9240, ... }
-    <name not found> = ArrayList@11943[8] { ResolutionCandidate@8848, ResolutionCandidate@8849, ResolutionCandidate@8850, ... }
-    <name not found> = ArrayList@11944[8] { ResolutionCandidate@8908, ResolutionCandidate@8909, ResolutionCandidate@8910, ... }
-    <name not found> = ArrayList@11945[8] { ResolutionCandidate@8943, ResolutionCandidate@8944, ResolutionCandidate@8945, ... }
-    <name not found> = ArrayList@11946[8] { ResolutionCandidate@9068, ResolutionCandidate@9069, ResolutionCandidate@9070, ... }
-    <name not found> = ArrayList@11947[8] { ResolutionCandidate@8798, ResolutionCandidate@8799, ResolutionCandidate@8800, ... }
-    <name not found> = ArrayList@11948[8] { ResolutionCandidate@8763, ResolutionCandidate@8764, ResolutionCandidate@8765, ... }
-    <name not found> = ArrayList@11949[8] { ResolutionCandidate@9163, ResolutionCandidate@9164, ResolutionCandidate@9165, ... }
-    <name not found> = ArrayList@11950[8] { ResolutionCandidate@9078, ResolutionCandidate@9079, ResolutionCandidate@9080, ... }
-    <name not found> = ArrayList@11951[8] { ResolutionCandidate@8963, ResolutionCandidate@8964, ResolutionCandidate@8965, ... }
-    <name not found> = ArrayList@11952[8] { ResolutionCandidate@9158, ResolutionCandidate@9159, ResolutionCandidate@9160, ... }
-    <name not found> = ArrayList@11953[8] { ResolutionCandidate@8833, ResolutionCandidate@8834, ResolutionCandidate@8835, ... }
-    <name not found> = ArrayList@11954[8] { ResolutionCandidate@8863, ResolutionCandidate@8864, ResolutionCandidate@8865, ... }
-    <name not found> = ArrayList@11955[8] { ResolutionCandidate@9188, ResolutionCandidate@9189, ResolutionCandidate@9190, ... }
-    <name not found> = ArrayList@11956[8] { ResolutionCandidate@9153, ResolutionCandidate@9154, ResolutionCandidate@9155, ... }
-    <name not found> = ArrayList@11957[8] { ResolutionCandidate@8778, ResolutionCandidate@8779, ResolutionCandidate@8780, ... }
-    <name not found> = ArrayList@11958[8] { ResolutionCandidate@9058, ResolutionCandidate@9059, ResolutionCandidate@9060, ... }
-    <name not found> = ArrayList@11959[8] { ResolutionCandidate@9178, ResolutionCandidate@9179, ResolutionCandidate@9180, ... }
-    <name not found> = ArrayList@11960[8] { ResolutionCandidate@8983, ResolutionCandidate@8984, ResolutionCandidate@8985, ... }
-    <name not found> = ArrayList@11961[8] { ResolutionCandidate@8748, ResolutionCandidate@8749, ResolutionCandidate@8750, ... }
-    <name not found> = ArrayList@11962[8] { ResolutionCandidate@9148, ResolutionCandidate@9149, ResolutionCandidate@9150, ... }
-    <name not found> = ArrayList@11963[8] { ResolutionCandidate@9193, ResolutionCandidate@9194, ResolutionCandidate@9195, ... }
-    <name not found> = ArrayList@11964[8] { ResolutionCandidate@8913, ResolutionCandidate@8914, ResolutionCandidate@8915, ... }
-    <name not found> = ArrayList@11965[8] { ResolutionCandidate@9023, ResolutionCandidate@9024, ResolutionCandidate@9025, ... }
-    <name not found> = ArrayList@11966[8] { ResolutionCandidate@8893, ResolutionCandidate@8894, ResolutionCandidate@8895, ... }
-    <name not found> = ArrayList@11967[8] { ResolutionCandidate@9263, ResolutionCandidate@9264, ResolutionCandidate@9265, ... }
-    <name not found> = ArrayList@11968[8] { ResolutionCandidate@8903, ResolutionCandidate@8904, ResolutionCandidate@8905, ... }
-    <name not found> = ArrayList@11969[8] { ResolutionCandidate@9173, ResolutionCandidate@9174, ResolutionCandidate@9175, ... }
-    <name not found> = ArrayList@11970[8] { ResolutionCandidate@9053, ResolutionCandidate@9054, ResolutionCandidate@9055, ... }
-    <name not found> = ArrayList@11971[8] { ResolutionCandidate@9033, ResolutionCandidate@9034, ResolutionCandidate@9035, ... }
-    <name not found> = ArrayList@11972[8] { ResolutionCandidate@8773, ResolutionCandidate@8774, ResolutionCandidate@8775, ... }
-    <name not found> = ArrayList@11973[8] { ResolutionCandidate@9118, ResolutionCandidate@9119, ResolutionCandidate@9120, ... }
-    <name not found> = ArrayList@11974[8] { ResolutionCandidate@8948, ResolutionCandidate@8949, ResolutionCandidate@8950, ... }
-    <name not found> = ArrayList@11975[8] { ResolutionCandidate@9258, ResolutionCandidate@9259, ResolutionCandidate@9260, ... }
-    <name not found> = ArrayList@11976[8] { ResolutionCandidate@9253, ResolutionCandidate@9254, ResolutionCandidate@9255, ... }
-    <name not found> = ArrayList@11977[8] { ResolutionCandidate@8838, ResolutionCandidate@8839, ResolutionCandidate@8840, ... }
-    <name not found> = ArrayList@11978[8] { ResolutionCandidate@9018, ResolutionCandidate@9019, ResolutionCandidate@9020, ... }
-    <name not found> = ArrayList@11979[8] { ResolutionCandidate@9088, ResolutionCandidate@9089, ResolutionCandidate@9090, ... }
-    <name not found> = ArrayList@11980[8] { ResolutionCandidate@8793, ResolutionCandidate@8794, ResolutionCandidate@8795, ... }
-    <name not found> = ArrayList@11981[8] { ResolutionCandidate@8873, ResolutionCandidate@8874, ResolutionCandidate@8875, ... }
-    <name not found> = ArrayList@11982[8] { ResolutionCandidate@8938, ResolutionCandidate@8939, ResolutionCandidate@8940, ... }
-    <name not found> = ArrayList@11983[8] { ResolutionCandidate@8803, ResolutionCandidate@8804, ResolutionCandidate@8805, ... }
-    <name not found> = ArrayList@11984[8] { ResolutionCandidate@8878, ResolutionCandidate@8879, ResolutionCandidate@8880, ... }
-    <name not found> = ArrayList@11985[8] { ResolutionCandidate@8898, ResolutionCandidate@8899, ResolutionCandidate@8900, ... }
-    <name not found> = ArrayList@11986[8] { ResolutionCandidate@8808, ResolutionCandidate@8809, ResolutionCandidate@8810, ... }
-    <name not found> = ArrayList@11987[8] { ResolutionCandidate@9218, ResolutionCandidate@9219, ResolutionCandidate@9220, ... }
-    <name not found> = ArrayList@11988[8] { ResolutionCandidate@9103, ResolutionCandidate@9104, ResolutionCandidate@9105, ... }
-    <name not found> = ArrayList@11989[8] { ResolutionCandidate@8728, ResolutionCandidate@8729, ResolutionCandidate@8730, ... }
-    <name not found> = ArrayList@11990[8] { ResolutionCandidate@9213, ResolutionCandidate@9214, ResolutionCandidate@9215, ... }
-    <name not found> = ArrayList@11991[8] { ResolutionCandidate@8988, ResolutionCandidate@8989, ResolutionCandidate@8990, ... }
-    <name not found> = ArrayList@11992[8] { ResolutionCandidate@9128, ResolutionCandidate@9129, ResolutionCandidate@9130, ... }
-    <name not found> = ArrayList@11993[8] { ResolutionCandidate@8858, ResolutionCandidate@8859, ResolutionCandidate@8860, ... }
-    <name not found> = ArrayList@11994[8] { ResolutionCandidate@8828, ResolutionCandidate@8829, ResolutionCandidate@8830, ... }
-    <name not found> = ArrayList@11995[8] { ResolutionCandidate@9168, ResolutionCandidate@9169, ResolutionCandidate@9170, ... }
-    <name not found> = ArrayList@11996[8] { ResolutionCandidate@9133, ResolutionCandidate@9134, ResolutionCandidate@9135, ... }
-    <name not found> = ArrayList@11997[8] { ResolutionCandidate@9198, ResolutionCandidate@9199, ResolutionCandidate@9200, ... }
-    <name not found> = ArrayList@11998[8] { ResolutionCandidate@9138, ResolutionCandidate@9139, ResolutionCandidate@9140, ... }
-    <name not found> = ArrayList@11999[8] { ResolutionCandidate@8813, ResolutionCandidate@8814, ResolutionCandidate@8815, ... }
-    <name not found> = ArrayList@12000[8] { ResolutionCandidate@8998, ResolutionCandidate@8999, ResolutionCandidate@9000, ... }
-    <name not found> = ArrayList@12001[8] { ResolutionCandidate@9203, ResolutionCandidate@9204, ResolutionCandidate@9205, ... }
-    <name not found> = ArrayList@12002[8] { ResolutionCandidate@9008, ResolutionCandidate@9009, ResolutionCandidate@9010, ... }
-    <name not found> = ArrayList@12003[8] { ResolutionCandidate@8888, ResolutionCandidate@8889, ResolutionCandidate@8890, ... }
-    <name not found> = ArrayList@12004[8] { ResolutionCandidate@9243, ResolutionCandidate@9244, ResolutionCandidate@9245, ... }
-    <name not found> = ArrayList@12005[8] { ResolutionCandidate@9048, ResolutionCandidate@9049, ResolutionCandidate@9050, ... }
-    <name not found> = ArrayList@12006[8] { ResolutionCandidate@8883, ResolutionCandidate@8884, ResolutionCandidate@8885, ... }
-    <name not found> = ArrayList@12007[8] { ResolutionCandidate@8918, ResolutionCandidate@8919, ResolutionCandidate@8920, ... }
-    <name not found> = ArrayList@12008[8] { ResolutionCandidate@8768, ResolutionCandidate@8769, ResolutionCandidate@8770, ... }
-    <name not found> = ArrayList@12009[8] { ResolutionCandidate@8818, ResolutionCandidate@8819, ResolutionCandidate@8820, ... }
-    <name not found> = ArrayList@12010[8] { ResolutionCandidate@9113, ResolutionCandidate@9114, ResolutionCandidate@9115, ... }
-    <name not found> = ArrayList@12011[8] { ResolutionCandidate@9143, ResolutionCandidate@9144, ResolutionCandidate@9145, ... }
-    <name not found> = ArrayList@12012[8] { ResolutionCandidate@8853, ResolutionCandidate@8854, ResolutionCandidate@8855, ... }
-    <name not found> = ArrayList@12013[8] { ResolutionCandidate@9043, ResolutionCandidate@9044, ResolutionCandidate@9045, ... }
-    <name not found> = ArrayList@12014[8] { ResolutionCandidate@9093, ResolutionCandidate@9094, ResolutionCandidate@9095, ... }
-    <name not found> = ArrayList@12015[8] { ResolutionCandidate@8953, ResolutionCandidate@8954, ResolutionCandidate@8955, ... }
-    <name not found> = ArrayList@12016[8] { ResolutionCandidate@8928, ResolutionCandidate@8929, ResolutionCandidate@8930, ... }
-    <name not found> = ArrayList@12017[8] { ResolutionCandidate@9228, ResolutionCandidate@9229, ResolutionCandidate@9230, ... }
-    <name not found> = ArrayList@12018[8] { ResolutionCandidate@8978, ResolutionCandidate@8979, ResolutionCandidate@8980, ... }
-    <name not found> = ArrayList@12019[8] { ResolutionCandidate@9038, ResolutionCandidate@9039, ResolutionCandidate@9040, ... }
-    <name not found> = ArrayList@12020[8] { ResolutionCandidate@9233, ResolutionCandidate@9234, ResolutionCandidate@9235, ... }
-    <name not found> = ArrayList@12021[8] { ResolutionCandidate@8973, ResolutionCandidate@8974, ResolutionCandidate@8975, ... }
-    <name not found> = ArrayList@12022[8] { ResolutionCandidate@9208, ResolutionCandidate@9209, ResolutionCandidate@9210, ... }
-    <name not found> = ArrayList@12023[8] { ResolutionCandidate@9123, ResolutionCandidate@9124, ResolutionCandidate@9125, ... }
-    <name not found> = ArrayList@12024[8] { ResolutionCandidate@8958, ResolutionCandidate@8959, ResolutionCandidate@8960, ... }
-    <name not found> = ArrayList@12025[8] { ResolutionCandidate@9003, ResolutionCandidate@9004, ResolutionCandidate@9005, ... }
-    <name not found> = ArrayList@12026[8] { ResolutionCandidate@8753, ResolutionCandidate@8754, ResolutionCandidate@8755, ... }
-    <name not found> = ArrayList@12027[8] { ResolutionCandidate@8923, ResolutionCandidate@8924, ResolutionCandidate@8925, ... }
-    <name not found> = ArrayList@12028[8] { ResolutionCandidate@8823, ResolutionCandidate@8824, ResolutionCandidate@8825, ... }
-    <name not found> = ArrayList@12029[8] { ResolutionCandidate@8758, ResolutionCandidate@8759, ResolutionCandidate@8760, ... }
-    <name not found> = ArrayList@12030[8] { ResolutionCandidate@9108, ResolutionCandidate@9109, ResolutionCandidate@9110, ... }
-    <name not found> = ArrayList@12031[8] { ResolutionCandidate@8843, ResolutionCandidate@8844, ResolutionCandidate@8845, ... }
-    <name not found> = ArrayList@12032[8] { ResolutionCandidate@9028, ResolutionCandidate@9029, ResolutionCandidate@9030, ... }
-    <name not found> = ArrayList@12033[8] { ResolutionCandidate@8743, ResolutionCandidate@8744, ResolutionCandidate@8745, ... }
-    <name not found> = ArrayList@12034[8] { ResolutionCandidate@8783, ResolutionCandidate@8784, ResolutionCandidate@8785, ... }
-    <name not found> = ArrayList@12035[8] { ResolutionCandidate@9083, ResolutionCandidate@9084, ResolutionCandidate@9085, ... }
-    <name not found> = ArrayList@12036[8] { ResolutionCandidate@9063, ResolutionCandidate@9064, ResolutionCandidate@9065, ... }
-    <name not found> = ArrayList@12037[8] { ResolutionCandidate@9223, ResolutionCandidate@9224, ResolutionCandidate@9225, ... }
-    <name not found> = ArrayList@12038[8] { ResolutionCandidate@8738, ResolutionCandidate@8739, ResolutionCandidate@8740, ... }
-    <name not found> = ArrayList@12039[8] { ResolutionCandidate@9013, ResolutionCandidate@9014, ResolutionCandidate@9015, ... }
-    <name not found> = ArrayList@12040[8] { ResolutionCandidate@9183, ResolutionCandidate@9184, ResolutionCandidate@9185, ... }
-    <name not found> = ArrayList@12041[8] { ResolutionCandidate@8933, ResolutionCandidate@8934, ResolutionCandidate@8935, ... }
-    <name not found> = ArrayList@12042[8] { ResolutionCandidate@8993, ResolutionCandidate@8994, ResolutionCandidate@8995, ... }
-    <name not found> = ArrayList@12043[8] { ResolutionCandidate@9098, ResolutionCandidate@9099, ResolutionCandidate@9100, ... }
-    <name not found> = ArrayList@12044[8] { ResolutionCandidate@9248, ResolutionCandidate@9249, ResolutionCandidate@9250, ... }
-    <name not found> = ArrayList@12045[8] { ResolutionCandidate@9073, ResolutionCandidate@9074, ResolutionCandidate@9075, ... }
-    <name not found> = ArrayList@12046[8] { ResolutionCandidate@8733, ResolutionCandidate@8734, ResolutionCandidate@8735, ... }
-    <name not found> = ArrayList@12047[8] { ResolutionCandidate@8868, ResolutionCandidate@8869, ResolutionCandidate@8870, ... }
-    <name not found> = ArrayList@12048[8] { ResolutionCandidate@8968, ResolutionCandidate@8969, ResolutionCandidate@8970, ... }
-    <name not found> = ArrayList@12049[8] { ResolutionCandidate@8788, ResolutionCandidate@8789, ResolutionCandidate@8790, ... }
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-    <name not found> = EmptyList@299[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
deleted file mode 100644
index 2891ed97167..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
+++ /dev/null
@@ -1,107 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = JetTypeImpl@1['A']
-}
-
-LazyJavaClassDescriptor@2['A'] {
-    constructors = ArrayList@3[1] { JavaConstructorDescriptor@4['<init>'] } // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@1['A']
-    functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@6['A']
-}
-
-LazyJavaClassTypeConstructor@6['A'] {
-    parameters = ArrayList@7[empty]
-}
-
-LazyJavaClassifierType@8['String'] {
-    arguments = ArrayList@9[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'false': Boolean@11
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaClassifierType@13['String'] {
-    arguments = ArrayList@14[empty]
-    classifier = JavaClassImpl@10['String']
-    nullable = 'true': Boolean@15
-    typeConstructor = DeserializedClassTypeConstructor@12
-}
-
-LazyJavaPackageFragmentProvider@16 {
-    packageFragments('<root>': FqName@17) = LazyJavaPackageFragment@18['<root>']
-    packageFragments('java': FqName@19) = LazyJavaPackageFragment@20['java']
-    packageFragments('java.lang': FqName@21) = LazyJavaPackageFragment@22['lang']
-    packageFragments('kotlin': FqName@23) = LazyJavaPackageFragment@24['kotlin']
-    packageFragments('kotlin.io': FqName@25) = LazyJavaPackageFragment@26['io']
-    packageFragments('kotlin.jvm': FqName@27) = LazyJavaPackageFragment@28['jvm']
-    packageFragments('test': FqName@29) = null
-    topLevelClasses(JavaClassImpl@30['A']) = LazyJavaClassDescriptor@2['A']
-}
-
-LazyJavaPackageFragment@18['<root>'] {
-    classes('A': Name@31) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
-}
-
-LazyJavaPackageFragment@26['io'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = DeserializedPackageMemberScope@37 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@31) = EmptyList@34[empty] // through DeserializedPackageMemberScope@37
-    functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
-    membersProtos = LinkedHashMap@39 // through DeserializedPackageMemberScope@37
-    properties('A': Name@31) = EmptyList@34[empty] // through DeserializedPackageMemberScope@37
-}
-
-LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@28['jvm'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
-}
-
-LazyJavaPackageFragment@24['kotlin'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('io': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('jvm': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = DeserializedPackageMemberScope@49 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('A': Name@31) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-    functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('io': Name@50) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-    functions('io': Name@50) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('jvm': Name@51) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-    functions('jvm': Name@51) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@46
-    membersProtos = LinkedHashMap@53 // through DeserializedPackageMemberScope@49
-    properties('A': Name@31) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-    properties('io': Name@50) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-    properties('jvm': Name@51) = EmptyList@34[empty] // through DeserializedPackageMemberScope@49
-}
-
-LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-ResolutionTaskHolder@56 {
-    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
-
-null {
-    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
-    <name not found> = EmptyList@34[empty]
-    <name not found> = EmptyList@34[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.lazy.log
deleted file mode 100644
index c862cccc2aa..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/parameterNames.lazy.log
+++ /dev/null
@@ -1,101 +0,0 @@
-LazyJavaClassDescriptor@0['A'] {
-    allDescriptors = ArrayList@1[4] { DeserializedSimpleFunctionDescriptor@2['hashCode'], JavaMethodDescriptor@3['foo'], DeserializedSimpleFunctionDescriptor@4['toString'], ... } // through LazyJavaClassMemberScope@5
-    constructors = stdlib_emptyListClass@6[empty] // through LazyJavaClassMemberScope@5
-    defaultType = JetTypeImpl@7['A']
-    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@5
-    functions('clone': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('equals': Name@11) = ArrayList@12[1] { DeserializedSimpleFunctionDescriptor@13['equals'] } // through LazyJavaClassMemberScope@5
-    functions('finalize': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@3['foo'] } // through LazyJavaClassMemberScope@5
-    functions('getClass': Name@17) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@2['hashCode'] } // through LazyJavaClassMemberScope@5
-    functions('notify': Name@20) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('notifyAll': Name@21) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@4['toString'] } // through LazyJavaClassMemberScope@5
-    functions('wait': Name@24) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@5
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['A']
-}
-
-LazyJavaClassTypeConstructor@28['A'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
-}
-
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
-}
-
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'false': Boolean@38
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@39
-}
-
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('A': FqName@46) = null
-    packageFragments('B': FqName@47) = null
-    packageFragments('C': FqName@48) = null
-    packageFragments('String': FqName@49) = null
-    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    packageFragments('java.lang.A': FqName@54) = null
-    packageFragments('java.lang.String': FqName@55) = null
-    packageFragments('kotlin': FqName@56) = LazyJavaPackageFragment@57['kotlin']
-    packageFragments('kotlin.A': FqName@58) = null
-    packageFragments('kotlin.String': FqName@59) = null
-    packageFragments('kotlin.io': FqName@60) = LazyJavaPackageFragment@61['io']
-    packageFragments('kotlin.io.A': FqName@62) = null
-    packageFragments('kotlin.io.String': FqName@63) = null
-    packageFragments('kotlin.jvm': FqName@64) = LazyJavaPackageFragment@65['jvm']
-    packageFragments('kotlin.jvm.A': FqName@66) = null
-    packageFragments('kotlin.jvm.String': FqName@67) = null
-    topLevelClasses(JavaClassImpl@68['A']) = LazyJavaClassDescriptor@0['A']
-}
-
-LazyJavaPackageFragment@45['<root>'] {
-    classes('A': Name@69) = LazyJavaClassDescriptor@0['A'] // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
-}
-
-LazyJavaPackageFragment@61['io'] {
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@51['java'] {
-    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('lang': Name@76) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@65['jvm'] {
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
-}
-
-LazyJavaPackageFragment@57['kotlin'] {
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = DeserializedPackageMemberScope@82 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('io': Name@83) = EmptyList@10[empty] // through DeserializedPackageMemberScope@82
-    functions('io': Name@83) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('jvm': Name@84) = EmptyList@10[empty] // through DeserializedPackageMemberScope@82
-    functions('jvm': Name@84) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@79
-    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@82
-    properties('io': Name@83) = EmptyList@10[empty] // through DeserializedPackageMemberScope@82
-    properties('jvm': Name@84) = EmptyList@10[empty] // through DeserializedPackageMemberScope@82
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
deleted file mode 100644
index 672fdfa98f2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
+++ /dev/null
@@ -1,169 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['inline']
-}
-
-DeserializedClassDescriptor@2['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@3['kotlin']
-    primaryConstructor = ConstructorDescriptorImpl@4['<init>']
-}
-
-LazyAnnotationDescriptor@5 {
-    resolutionResults = OverloadResolutionResultsImpl@6
-    type = JetTypeImpl@7['inline']
-    valueArguments(ValueParameterDescriptorImpl@8['strategy']) = null
-}
-
-LazyJavaPackageFragmentProvider@9 {
-    packageFragments('<root>': FqName@10) = LazyJavaPackageFragment@11['<root>']
-    packageFragments('Array': FqName@12) = null
-    packageFragments('Int': FqName@13) = null
-    packageFragments('T': FqName@14) = null
-    packageFragments('inline': FqName@15) = null
-    packageFragments('java': FqName@16) = LazyJavaPackageFragment@17['java']
-    packageFragments('java.lang': FqName@18) = LazyJavaPackageFragment@19['lang']
-    packageFragments('java.lang.Array': FqName@20) = null
-    packageFragments('java.lang.Int': FqName@21) = null
-    packageFragments('java.lang.T': FqName@22) = null
-    packageFragments('java.lang.inline': FqName@23) = null
-    packageFragments('kotlin': FqName@24) = LazyJavaPackageFragment@3['kotlin']
-    packageFragments('kotlin.Array': FqName@25) = null
-    packageFragments('kotlin.Int': FqName@26) = null
-    packageFragments('kotlin.T': FqName@27) = null
-    packageFragments('kotlin.inline': FqName@28) = null
-    packageFragments('kotlin.io': FqName@29) = LazyJavaPackageFragment@30['io']
-    packageFragments('kotlin.io.Array': FqName@31) = null
-    packageFragments('kotlin.io.Int': FqName@32) = null
-    packageFragments('kotlin.io.T': FqName@33) = null
-    packageFragments('kotlin.io.inline': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = LazyJavaPackageFragment@36['jvm']
-    packageFragments('kotlin.jvm.Array': FqName@37) = null
-    packageFragments('kotlin.jvm.Int': FqName@38) = null
-    packageFragments('kotlin.jvm.T': FqName@39) = null
-    packageFragments('kotlin.jvm.inline': FqName@40) = null
-}
-
-LazyJavaPackageFragment@11['<root>'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('arrayOfNulls': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@42
-}
-
-LazyJavaPackageFragment@30['io'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('arrayOfNulls': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = DeserializedPackageMemberScope@51 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through DeserializedPackageMemberScope@51
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar': Name@45) = EmptyList@48[empty] // through DeserializedPackageMemberScope@51
-    functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
-    membersProtos = LinkedHashMap@53 // through DeserializedPackageMemberScope@51
-    properties('arrayOfNulls': Name@44) = EmptyList@48[empty] // through DeserializedPackageMemberScope@51
-    properties('bar': Name@45) = EmptyList@48[empty] // through DeserializedPackageMemberScope@51
-}
-
-LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
-}
-
-LazyJavaPackageFragment@36['jvm'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('arrayOfNulls': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
-}
-
-LazyJavaPackageFragment@3['kotlin'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Int': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('arrayOfNulls': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('inline': Name@46) = DeserializedClassDescriptor@2['inline'] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('io': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('jvm': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@63 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('bar': Name@45) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('io': Name@64) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    functions('io': Name@64) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('jvm': Name@65) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    functions('jvm': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@67 // through DeserializedPackageMemberScope@63
-    properties('arrayOfNulls': Name@44) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    properties('bar': Name@45) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    properties('io': Name@64) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-    properties('jvm': Name@65) = EmptyList@48[empty] // through DeserializedPackageMemberScope@63
-}
-
-LazyJavaPackageFragment@19['lang'] {
-    classes('arrayOfNulls': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('arrayOfNulls': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-null {
-    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@87[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@81 }
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-    <name not found> = EmptyList@48[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
deleted file mode 100644
index 488e5cd44b2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
+++ /dev/null
@@ -1,172 +0,0 @@
-DescriptorResolver@0 {
-    <name not found> = null
-}
-
-LazyJavaPackageFragmentProvider@1 {
-    packageFragments('<root>': FqName@2) = LazyJavaPackageFragment@3['<root>']
-    packageFragments('A': FqName@4) = null
-    packageFragments('Array': FqName@5) = null
-    packageFragments('Int': FqName@6) = null
-    packageFragments('R': FqName@7) = null
-    packageFragments('String': FqName@8) = null
-    packageFragments('T': FqName@9) = null
-    packageFragments('java': FqName@10) = LazyJavaPackageFragment@11['java']
-    packageFragments('java.lang': FqName@12) = LazyJavaPackageFragment@13['lang']
-    packageFragments('java.lang.Array': FqName@14) = null
-    packageFragments('java.lang.Int': FqName@15) = null
-    packageFragments('java.lang.R': FqName@16) = null
-    packageFragments('java.lang.String': FqName@17) = null
-    packageFragments('java.lang.T': FqName@18) = null
-    packageFragments('kotlin': FqName@19) = LazyJavaPackageFragment@20['kotlin']
-    packageFragments('kotlin.Array': FqName@21) = null
-    packageFragments('kotlin.Int': FqName@22) = null
-    packageFragments('kotlin.R': FqName@23) = null
-    packageFragments('kotlin.String': FqName@24) = null
-    packageFragments('kotlin.T': FqName@25) = null
-    packageFragments('kotlin.io': FqName@26) = LazyJavaPackageFragment@27['io']
-    packageFragments('kotlin.io.Array': FqName@28) = null
-    packageFragments('kotlin.io.Int': FqName@29) = null
-    packageFragments('kotlin.io.R': FqName@30) = null
-    packageFragments('kotlin.io.String': FqName@31) = null
-    packageFragments('kotlin.io.T': FqName@32) = null
-    packageFragments('kotlin.jvm': FqName@33) = LazyJavaPackageFragment@34['jvm']
-    packageFragments('kotlin.jvm.Array': FqName@35) = null
-    packageFragments('kotlin.jvm.Int': FqName@36) = null
-    packageFragments('kotlin.jvm.R': FqName@37) = null
-    packageFragments('kotlin.jvm.String': FqName@38) = null
-    packageFragments('kotlin.jvm.T': FqName@39) = null
-}
-
-LazyJavaPackageFragment@3['<root>'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@41
-}
-
-LazyJavaPackageFragment@27['io'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = DeserializedPackageMemberScope@47 // through LazyPackageFragmentScopeForJavaPackage@46
-    membersProtos = LinkedHashMap@48 // through DeserializedPackageMemberScope@47
-    properties('x': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@47
-}
-
-LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-}
-
-LazyJavaPackageFragment@34['jvm'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@54
-}
-
-LazyJavaPackageFragment@20['kotlin'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('io': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('jvm': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = DeserializedPackageMemberScope@58 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('io': Name@59) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
-    functions('io': Name@59) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('jvm': Name@60) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
-    functions('jvm': Name@60) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
-    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@58
-    properties('io': Name@59) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
-    properties('jvm': Name@60) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
-    properties('x': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
-}
-
-LazyJavaPackageFragment@13['lang'] {
-    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@63
-}
-
-ResolutionTaskHolder@64 {
-    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@67 {
-    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = EmptyList@49[empty]
-}
-
-ResolutionTaskHolder@70 {
-    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
-}
-
-ResolutionTaskHolder@73 {
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
-}
-
-ResolutionTaskHolder@76 {
-    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
-}
-
-ResolutionTaskHolder@79 {
-    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-}
-
-ResolutionTaskHolder@82 {
-    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
-}
-
-ResolutionTaskHolder@85 {
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
-}
-
-ResolutionTaskHolder@88 {
-    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@94 {
-    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
-}
-
-ResolutionTaskHolder@97 {
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
-}
-
-ResolutionTaskHolder@100 {
-    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
-}
-
-ResolutionTaskHolder@103 {
-    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
-}
-
-null {
-    <name not found> = ArrayList@106[1] { ResolutionCandidate@66 }
-    <name not found> = ArrayList@107[1] { ResolutionCandidate@99 }
-    <name not found> = ArrayList@108[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@109[1] { ResolutionCandidate@87 }
-    <name not found> = ArrayList@110[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@111[1] { ResolutionCandidate@84 }
-    <name not found> = ArrayList@112[1] { ResolutionCandidate@90 }
-    <name not found> = ArrayList@113[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@114[1] { ResolutionCandidate@105 }
-    <name not found> = ArrayList@115[1] { ResolutionCandidate@96 }
-    <name not found> = ArrayList@116[1] { ResolutionCandidate@72 }
-    <name not found> = ArrayList@117[1] { ResolutionCandidate@75 }
-    <name not found> = ArrayList@118[1] { ResolutionCandidate@78 }
-    <name not found> = ArrayList@119[1] { ResolutionCandidate@102 }
-    <name not found> = EmptyList@49[empty]
-    <name not found> = EmptyList@49[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
deleted file mode 100644
index 97c28a73e67..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
+++ /dev/null
@@ -1,379 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Intrinsic']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['inline']
-}
-
-DescriptorLoadersStorage@5 {
-    storage(VirtualFileKotlinClass@6) = Storage@7
-    storage(VirtualFileKotlinClass@8) = Storage@9
-}
-
-DeserializedClassDescriptor@2['Intrinsic'] {
-    containingDeclaration = LazyJavaPackageFragment@10['internal']
-    defaultType = JetTypeImpl@11['Intrinsic']
-    primaryConstructor = ConstructorDescriptorImpl@12['<init>']
-}
-
-DeserializedClassDescriptor@4['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@13['kotlin']
-    defaultType = JetTypeImpl@14['inline']
-    primaryConstructor = ConstructorDescriptorImpl@15['<init>']
-}
-
-DeserializedTypeParameterDescriptor@16['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@17
-    upperBounds = LinkedHashSet@18[1] { DeserializedType@19['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@20['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@21
-    upperBounds = LinkedHashSet@22[1] { DeserializedType@23['kotlin.Any'] }
-}
-
-DeserializedType@24['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
-}
-
-DeserializedType@25['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@17
-}
-
-DeserializedType@26['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
-}
-
-DeserializedType@27['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@21
-}
-
-DeserializedType@28['java.lang.Class'] {
-    constructor = LazyJavaClassTypeConstructor@29['Class']
-    memberScope = SubstitutingScope@30
-}
-
-DeserializedType@23['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
-DeserializedType@19['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
-DeserializedType@33['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@34
-    memberScope = SubstitutingScope@35
-}
-
-DeserializedType@36['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@34
-    memberScope = SubstitutingScope@37
-}
-
-LazyAnnotationDescriptor@38 {
-    resolutionResults = OverloadResolutionResultsImpl@39
-    type = JetTypeImpl@40['inline']
-    valueArguments(ValueParameterDescriptorImpl@41['strategy']) = null
-}
-
-LazyJavaClassDescriptor@42['Class'] {
-    typeConstructor = LazyJavaClassTypeConstructor@29['Class']
-}
-
-LazyJavaClassTypeConstructor@29['Class'] {
-    parameters = ArrayList@43[1] { LazyJavaTypeParameterDescriptor@44['T'] }
-}
-
-LazyJavaPackageFragmentProvider@45 {
-    packageFragments('<root>': FqName@46) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('Any': FqName@48) = null
-    packageFragments('Nothing': FqName@49) = null
-    packageFragments('String': FqName@50) = null
-    packageFragments('T': FqName@51) = null
-    packageFragments('inline': FqName@52) = null
-    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
-    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
-    packageFragments('java.lang.Any': FqName@57) = null
-    packageFragments('java.lang.Nothing': FqName@58) = null
-    packageFragments('java.lang.String': FqName@59) = null
-    packageFragments('java.lang.T': FqName@60) = null
-    packageFragments('java.lang.inline': FqName@61) = null
-    packageFragments('kotlin': FqName@62) = LazyJavaPackageFragment@13['kotlin']
-    packageFragments('kotlin.Any': FqName@63) = null
-    packageFragments('kotlin.Nothing': FqName@64) = null
-    packageFragments('kotlin.String': FqName@65) = null
-    packageFragments('kotlin.T': FqName@66) = null
-    packageFragments('kotlin.inline': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = LazyJavaPackageFragment@69['io']
-    packageFragments('kotlin.io.Any': FqName@70) = null
-    packageFragments('kotlin.io.Nothing': FqName@71) = null
-    packageFragments('kotlin.io.String': FqName@72) = null
-    packageFragments('kotlin.io.T': FqName@73) = null
-    packageFragments('kotlin.io.inline': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = LazyJavaPackageFragment@76['jvm']
-    packageFragments('kotlin.jvm.Any': FqName@77) = null
-    packageFragments('kotlin.jvm.Nothing': FqName@78) = null
-    packageFragments('kotlin.jvm.String': FqName@79) = null
-    packageFragments('kotlin.jvm.T': FqName@80) = null
-    packageFragments('kotlin.jvm.inline': FqName@81) = null
-    packageFragments('kotlin.jvm.internal': FqName@82) = LazyJavaPackageFragment@10['internal']
-    topLevelClasses(JavaClassImpl@83['Class']) = LazyJavaClassDescriptor@42['Class']
-}
-
-LazyJavaPackageFragment@47['<root>'] {
-    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@85
-}
-
-LazyJavaPackageFragment@10['internal'] {
-    classes('Intrinsic': Name@97) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@69['io'] {
-    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('block': Name@90) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@100
-    properties('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    properties('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    properties('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-    properties('javaClass': Name@93) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@76['jvm'] {
-    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
-}
-
-LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Array': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('inline': Name@92) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('io': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('jvm': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('array': Name@89) = ArrayList@115[1] { DeserializedSimpleFunctionDescriptor@116['array'] } // through DeserializedPackageMemberScope@114
-    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('block': Name@90) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@117) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    functions('io': Name@117) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('javaClass': Name@93) = ArrayList@118[1] { DeserializedSimpleFunctionDescriptor@119['javaClass'] } // through DeserializedPackageMemberScope@114
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@120) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    functions('jvm': Name@120) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@114
-    properties('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    properties('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    properties('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    properties('io': Name@117) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-    properties('javaClass': Name@93) = ArrayList@123[1] { DeserializedPropertyDescriptor@124['javaClass'] } // through DeserializedPackageMemberScope@114
-    properties('jvm': Name@120) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('Class': Name@126) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
-}
-
-LazyJavaTypeParameterDescriptor@44['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@128
-}
-
-LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@44['T']
-}
-
-ResolutionTaskHolder@131 {
-    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@134 {
-    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@137 {
-    <name not found> = ArrayList@138[1] { ResolutionCandidate@139 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@140 {
-    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@143 {
-    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@146 {
-    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@149 {
-    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@152 {
-    <name not found> = ArrayList@153[1] { ResolutionCandidate@154 }
-    <name not found> = EmptyList@95[empty]
-}
-
-ResolutionTaskHolder@155 {
-    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
-}
-
-ResolutionTaskHolder@158 {
-    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
-}
-
-ResolutionTaskHolder@161 {
-    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
-}
-
-ResolutionTaskHolder@164 {
-    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
-}
-
-ResolutionTaskHolder@167 {
-    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
-}
-
-ResolutionTaskHolder@170 {
-    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
-}
-
-ResolutionTaskHolder@173 {
-    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
-}
-
-TypeDeserializer@176 {
-    classDescriptors('34': Integer@177) = LazyJavaClassDescriptor@42['Class']
-    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
-}
-
-TypeDeserializer@180 {
-    classDescriptors('8': Integer@181) = DeserializedClassDescriptor@182['Array']
-    classDescriptors('9': Integer@178) = DeserializedClassDescriptor@179['Any']
-}
-
-null {
-    <name not found> = ArrayList@183[1] { ResolutionCandidate@163 }
-    <name not found> = ArrayList@184[1] { ResolutionCandidate@154 }
-    <name not found> = ArrayList@185[1] { ResolutionCandidate@172 }
-    <name not found> = ArrayList@186[1] { ResolutionCandidate@160 }
-    <name not found> = ArrayList@187[1] { ResolutionCandidate@157 }
-    <name not found> = ArrayList@188[1] { ResolutionCandidate@142 }
-    <name not found> = ArrayList@189[1] { ResolutionCandidate@133 }
-    <name not found> = ArrayList@190[1] { ResolutionCandidate@175 }
-    <name not found> = ArrayList@191[1] { ResolutionCandidate@151 }
-    <name not found> = ArrayList@192[1] { ResolutionCandidate@169 }
-    <name not found> = ArrayList@193[1] { ResolutionCandidate@139 }
-    <name not found> = ArrayList@194[1] { ResolutionCandidate@166 }
-    <name not found> = ArrayList@195[1] { ResolutionCandidate@148 }
-    <name not found> = ArrayList@196[1] { ResolutionCandidate@136 }
-    <name not found> = ArrayList@197[1] { ResolutionCandidate@145 }
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-    <name not found> = EmptyList@95[empty]
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log
deleted file mode 100644
index 00eed5e232a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.lazy.log
+++ /dev/null
@@ -1,992 +0,0 @@
-ClassDeserializer@0 {
-    classes(ClassKey@1) = DeserializedClassDescriptor@2['Function2']
-    classes(ClassKey@3) = DeserializedClassDescriptor@4['InlineOption']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['Stream']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['Unit']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['deprecated']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['inline']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['inlineOptions']
-}
-
-DescriptorLoadersStorage@15 {
-    storage(VirtualFileKotlinClass@16) = Storage@17
-    storage(VirtualFileKotlinClass@18) = Storage@19
-}
-
-DescriptorResolver@20 {
-    <name not found> = DoubleValue@21
-    <name not found> = IntValue@22
-    <name not found> = null
-    <name not found> = null
-}
-
-DeserializedClassDescriptor@2['Function2'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-}
-
-DeserializedClassDescriptor@4['InlineOption'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-    defaultType = JetTypeImpl@24['InlineOption']
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@25
-}
-
-DeserializedClassDescriptor@6['Stream'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-}
-
-DeserializedClassDescriptor@10['deprecated'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-    defaultType = JetTypeImpl@26['deprecated']
-    primaryConstructor = ConstructorDescriptorImpl@27['<init>']
-}
-
-DeserializedClassDescriptor@12['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-    defaultType = JetTypeImpl@28['inline']
-}
-
-DeserializedClassDescriptor@14['inlineOptions'] {
-    containingDeclaration = LazyJavaPackageFragment@23['kotlin']
-    defaultType = JetTypeImpl@29['inlineOptions']
-    primaryConstructor = ConstructorDescriptorImpl@30['<init>']
-}
-
-DeserializedTypeParameterDescriptor@31['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
-}
-
-DeserializedTypeParameterDescriptor@33['P2'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@34
-}
-
-DeserializedTypeParameterDescriptor@35['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-}
-
-DeserializedTypeParameterDescriptor@37['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@38
-    upperBounds = LinkedHashSet@39[1] { DeserializedType@40['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@41['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
-    upperBounds = LinkedHashSet@43[1] { DeserializedType@44['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@45['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
-    upperBounds = LinkedHashSet@47[1] { DeserializedType@48['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@49['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-    upperBounds = LinkedHashSet@51[1] { DeserializedType@52['kotlin.Any'] }
-}
-
-DeserializedTypeParameterDescriptor@53['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
-}
-
-DeserializedType@55['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedType@56['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-DeserializedType@57['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-DeserializedType@58['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-DeserializedType@59['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-DeserializedType@60['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-DeserializedType@61['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedType@62['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-DeserializedType@63['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedType@64['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@50
-}
-
-DeserializedType@65['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-DeserializedType@66['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-DeserializedType@67['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-DeserializedType@68['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-DeserializedType@69['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@46
-}
-
-DeserializedType@70['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedType@71['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-DeserializedType@72['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-DeserializedType@73['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@42
-}
-
-DeserializedType@74['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@38
-}
-
-DeserializedType@44['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-    memberScope = DeserializedClassMemberScope@76
-}
-
-DeserializedType@40['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-    memberScope = DeserializedClassMemberScope@76
-}
-
-DeserializedType@48['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-    memberScope = DeserializedClassMemberScope@76
-}
-
-DeserializedType@52['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-    memberScope = DeserializedClassMemberScope@76
-}
-
-DeserializedType@77['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-}
-
-DeserializedType@78['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@75
-}
-
-DeserializedType@79['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@80
-    memberScope = SubstitutingScope@81
-}
-
-DeserializedType@82['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@83
-}
-
-DeserializedType@84['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@83
-}
-
-DeserializedType@85['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@83
-}
-
-DeserializedType@86['kotlin.Boolean'] {
-    constructor = DeserializedClassTypeConstructor@83
-}
-
-DeserializedType@87['kotlin.BooleanArray'] {
-    constructor = DeserializedClassTypeConstructor@88
-}
-
-DeserializedType@89['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@90
-}
-
-DeserializedType@91['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@90
-}
-
-DeserializedType@92['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@90
-}
-
-DeserializedType@93['kotlin.Byte'] {
-    constructor = DeserializedClassTypeConstructor@90
-}
-
-DeserializedType@94['kotlin.ByteArray'] {
-    constructor = DeserializedClassTypeConstructor@95
-}
-
-DeserializedType@96['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@98['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@99['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@100['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@101['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@102['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@103['kotlin.Char'] {
-    constructor = DeserializedClassTypeConstructor@97
-}
-
-DeserializedType@104['kotlin.CharArray'] {
-    constructor = DeserializedClassTypeConstructor@105
-}
-
-DeserializedType@106['kotlin.CharArray'] {
-    constructor = DeserializedClassTypeConstructor@105
-}
-
-DeserializedType@107['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@108
-}
-
-DeserializedType@109['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@108
-}
-
-DeserializedType@110['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@108
-}
-
-DeserializedType@111['kotlin.Double'] {
-    constructor = DeserializedClassTypeConstructor@108
-}
-
-DeserializedType@112['kotlin.DoubleArray'] {
-    constructor = DeserializedClassTypeConstructor@113
-}
-
-DeserializedType@114['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@115
-}
-
-DeserializedType@116['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@115
-}
-
-DeserializedType@117['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@115
-}
-
-DeserializedType@118['kotlin.Float'] {
-    constructor = DeserializedClassTypeConstructor@115
-}
-
-DeserializedType@119['kotlin.FloatArray'] {
-    constructor = DeserializedClassTypeConstructor@120
-}
-
-DeserializedType@121['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-    memberScope = SubstitutingScope@123
-}
-
-DeserializedType@124['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-    memberScope = SubstitutingScope@125
-}
-
-DeserializedType@126['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-    memberScope = SubstitutingScope@127
-}
-
-DeserializedType@128['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-    memberScope = SubstitutingScope@129
-}
-
-DeserializedType@130['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@131['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@132['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@133['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@134['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@135['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@136['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@137['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@138['kotlin.Function2'] {
-    constructor = DeserializedClassTypeConstructor@122
-}
-
-DeserializedType@139['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@140
-}
-
-DeserializedType@141['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@140
-}
-
-DeserializedType@142['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@140
-}
-
-DeserializedType@143['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@140
-}
-
-DeserializedType@144['kotlin.IntArray'] {
-    constructor = DeserializedClassTypeConstructor@145
-}
-
-DeserializedType@146['kotlin.Iterable'] {
-    constructor = DeserializedClassTypeConstructor@147
-    memberScope = SubstitutingScope@148
-}
-
-DeserializedType@149['kotlin.Iterator'] {
-    constructor = DeserializedClassTypeConstructor@150
-    memberScope = SubstitutingScope@151
-}
-
-DeserializedType@152['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@153
-}
-
-DeserializedType@154['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@153
-}
-
-DeserializedType@155['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@153
-}
-
-DeserializedType@156['kotlin.Long'] {
-    constructor = DeserializedClassTypeConstructor@153
-}
-
-DeserializedType@157['kotlin.LongArray'] {
-    constructor = DeserializedClassTypeConstructor@158
-}
-
-DeserializedType@159['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@160
-}
-
-DeserializedType@161['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@160
-}
-
-DeserializedType@162['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@160
-}
-
-DeserializedType@163['kotlin.Short'] {
-    constructor = DeserializedClassTypeConstructor@160
-}
-
-DeserializedType@164['kotlin.ShortArray'] {
-    constructor = DeserializedClassTypeConstructor@165
-}
-
-DeserializedType@166['kotlin.Stream'] {
-    constructor = DeserializedClassTypeConstructor@167
-    memberScope = SubstitutingScope@168
-}
-
-DeserializedType@169['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@170
-}
-
-DeserializedType@171['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@172
-}
-
-EnumEntryClassDescriptors@173 {
-    findEnumEntry('ONLY_LOCAL_RETURN': Name@174) = EnumEntrySyntheticClassDescriptor@175['ONLY_LOCAL_RETURN']
-}
-
-EnumEntrySyntheticClassDescriptor@176['<class-object-for-ONLY_LOCAL_RETURN>'] {
-    defaultType = JetTypeImpl@177['enum entry']
-}
-
-EnumEntrySyntheticClassDescriptor@175['ONLY_LOCAL_RETURN'] {
-    defaultType = JetTypeImpl@178['enum entry']
-}
-
-LazyJavaClassDescriptor@179['System'] {
-    enumEntryIndex = LinkedHashMap@180 // through LazyJavaClassMemberScope@181
-    functions('nanoTime': Name@182) = ArrayList@183[1] { JavaMethodDescriptor@184['nanoTime'] } // through LazyJavaStaticClassScope@185
-    functions('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaClassMemberScope@181
-    memberIndex = computeMemberIndex$1@187 // through LazyJavaClassMemberScope@181
-    memberIndex = computeMemberIndex$1@188 // through LazyJavaStaticClassScope@185
-    nestedClassIndex = LinkedHashMap@189 // through LazyJavaClassMemberScope@181
-    nestedClasses('nanoTime': Name@182) = null // through LazyJavaClassMemberScope@181
-    properties('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaClassMemberScope@181
-    properties('nanoTime': Name@182) = EmptyList@186[empty] // through LazyJavaStaticClassScope@185
-    typeConstructor = LazyJavaClassTypeConstructor@190['System']
-}
-
-LazyJavaClassTypeConstructor@190['System'] {
-    supertypes = ArrayList@191[1] { JetTypeImpl@192['Any'] }
-}
-
-LazyJavaClassifierType@193['Object'] {
-    classifier = JavaClassImpl@194['Object']
-    typeConstructor = DeserializedClassTypeConstructor@75
-}
-
-LazyJavaPackageFragmentProvider@195 {
-    packageFragments('<root>': FqName@196) = LazyJavaPackageFragment@197['<root>']
-    packageFragments('Array': FqName@198) = null
-    packageFragments('String': FqName@199) = null
-    packageFragments('System': FqName@200) = null
-    packageFragments('java': FqName@201) = LazyJavaPackageFragment@202['java']
-    packageFragments('java.lang': FqName@203) = LazyJavaPackageFragment@204['lang']
-    packageFragments('java.lang.Array': FqName@205) = null
-    packageFragments('java.lang.String': FqName@206) = null
-    packageFragments('java.lang.System': FqName@207) = null
-    packageFragments('kotlin': FqName@208) = LazyJavaPackageFragment@23['kotlin']
-    packageFragments('kotlin.Array': FqName@209) = null
-    packageFragments('kotlin.String': FqName@210) = null
-    packageFragments('kotlin.System': FqName@211) = null
-    packageFragments('kotlin.io': FqName@212) = LazyJavaPackageFragment@213['io']
-    packageFragments('kotlin.io.Array': FqName@214) = null
-    packageFragments('kotlin.io.String': FqName@215) = null
-    packageFragments('kotlin.io.System': FqName@216) = null
-    packageFragments('kotlin.jvm': FqName@217) = LazyJavaPackageFragment@218['jvm']
-    packageFragments('kotlin.jvm.Array': FqName@219) = null
-    packageFragments('kotlin.jvm.String': FqName@220) = null
-    packageFragments('kotlin.jvm.System': FqName@221) = null
-    topLevelClasses(JavaClassImpl@222['System']) = LazyJavaClassDescriptor@179['System']
-}
-
-LazyJavaPackageFragment@197['<root>'] {
-    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@224
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@224
-}
-
-LazyJavaPackageFragment@213['io'] {
-    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    deserializedPackageScope = DeserializedPackageMemberScope@232 // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('println': Name@227) = ArrayList@233[11] { DeserializedSimpleFunctionDescriptor@234['println'], DeserializedSimpleFunctionDescriptor@235['println'], DeserializedSimpleFunctionDescriptor@236['println'], ... } // through DeserializedPackageMemberScope@232
-    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('reduce': Name@228) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
-    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@231
-    membersProtos = LinkedHashMap@238 // through DeserializedPackageMemberScope@232
-    properties('System': Name@226) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
-    properties('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@232
-}
-
-LazyJavaPackageFragment@202['java'] {
-    classes('lang': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@240
-    functions('lang': Name@241) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    memberIndex = computeMemberIndex$1@242 // through LazyPackageFragmentScopeForJavaPackage@240
-}
-
-LazyJavaPackageFragment@218['jvm'] {
-    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@243
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@243
-    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@243
-    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@243
-    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@243
-}
-
-LazyJavaPackageFragment@23['kotlin'] {
-    classes('Any': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Array': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Boolean': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('BooleanArray': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Byte': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('ByteArray': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Char': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('CharArray': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Double': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('DoubleArray': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Float': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('FloatArray': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Function2': Name@257) = DeserializedClassDescriptor@2['Function2'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('InlineOption': Name@258) = DeserializedClassDescriptor@4['InlineOption'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Int': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('IntArray': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Iterable': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Iterator': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Long': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('LongArray': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Short': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('ShortArray': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Stream': Name@267) = DeserializedClassDescriptor@6['Stream'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('String': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('System': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('Unit': Name@268) = DeserializedClassDescriptor@8['Unit'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('deprecated': Name@269) = DeserializedClassDescriptor@10['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('inline': Name@270) = DeserializedClassDescriptor@12['inline'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('inlineOptions': Name@271) = DeserializedClassDescriptor@14['inlineOptions'] // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('io': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('jvm': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@246
-    deserializedPackageScope = DeserializedPackageMemberScope@274 // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('io': Name@275) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    functions('io': Name@275) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('jvm': Name@276) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    functions('jvm': Name@276) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    functions('reduce': Name@228) = ArrayList@277[13] { DeserializedSimpleFunctionDescriptor@278['reduce'], DeserializedSimpleFunctionDescriptor@279['reduce'], DeserializedSimpleFunctionDescriptor@280['reduce'], ... } // through DeserializedPackageMemberScope@274
-    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@246
-    memberIndex = computeMemberIndex$1@281 // through LazyPackageFragmentScopeForJavaPackage@246
-    membersProtos = LinkedHashMap@282 // through DeserializedPackageMemberScope@274
-    properties('System': Name@226) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    properties('io': Name@275) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    properties('jvm': Name@276) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-    properties('println': Name@227) = EmptyList@186[empty] // through DeserializedPackageMemberScope@274
-}
-
-LazyJavaPackageFragment@204['lang'] {
-    classes('System': Name@226) = LazyJavaClassDescriptor@179['System'] // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('println': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    classes('reduce': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@283
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('println': Name@227) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    functions('reduce': Name@228) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@283
-    memberIndex = computeMemberIndex$1@284 // through LazyPackageFragmentScopeForJavaPackage@283
-}
-
-ResolutionTaskHolder@285 {
-    <name not found> = ArrayList@286[11] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@290 {
-    <name not found> = ArrayList@291[13] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@295 {
-    <name not found> = ArrayList@296[1] { ResolutionCandidate@297 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@298 {
-    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@301 {
-    <name not found> = ArrayList@302[1] { ResolutionCandidate@303 }
-}
-
-ResolutionTaskHolder@304 {
-    <name not found> = ArrayList@305[1] { ResolutionCandidate@306 }
-}
-
-ResolutionTaskHolder@307 {
-    <name not found> = ArrayList@308[1] { ResolutionCandidate@309 }
-}
-
-ResolutionTaskHolder@310 {
-    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
-}
-
-ResolutionTaskHolder@313 {
-    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
-}
-
-ResolutionTaskHolder@316 {
-    <name not found> = ArrayList@317[1] { ResolutionCandidate@318 }
-}
-
-ResolutionTaskHolder@319 {
-    <name not found> = ArrayList@320[1] { ResolutionCandidate@321 }
-}
-
-ResolutionTaskHolder@322 {
-    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
-}
-
-ResolutionTaskHolder@325 {
-    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
-}
-
-ResolutionTaskHolder@328 {
-    <name not found> = ArrayList@329[1] { ResolutionCandidate@330 }
-}
-
-ResolutionTaskHolder@331 {
-    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
-}
-
-ResolutionTaskHolder@334 {
-    <name not found> = ArrayList@335[1] { ResolutionCandidate@336 }
-}
-
-ResolutionTaskHolder@337 {
-    <name not found> = ArrayList@338[1] { ResolutionCandidate@339 }
-}
-
-ResolutionTaskHolder@340 {
-    <name not found> = ArrayList@341[1] { ResolutionCandidate@342 }
-}
-
-ResolutionTaskHolder@343 {
-    <name not found> = ArrayList@344[1] { ResolutionCandidate@345 }
-}
-
-ResolutionTaskHolder@346 {
-    <name not found> = ArrayList@347[1] { ResolutionCandidate@348 }
-}
-
-ResolutionTaskHolder@349 {
-    <name not found> = ArrayList@350[1] { ResolutionCandidate@351 }
-}
-
-ResolutionTaskHolder@352 {
-    <name not found> = ArrayList@353[1] { ResolutionCandidate@354 }
-}
-
-ResolutionTaskHolder@355 {
-    <name not found> = ArrayList@356[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
-}
-
-ResolutionTaskHolder@360 {
-    <name not found> = ArrayList@361[7] { ResolutionCandidate@362, ResolutionCandidate@363, ResolutionCandidate@364, ... }
-}
-
-ResolutionTaskHolder@365 {
-    <name not found> = ArrayList@366[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
-}
-
-ResolutionTaskHolder@370 {
-    <name not found> = ArrayList@371[7] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
-}
-
-ResolutionTaskHolder@375 {
-    <name not found> = ArrayList@376[7] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-}
-
-ResolutionTaskHolder@380 {
-    <name not found> = ArrayList@381[7] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
-}
-
-ResolutionTaskHolder@385 {
-    <name not found> = ArrayList@386[7] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
-}
-
-ResolutionTaskHolder@390 {
-    <name not found> = ArrayList@391[7] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
-}
-
-ResolutionTaskHolder@395 {
-    <name not found> = ArrayList@396[7] { ResolutionCandidate@397, ResolutionCandidate@398, ResolutionCandidate@399, ... }
-}
-
-ResolutionTaskHolder@400 {
-    <name not found> = ArrayList@401[7] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404, ... }
-}
-
-ResolutionTaskHolder@405 {
-    <name not found> = ArrayList@406[7] { ResolutionCandidate@407, ResolutionCandidate@408, ResolutionCandidate@409, ... }
-}
-
-ResolutionTaskHolder@410 {
-    <name not found> = ArrayList@411[8] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
-}
-
-ResolutionTaskHolder@415 {
-    <name not found> = ArrayList@416[8] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
-}
-
-ResolutionTaskHolder@420 {
-    <name not found> = ArrayList@421[8] { ResolutionCandidate@422, ResolutionCandidate@423, ResolutionCandidate@424, ... }
-}
-
-ResolutionTaskHolder@425 {
-    <name not found> = ArrayList@426[8] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
-}
-
-ResolutionTaskHolder@430 {
-    <name not found> = ArrayList@431[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
-}
-
-ResolutionTaskHolder@435 {
-    <name not found> = ArrayList@436[8] { ResolutionCandidate@437, ResolutionCandidate@438, ResolutionCandidate@439, ... }
-}
-
-ResolutionTaskHolder@440 {
-    <name not found> = ArrayList@441[8] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444, ... }
-}
-
-ResolutionTaskHolder@445 {
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-ResolutionTaskHolder@446 {
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}
-
-TypeDeserializer@447 {
-    classDescriptors('1': Integer@448) = DeserializedClassDescriptor@449['Boolean']
-    classDescriptors('22': Integer@450) = DeserializedClassDescriptor@451['BooleanArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-}
-
-TypeDeserializer@453 {
-    classDescriptors('1': Integer@448) = DeserializedClassDescriptor@454['Int']
-}
-
-TypeDeserializer@455 {
-    classDescriptors('102': Integer@456) = DeserializedClassDescriptor@6['Stream']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
-}
-
-TypeDeserializer@459 {
-    classDescriptors('107': Integer@460) = DeserializedClassDescriptor@461['Iterable']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
-}
-
-TypeDeserializer@462 {
-    classDescriptors('11': Integer@463) = DeserializedClassDescriptor@458['Any']
-    classDescriptors('12': Integer@464) = DeserializedClassDescriptor@8['Unit']
-}
-
-TypeDeserializer@465 {
-    classDescriptors('14': Integer@466) = DeserializedClassDescriptor@449['Boolean']
-}
-
-TypeDeserializer@467 {
-    classDescriptors('15': Integer@468) = DeserializedClassDescriptor@469['Byte']
-}
-
-TypeDeserializer@470 {
-    classDescriptors('16': Integer@471) = DeserializedClassDescriptor@472['Char']
-}
-
-TypeDeserializer@473 {
-    classDescriptors('17': Integer@474) = DeserializedClassDescriptor@475['CharArray']
-}
-
-TypeDeserializer@476 {
-    classDescriptors('18': Integer@477) = DeserializedClassDescriptor@478['Double']
-}
-
-TypeDeserializer@479 {
-    classDescriptors('19': Integer@480) = DeserializedClassDescriptor@481['Float']
-}
-
-TypeDeserializer@482 {
-    classDescriptors('2': Integer@483) = DeserializedClassDescriptor@458['Any']
-}
-
-TypeDeserializer@484 {
-    classDescriptors('2': Integer@483) = DeserializedClassDescriptor@485['String']
-    classDescriptors('65': Integer@486) = DeserializedClassDescriptor@472['Char']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-}
-
-TypeDeserializer@487 {
-    classDescriptors('20': Integer@488) = DeserializedClassDescriptor@489['Long']
-}
-
-TypeDeserializer@490 {
-    classDescriptors('21': Integer@491) = DeserializedClassDescriptor@492['Short']
-}
-
-TypeDeserializer@493 {
-    classDescriptors('23': Integer@494) = DeserializedClassDescriptor@495['ByteArray']
-    classDescriptors('61': Integer@496) = DeserializedClassDescriptor@469['Byte']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-}
-
-TypeDeserializer@497 {
-    classDescriptors('24': Integer@498) = DeserializedClassDescriptor@475['CharArray']
-    classDescriptors('65': Integer@486) = DeserializedClassDescriptor@472['Char']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-}
-
-TypeDeserializer@499 {
-    classDescriptors('25': Integer@500) = DeserializedClassDescriptor@501['DoubleArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('76': Integer@502) = DeserializedClassDescriptor@478['Double']
-}
-
-TypeDeserializer@503 {
-    classDescriptors('26': Integer@504) = DeserializedClassDescriptor@505['FloatArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('79': Integer@506) = DeserializedClassDescriptor@481['Float']
-}
-
-TypeDeserializer@507 {
-    classDescriptors('27': Integer@508) = DeserializedClassDescriptor@454['Int']
-    classDescriptors('28': Integer@509) = DeserializedClassDescriptor@510['IntArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-}
-
-TypeDeserializer@511 {
-    classDescriptors('29': Integer@512) = DeserializedClassDescriptor@513['LongArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('92': Integer@514) = DeserializedClassDescriptor@489['Long']
-}
-
-TypeDeserializer@515 {
-    classDescriptors('30': Integer@516) = DeserializedClassDescriptor@517['ShortArray']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('97': Integer@518) = DeserializedClassDescriptor@492['Short']
-}
-
-TypeDeserializer@519 {
-    classDescriptors('42': Integer@520) = DeserializedClassDescriptor@521['Iterator']
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
-}
-
-TypeDeserializer@522 {
-    classDescriptors('68': Integer@452) = DeserializedClassDescriptor@2['Function2']
-    classDescriptors('8': Integer@523) = DeserializedClassDescriptor@524['Array']
-    classDescriptors('9': Integer@457) = DeserializedClassDescriptor@458['Any']
-}
-
-null {
-    <name not found> = ArrayList@525[11] { ResolutionCandidate@287, ResolutionCandidate@288, ResolutionCandidate@289, ... }
-    <name not found> = ArrayList@526[13] { ResolutionCandidate@292, ResolutionCandidate@293, ResolutionCandidate@294, ... }
-    <name not found> = ArrayList@527[1] { ResolutionCandidate@309 }
-    <name not found> = ArrayList@528[1] { ResolutionCandidate@300 }
-    <name not found> = ArrayList@529[1] { ResolutionCandidate@339 }
-    <name not found> = ArrayList@530[1] { ResolutionCandidate@327 }
-    <name not found> = ArrayList@531[1] { ResolutionCandidate@315 }
-    <name not found> = ArrayList@532[1] { ResolutionCandidate@303 }
-    <name not found> = ArrayList@533[1] { ResolutionCandidate@333 }
-    <name not found> = ArrayList@534[1] { ResolutionCandidate@306 }
-    <name not found> = ArrayList@535[1] { ResolutionCandidate@312 }
-    <name not found> = ArrayList@536[1] { ResolutionCandidate@348 }
-    <name not found> = ArrayList@537[1] { ResolutionCandidate@324 }
-    <name not found> = ArrayList@538[1] { ResolutionCandidate@351 }
-    <name not found> = ArrayList@539[1] { ResolutionCandidate@342 }
-    <name not found> = ArrayList@540[1] { ResolutionCandidate@318 }
-    <name not found> = ArrayList@541[1] { ResolutionCandidate@345 }
-    <name not found> = ArrayList@542[1] { ResolutionCandidate@297 }
-    <name not found> = ArrayList@543[1] { ResolutionCandidate@336 }
-    <name not found> = ArrayList@544[1] { ResolutionCandidate@321 }
-    <name not found> = ArrayList@545[1] { ResolutionCandidate@354 }
-    <name not found> = ArrayList@546[1] { ResolutionCandidate@330 }
-    <name not found> = ArrayList@547[7] { ResolutionCandidate@387, ResolutionCandidate@388, ResolutionCandidate@389, ... }
-    <name not found> = ArrayList@548[7] { ResolutionCandidate@377, ResolutionCandidate@378, ResolutionCandidate@379, ... }
-    <name not found> = ArrayList@549[7] { ResolutionCandidate@357, ResolutionCandidate@358, ResolutionCandidate@359, ... }
-    <name not found> = ArrayList@550[7] { ResolutionCandidate@372, ResolutionCandidate@373, ResolutionCandidate@374, ... }
-    <name not found> = ArrayList@551[7] { ResolutionCandidate@397, ResolutionCandidate@398, ResolutionCandidate@399, ... }
-    <name not found> = ArrayList@552[7] { ResolutionCandidate@382, ResolutionCandidate@383, ResolutionCandidate@384, ... }
-    <name not found> = ArrayList@553[7] { ResolutionCandidate@407, ResolutionCandidate@408, ResolutionCandidate@409, ... }
-    <name not found> = ArrayList@554[7] { ResolutionCandidate@362, ResolutionCandidate@363, ResolutionCandidate@364, ... }
-    <name not found> = ArrayList@555[7] { ResolutionCandidate@392, ResolutionCandidate@393, ResolutionCandidate@394, ... }
-    <name not found> = ArrayList@556[7] { ResolutionCandidate@367, ResolutionCandidate@368, ResolutionCandidate@369, ... }
-    <name not found> = ArrayList@557[7] { ResolutionCandidate@402, ResolutionCandidate@403, ResolutionCandidate@404, ... }
-    <name not found> = ArrayList@558[8] { ResolutionCandidate@427, ResolutionCandidate@428, ResolutionCandidate@429, ... }
-    <name not found> = ArrayList@559[8] { ResolutionCandidate@442, ResolutionCandidate@443, ResolutionCandidate@444, ... }
-    <name not found> = ArrayList@560[8] { ResolutionCandidate@437, ResolutionCandidate@438, ResolutionCandidate@439, ... }
-    <name not found> = ArrayList@561[8] { ResolutionCandidate@422, ResolutionCandidate@423, ResolutionCandidate@424, ... }
-    <name not found> = ArrayList@562[8] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
-    <name not found> = ArrayList@563[8] { ResolutionCandidate@412, ResolutionCandidate@413, ResolutionCandidate@414, ... }
-    <name not found> = ArrayList@564[8] { ResolutionCandidate@432, ResolutionCandidate@433, ResolutionCandidate@434, ... }
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-    <name not found> = EmptyList@186[empty]
-}